Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
sfc-gh-asawicki committed Oct 25, 2023
1 parent 6cd5ab4 commit 03ba461
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
18 changes: 9 additions & 9 deletions pkg/resources/task.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,10 @@ func difference(a, b map[string]any) map[string]any {
// differentValue find keys present both in 'a' and 'b' but having different values.
func differentValue(a, b map[string]any) map[string]any {
diff := make(map[string]any)
for k := range a {
if v, ok := b[k]; ok {
if v != a[k] {
diff[k] = v
for k, va := range a {
if vb, ok := b[k]; ok {
if vb != va {
diff[k] = vb
}
}
}
Expand Down Expand Up @@ -233,7 +233,7 @@ func ReadTask(d *schema.ResourceData, meta interface{}) error {
}

if len(params) > 0 {
sessionParameters := map[string]interface{}{}
sessionParameters := make(map[string]any)
fieldParameters := map[string]interface{}{
"user_task_managed_initial_warehouse_size": "",
}
Expand Down Expand Up @@ -644,15 +644,15 @@ func UpdateTask(d *schema.ResourceData, meta interface{}) error {

remove := difference(os, ns)
add := difference(ns, os)
change := differentValue(ns, os)
change := differentValue(os, ns)

if len(remove) > 0 {
sessionParametersUnset, err := sdk.GetSessionParametersUnsetFrom(remove)
if err != nil {
return err
}
if err := client.Tasks.Alter(ctx, sdk.NewAlterTaskRequest(taskId).WithUnset(sdk.NewTaskUnsetRequest().WithSessionParametersUnset(sessionParametersUnset))); err != nil {
return fmt.Errorf("error removing session_parameters on task %v", d.Id())
return fmt.Errorf("error removing session_parameters on task %v err = %w", d.Id(), err)
}
}

Expand All @@ -662,7 +662,7 @@ func UpdateTask(d *schema.ResourceData, meta interface{}) error {
return err
}
if err := client.Tasks.Alter(ctx, sdk.NewAlterTaskRequest(taskId).WithSet(sdk.NewTaskSetRequest().WithSessionParameters(sessionParameters))); err != nil {
return fmt.Errorf("error adding session_parameters to task %v", d.Id())
return fmt.Errorf("error adding session_parameters to task %v err = %w", d.Id(), err)
}
}

Expand All @@ -672,7 +672,7 @@ func UpdateTask(d *schema.ResourceData, meta interface{}) error {
return err
}
if err := client.Tasks.Alter(ctx, sdk.NewAlterTaskRequest(taskId).WithSet(sdk.NewTaskSetRequest().WithSessionParameters(sessionParameters))); err != nil {
return fmt.Errorf("error updating session_parameters in task %v", d.Id())
return fmt.Errorf("error updating session_parameters in task %v err = %w", d.Id(), err)
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions pkg/resources/task_acceptance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -335,12 +335,12 @@ resource "snowflake_task" "root_task" {
user_task_timeout_ms = {{ .RootTask.UserTaskTimeoutMs }}
{{- end }}
{{ if .ChildTask.SessionParams }}
{{ if .RootTask.SessionParams }}
session_parameters = {
{{ range $key, $value := .RootTask.SessionParams}}
{{ range $key, $value := .RootTask.SessionParams}}
{{ $key }} = "{{ $value }}",
}
{{- end }}
}
{{- end }}
}
resource "snowflake_task" "child_task" {
Expand All @@ -358,10 +358,10 @@ resource "snowflake_task" "child_task" {
{{ if .ChildTask.SessionParams }}
session_parameters = {
{{ range $key, $value := .ChildTask.SessionParams}}
{{ range $key, $value := .ChildTask.SessionParams}}
{{ $key }} = "{{ $value }}",
}
{{- end }}
}
{{- end }}
}
resource "snowflake_task" "solo_task" {
Expand All @@ -384,8 +384,8 @@ resource "snowflake_task" "solo_task" {
session_parameters = {
{{ range $key, $value := .SoloTask.SessionParams}}
{{ $key }} = "{{ $value }}",
}
{{- end }}
}
{{- end }}
}
`)
Expand Down
4 changes: 2 additions & 2 deletions pkg/sdk/parameters.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func (parameters *parameters) SetSessionParameterOnUser(ctx context.Context, use
if err != nil {
return err
}
opts := AlterUserOptions{Set: &UserSet{SessionParameters: &SessionParameters{}}}
opts := AlterUserOptions{Set: &UserSet{SessionParameters: sp}}
err = parameters.client.Users.Alter(ctx, userId, &opts)
if err != nil {
return err
Expand Down Expand Up @@ -716,7 +716,7 @@ type SessionParametersUnset struct {
}

func (v *SessionParametersUnset) validate() error {
if ok := anyValueSet(v.AbortDetachedQuery, v.Autocommit, v.BinaryInputFormat, v.BinaryOutputFormat, v.DateInputFormat, v.DateOutputFormat, v.ErrorOnNondeterministicMerge, v.ErrorOnNondeterministicUpdate, v.GeographyOutputFormat, v.JSONIndent, v.LockTimeout, v.QueryTag, v.RowsPerResultset, v.SimulatedDataSharingConsumer, v.StatementTimeoutInSeconds, v.StrictJSONOutput, v.TimestampDayIsAlways24h, v.TimestampInputFormat, v.TimestampLTZOutputFormat, v.TimestampNTZOutputFormat, v.TimestampOutputFormat, v.TimestampTypeMapping, v.TimestampTZOutputFormat, v.Timezone, v.TimeInputFormat, v.TimeOutputFormat, v.TransactionDefaultIsolationLevel, v.TwoDigitCenturyStart, v.UnsupportedDDLAction, v.UseCachedResult, v.WeekOfYearPolicy, v.WeekStart); !ok {
if ok := anyValueSet(v.AbortDetachedQuery, v.Autocommit, v.BinaryInputFormat, v.BinaryOutputFormat, v.ClientMetadataRequestUseConnectionCtx, v.ClientMetadataUseSessionDatabase, v.ClientResultColumnCaseInsensitive, v.DateInputFormat, v.DateOutputFormat, v.ErrorOnNondeterministicMerge, v.ErrorOnNondeterministicUpdate, v.GeographyOutputFormat, v.JSONIndent, v.LockTimeout, v.MultiStatementCount, v.QueryTag, v.QuotedIdentifiersIgnoreCase, v.RowsPerResultset, v.SimulatedDataSharingConsumer, v.StatementTimeoutInSeconds, v.StrictJSONOutput, v.TimestampDayIsAlways24h, v.TimestampInputFormat, v.TimestampLTZOutputFormat, v.TimestampNTZOutputFormat, v.TimestampOutputFormat, v.TimestampTypeMapping, v.TimestampTZOutputFormat, v.Timezone, v.TimeInputFormat, v.TimeOutputFormat, v.TransactionDefaultIsolationLevel, v.TwoDigitCenturyStart, v.UnsupportedDDLAction, v.UseCachedResult, v.WeekOfYearPolicy, v.WeekStart); !ok {
return fmt.Errorf("at least one session parameter must be set")
}
return nil
Expand Down

0 comments on commit 03ba461

Please sign in to comment.