Use new methods for all user models

Snowflake-Labs · Dec 20, 2024 · 6946308 · 6946308
1 parent fb8b9ad
commit 6946308
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/pkg/datasources/users_acceptance_test.go b/pkg/datasources/users_acceptance_test.go
@@ -46,8 +46,8 @@ func TestAcc_Users_PersonUser(t *testing.T) {
 		WithDefaultRole("some_role").
 		WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
 		WithMinsToBypassMfa(10).
-		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key1)).
-		WithRsaPublicKey2Value(config.MultilineWrapperVariable(key2)).
+		WithRsaPublicKey(key1).
+		WithRsaPublicKey2(key2).
 		WithComment(comment).
 		WithDisableMfa("true")
 
@@ -204,8 +204,8 @@ func TestAcc_Users_ServiceUser(t *testing.T) {
 		WithDefaultNamespace("some.namespace").
 		WithDefaultRole("some_role").
 		WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
-		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key1)).
-		WithRsaPublicKey2Value(config.MultilineWrapperVariable(key2)).
+		WithRsaPublicKey(key1).
+		WithRsaPublicKey2(key2).
 		WithComment(comment)
 
 	resource.Test(t, resource.TestCase{
@@ -364,8 +364,8 @@ func TestAcc_Users_LegacyServiceUser(t *testing.T) {
 		WithDefaultNamespace("some.namespace").
 		WithDefaultRole("some_role").
 		WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
-		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key1)).
-		WithRsaPublicKey2Value(config.MultilineWrapperVariable(key2)).
+		WithRsaPublicKey(key1).
+		WithRsaPublicKey2(key2).
 		WithComment(comment)
 
 	resource.Test(t, resource.TestCase{

diff --git a/pkg/resources/legacy_service_user_acceptance_test.go b/pkg/resources/legacy_service_user_acceptance_test.go
@@ -56,8 +56,8 @@ func TestAcc_LegacyServiceUser_BasicFlows(t *testing.T) {
 		WithDefaultNamespace("some.namespace").
 		WithDefaultRole("some_role").
 		WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
-		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key1)).
-		WithRsaPublicKey2Value(config.MultilineWrapperVariable(key2)).
+		WithRsaPublicKey(key1).
+		WithRsaPublicKey2(key2).
 		WithComment(comment)
 
 	userModelAllAttributesChanged := func(loginName string) *model.LegacyServiceUserModel {
@@ -74,8 +74,8 @@ func TestAcc_LegacyServiceUser_BasicFlows(t *testing.T) {
 			WithDefaultNamespace("one_part_namespace").
 			WithDefaultRole("other_role").
 			WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
-			WithRsaPublicKeyValue(config.MultilineWrapperVariable(key2)).
-			WithRsaPublicKey2Value(config.MultilineWrapperVariable(key1)).
+			WithRsaPublicKey(key2).
+			WithRsaPublicKey2(key1).
 			WithComment(newComment)
 	}
 

diff --git a/pkg/resources/service_user_acceptance_test.go b/pkg/resources/service_user_acceptance_test.go
@@ -51,8 +51,8 @@ func TestAcc_ServiceUser_BasicFlows(t *testing.T) {
 		WithDefaultNamespace("some.namespace").
 		WithDefaultRole("some_role").
 		WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
-		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key1)).
-		WithRsaPublicKey2Value(config.MultilineWrapperVariable(key2)).
+		WithRsaPublicKey(key1).
+		WithRsaPublicKey2(key2).
 		WithComment(comment)
 
 	userModelAllAttributesChanged := func(loginName string) *model.ServiceUserModel {
@@ -67,8 +67,8 @@ func TestAcc_ServiceUser_BasicFlows(t *testing.T) {
 			WithDefaultNamespace("one_part_namespace").
 			WithDefaultRole("other_role").
 			WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
-			WithRsaPublicKeyValue(config.MultilineWrapperVariable(key2)).
-			WithRsaPublicKey2Value(config.MultilineWrapperVariable(key1)).
+			WithRsaPublicKey(key2).
+			WithRsaPublicKey2(key1).
 			WithComment(newComment)
 	}
 

diff --git a/pkg/resources/user_acceptance_test.go b/pkg/resources/user_acceptance_test.go
@@ -64,8 +64,8 @@ func TestAcc_User_BasicFlows(t *testing.T) {
 		WithDefaultRole("some_role").
 		WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
 		WithMinsToBypassMfa(10).
-		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key1)).
-		WithRsaPublicKey2Value(config.MultilineWrapperVariable(key2)).
+		WithRsaPublicKey(key1).
+		WithRsaPublicKey2(key2).
 		WithComment(comment).
 		WithDisableMfa("true")
 
@@ -87,8 +87,8 @@ func TestAcc_User_BasicFlows(t *testing.T) {
 			WithDefaultRole("other_role").
 			WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
 			WithMinsToBypassMfa(14).
-			WithRsaPublicKeyValue(config.MultilineWrapperVariable(key2)).
-			WithRsaPublicKey2Value(config.MultilineWrapperVariable(key1)).
+			WithRsaPublicKey(key2).
+			WithRsaPublicKey2(key1).
 			WithComment(newComment).
 			WithDisableMfa("false")
 	}
@@ -696,15 +696,15 @@ func TestAcc_User_issue2970(t *testing.T) {
 
 	userModel := model.User(resourceName, userId.Name()).
 		WithPassword(pass).
-		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key))
+		WithRsaPublicKey(key)
 
 	newUserModelIncorrectNewKey := model.User(resourceName, userId.Name()).
 		WithPassword(newPass).
-		WithRsaPublicKeyValue(config.MultilineWrapperVariable(incorrectlyFormattedNewKey))
+		WithRsaPublicKey(incorrectlyFormattedNewKey)
 
 	newUserModel := model.User(resourceName, userId.Name()).
 		WithPassword(newPass).
-		WithRsaPublicKeyValue(config.MultilineWrapperVariable(newKey))
+		WithRsaPublicKey(newKey)
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,