Fix test

Snowflake-Labs · Jun 14, 2024 · 082945a · 082945a
1 parent a6d7ce6
commit 082945a
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/pkg/acceptance/helpers/database_client.go b/pkg/acceptance/helpers/database_client.go
@@ -110,18 +110,16 @@ func (c *DatabaseClient) CreatePrimaryDatabase(t *testing.T, enableReplicationTo
 	return primaryDatabase, externalPrimaryId, primaryDatabaseCleanup
 }
 
-func (c *DatabaseClient) UpdateDataRetentionTime(t *testing.T, id sdk.AccountObjectIdentifier, days int) func() {
+func (c *DatabaseClient) UpdateDataRetentionTime(t *testing.T, id sdk.AccountObjectIdentifier, days int) {
 	t.Helper()
 	ctx := context.Background()
 
-	return func() {
-		err := c.client().Alter(ctx, id, &sdk.AlterDatabaseOptions{
-			Set: &sdk.DatabaseSet{
-				DataRetentionTimeInDays: sdk.Int(days),
-			},
-		})
-		require.NoError(t, err)
-	}
+	err := c.client().Alter(ctx, id, &sdk.AlterDatabaseOptions{
+		Set: &sdk.DatabaseSet{
+			DataRetentionTimeInDays: sdk.Int(days),
+		},
+	})
+	require.NoError(t, err)
 }
 
 func (c *DatabaseClient) UnsetCatalog(t *testing.T, id sdk.AccountObjectIdentifier) {

diff --git a/pkg/acceptance/testenvs/testing_environment_variables.go b/pkg/acceptance/testenvs/testing_environment_variables.go
@@ -2,9 +2,10 @@ package testenvs
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"os"
 	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
 type env string

diff --git a/pkg/resources/database_acceptance_test.go b/pkg/resources/database_acceptance_test.go
@@ -2,10 +2,11 @@ package resources_test
 
 import (
 	"fmt"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"strconv"
 	"testing"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/snowflakechecks"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/importchecks"
@@ -755,7 +756,8 @@ func TestAcc_Database_IntParameter(t *testing.T) {
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.PrintPlanDetails("snowflake_database.test", "data_retention_time_in_days"),
-						planchecks.ExpectChange("snowflake_database.test", "data_retention_time_in_days", tfjson.ActionNoop, sdk.String("25"), sdk.String("25")),
+						planchecks.ExpectDrift("snowflake_database.test", "data_retention_time_in_days", sdk.String("25"), sdk.String("50")),
+						planchecks.ExpectChange("snowflake_database.test", "data_retention_time_in_days", tfjson.ActionUpdate, sdk.String("50"), sdk.String("25")),
 						planchecks.ExpectComputed("snowflake_database.test", "data_retention_time_in_days", false),
 					},
 				},
@@ -874,8 +876,8 @@ func TestAcc_Database_IntParameter(t *testing.T) {
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.PrintPlanDetails("snowflake_database.test", "data_retention_time_in_days"),
-						planchecks.ExpectChange("snowflake_database.test", "data_retention_time_in_days", tfjson.ActionNoop, sdk.String("50"), sdk.String("50")),
-						planchecks.ExpectComputed("snowflake_database.test", "data_retention_time_in_days", false),
+						planchecks.ExpectChange("snowflake_database.test", "data_retention_time_in_days", tfjson.ActionUpdate, sdk.String("50"), nil),
+						planchecks.ExpectComputed("snowflake_database.test", "data_retention_time_in_days", true),
 					},
 				},
 				Check: resource.ComposeTestCheckFunc(

diff --git a/pkg/resources/database_old_acceptance_test.go b/pkg/resources/database_old_acceptance_test.go
@@ -306,7 +306,7 @@ func TestAcc_Database_DefaultDataRetentionTime_SetOutsideOfTerraform(t *testing.
 				),
 			},
 			{
-				PreConfig:       acc.TestClient().Database.UpdateDataRetentionTime(t, id, 20),
+				PreConfig:       func() { acc.TestClient().Database.UpdateDataRetentionTime(t, id, 20) },
 				ConfigDirectory: acc.ConfigurationDirectory("TestAcc_Database_DefaultDataRetentionTime/WithoutDataRetentionSet"),
 				ConfigVariables: configVariablesWithoutDatabaseDataRetentionTime(),
 				Check: resource.ComposeTestCheckFunc(

diff --git a/pkg/resources/testdata/TestAcc_GrantPrivilegesToAccountRole/ImportedPrivileges/test.tf b/pkg/resources/testdata/TestAcc_GrantPrivilegesToAccountRole/ImportedPrivileges/test.tf
@@ -1,5 +1,5 @@
 resource "snowflake_shared_database" "test" {
-  name                        = var.shared_database_name
+  name       = var.shared_database_name
   from_share = var.external_share_name
 }
 

diff --git a/pkg/resources/testdata/TestAcc_GrantPrivilegesToRole/ImportedPrivileges/test.tf b/pkg/resources/testdata/TestAcc_GrantPrivilegesToRole/ImportedPrivileges/test.tf
@@ -1,5 +1,5 @@
 resource "snowflake_shared_database" "test" {
-  name                        = var.shared_database_name
+  name       = var.shared_database_name
   from_share = var.external_share_name
 }