Fix after review

Snowflake-Labs · Nov 28, 2024 · 87ef844 · 87ef844
1 parent 5253a50
commit 87ef844
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 24 deletions.
diff --git a/pkg/acceptance/helpers/grant_client.go b/pkg/acceptance/helpers/grant_client.go
@@ -137,24 +137,17 @@ func (c *GrantClient) GrantPrivilegesOnDatabaseToAccountRole(
 	withGrantOption bool,
 ) {
 	t.Helper()
-	ctx := context.Background()
-
-	err := c.client().GrantPrivilegesToAccountRole(
-		ctx,
-		&sdk.AccountRoleGrantPrivileges{
-			AccountObjectPrivileges: privileges,
-		},
+	c.grantPrivilegesOnAccountLevelObjectToAccountRole(
+		t,
+		accountRoleId,
 		&sdk.AccountRoleGrantOn{
 			AccountObject: &sdk.GrantOnAccountObject{
 				Database: sdk.Pointer(databaseId),
 			},
 		},
-		accountRoleId,
-		&sdk.GrantPrivilegesToAccountRoleOptions{
-			WithGrantOption: sdk.Bool(withGrantOption),
-		},
+		privileges,
+		withGrantOption,
 	)
-	require.NoError(t, err)
 }
 
 func (c *GrantClient) GrantPrivilegesOnWarehouseToAccountRole(
@@ -163,6 +156,27 @@ func (c *GrantClient) GrantPrivilegesOnWarehouseToAccountRole(
 	warehouseId sdk.AccountObjectIdentifier,
 	privileges []sdk.AccountObjectPrivilege,
 	withGrantOption bool,
+) {
+	t.Helper()
+	c.grantPrivilegesOnAccountLevelObjectToAccountRole(
+		t,
+		accountRoleId,
+		&sdk.AccountRoleGrantOn{
+			AccountObject: &sdk.GrantOnAccountObject{
+				Warehouse: sdk.Pointer(warehouseId),
+			},
+		},
+		privileges,
+		withGrantOption,
+	)
+}
+
+func (c *GrantClient) grantPrivilegesOnAccountLevelObjectToAccountRole(
+	t *testing.T,
+	accountRoleId sdk.AccountObjectIdentifier,
+	accountObjectGrantOn *sdk.AccountRoleGrantOn,
+	privileges []sdk.AccountObjectPrivilege,
+	withGrantOption bool,
 ) {
 	t.Helper()
 	ctx := context.Background()
@@ -172,11 +186,7 @@ func (c *GrantClient) GrantPrivilegesOnWarehouseToAccountRole(
 		&sdk.AccountRoleGrantPrivileges{
 			AccountObjectPrivileges: privileges,
 		},
-		&sdk.AccountRoleGrantOn{
-			AccountObject: &sdk.GrantOnAccountObject{
-				Warehouse: sdk.Pointer(warehouseId),
-			},
-		},
+		accountObjectGrantOn,
 		accountRoleId,
 		&sdk.GrantPrivilegesToAccountRoleOptions{
 			WithGrantOption: sdk.Bool(withGrantOption),

diff --git a/pkg/manual_tests/authentication_methods/auth_test.go b/pkg/manual_tests/authentication_methods/auth_test.go
@@ -6,7 +6,6 @@ import (
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/manualtestprofiles"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testprofiles"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeenvs"
@@ -32,7 +31,7 @@ func TestAcc_Provider_OktaAuth(t *testing.T) {
 		},
 		Steps: []resource.TestStep{
 			{
-				Config: providerConfigWithAuthenticator(manualtestprofiles.Okta, sdk.AuthenticationTypeOkta),
+				Config: providerConfigWithAuthenticator(Okta, sdk.AuthenticationTypeOkta),
 			},
 		},
 	})
@@ -76,11 +75,11 @@ func TestAcc_Provider_UsernamePasswordMfaAuthWithPasscode(t *testing.T) {
 		Steps: []resource.TestStep{
 			// ensure MFA is checked here - accept access to keychain on your device
 			{
-				Config: providerConfigWithAuthenticator(manualtestprofiles.DefaultWithPasscode, sdk.AuthenticationTypeUsernamePasswordMfa),
+				Config: providerConfigWithAuthenticator(DefaultWithPasscode, sdk.AuthenticationTypeUsernamePasswordMfa),
 			},
 			// check that MFA login is cached - this step should not require manual action
 			{
-				Config: providerConfigWithAuthenticator(manualtestprofiles.DefaultWithPasscode, sdk.AuthenticationTypeUsernamePasswordMfa),
+				Config: providerConfigWithAuthenticator(DefaultWithPasscode, sdk.AuthenticationTypeUsernamePasswordMfa),
 			},
 		},
 	})

diff --git a/...acceptance/manualtestprofiles/profiles.go → ..._tests/authentication_methods/profiles.go b/...acceptance/manualtestprofiles/profiles.go → ..._tests/authentication_methods/profiles.go
@@ -1,4 +1,4 @@
-package manualtestprofiles
+package manual
 
 const (
 	DefaultWithPasscode = "default_with_passcode"

diff --git a/pkg/provider/provider_acceptance_test.go b/pkg/provider/provider_acceptance_test.go
@@ -750,8 +750,7 @@ func TestAcc_Provider_invalidConfigurations(t *testing.T) {
 				ExpectError: regexp.MustCompile(`invalid driver log level: invalid`),
 			},
 			{
-				Config: providerConfig("non-existing"),
-				// .* is used to match the error message regarding of the home user location
+				Config:      providerConfig("non-existing"),
 				ExpectError: regexp.MustCompile(fmt.Sprintf(`profile "non-existing" not found in file %s`, tmpServiceUserConfig.Path)),
 			},
 		},