Changes after review

Snowflake-Labs · Sep 13, 2024 · 0be9f62 · 0be9f62
1 parent ac66d81
commit 0be9f62
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 27 deletions.
diff --git a/pkg/resources/user.go b/pkg/resources/user.go
@@ -548,24 +548,12 @@ func UpdateUser(ctx context.Context, d *schema.ResourceData, meta any) diag.Diag
 			return diag.FromErr(err)
 		}
 	}
-	// unset is split into two because:
-	// 1. this is how it's written in the docs https://docs.snowflake.com/en/sql-reference/sql/alter-user#syntax
-	// 2. current implementation of sdk.UserUnset makes distinction between user and session parameters,
-	// so adding a comma between them is not trivial in the current SQL builder implementation
-	if (*unset.SessionParameters != sdk.SessionParametersUnset{}) {
+
+	if (*unset.SessionParameters != sdk.SessionParametersUnset{}) || (*unset.ObjectParameters != sdk.UserObjectParametersUnset{}) {
 		err := client.Users.Alter(ctx, id, &sdk.AlterUserOptions{
 			Unset: &sdk.UserUnset{
 				SessionParameters: unset.SessionParameters,
-			},
-		})
-		if err != nil {
-			return diag.FromErr(err)
-		}
-	}
-	if (*unset.ObjectParameters != sdk.UserObjectParametersUnset{}) {
-		err := client.Users.Alter(ctx, id, &sdk.AlterUserOptions{
-			Unset: &sdk.UserUnset{
-				ObjectParameters: unset.ObjectParameters,
+				ObjectParameters:  unset.ObjectParameters,
 			},
 		})
 		if err != nil {

diff --git a/pkg/sdk/testint/users_integration_test.go b/pkg/sdk/testint/users_integration_test.go
@@ -845,10 +845,6 @@ func TestInt_Users(t *testing.T) {
 		require.NoError(t, err)
 		assertParametersSet(objectparametersassert.UserParametersPrefetched(t, id, parameters))
 
-		// unset is split into two because:
-		// 1. this is how it's written in the docs https://docs.snowflake.com/en/sql-reference/sql/alter-user#syntax
-		// 2. current implementation of sdk.UserUnset makes distinction between user and session parameters,
-		// so adding a comma between them is not trivial in the current SQL builder implementation
 		alterOpts = &sdk.AlterUserOptions{
 			Unset: &sdk.UserUnset{
 				SessionParameters: &sdk.SessionParametersUnset{
@@ -908,14 +904,6 @@ func TestInt_Users(t *testing.T) {
 					WeekOfYearPolicy:                         sdk.Bool(true),
 					WeekStart:                                sdk.Bool(true),
 				},
-			},
-		}
-
-		err = client.Users.Alter(ctx, id, alterOpts)
-		require.NoError(t, err)
-
-		alterOpts = &sdk.AlterUserOptions{
-			Unset: &sdk.UserUnset{
 				ObjectParameters: &sdk.UserObjectParametersUnset{
 					EnableUnredactedQuerySyntaxError: sdk.Bool(true),
 					NetworkPolicy:                    sdk.Bool(true),