From 33a4353f89912e5bb8644797efc5aa24cc34e149 Mon Sep 17 00:00:00 2001 From: Ron <38083777+roneli@users.noreply.github.com> Date: Tue, 7 Jun 2022 14:44:20 +0300 Subject: [PATCH] feat: Remove default value option from column (#324) Closes #298 --- provider/execution/execution.go | 15 --------------- provider/schema/column.go | 2 -- 2 files changed, 17 deletions(-) diff --git a/provider/execution/execution.go b/provider/execution/execution.go index 2827c789..c434a784 100644 --- a/provider/execution/execution.go +++ b/provider/execution/execution.go @@ -15,7 +15,6 @@ import ( "github.com/cloudquery/cq-provider-sdk/stats" "github.com/hashicorp/go-hclog" "github.com/iancoleman/strcase" - "github.com/modern-go/reflect2" segmentStats "github.com/segmentio/stats/v4" "github.com/thoas/go-funk" "golang.org/x/sync/semaphore" @@ -419,25 +418,11 @@ func (e TableExecutor) resolveColumns(ctx context.Context, meta schema.ClientMet } else { diags = diags.Add(e.handleResolveError(meta, resource, err, diag.WithSummary("column resolver %q failed for table %q", c.Name, e.Table.Name))) } - - // TODO: double check logic here - if reflect2.IsNil(c.Default) { - continue - } - // Set default value if defined, otherwise it will be nil - if err := resource.Set(c.Name, c.Default); err != nil { - diags = diags.Add(fromError(err, diag.WithResourceName(e.ResourceName), diag.WithType(diag.INTERNAL), - diag.WithSummary("failed to set resource default value for %s@%s", e.Table.Name, c.Name))) - } continue } e.Logger.Trace("resolving column value with path", "column", c.Name) // base use case: try to get column with CamelCase name v := funk.Get(resource.Item, strcase.ToCamel(c.Name), funk.WithAllowZero()) - if v == nil { - e.Logger.Trace("using column default value", "column", c.Name, "default", c.Default) - v = c.Default - } e.Logger.Trace("setting column value", "column", c.Name, "value", v) if err := resource.Set(c.Name, v); err != nil { diags = diags.Add(fromError(err, diag.WithResourceName(e.ResourceName), diag.WithType(diag.INTERNAL), diff --git a/provider/schema/column.go b/provider/schema/column.go index de7e87c6..e04f4e25 100644 --- a/provider/schema/column.go +++ b/provider/schema/column.go @@ -49,8 +49,6 @@ type Column struct { Type ValueType // Description about column, this description is added as a comment in the database Description string - // Default value if the resolver/default getting gets a nil value - Default interface{} // Column Resolver allows to set you own data based on resolving this can be an API call or setting multiple embedded values etc' Resolver ColumnResolver // Ignore errors checks if returned error from column resolver should be ignored.