From 0f6865f298b5527a36a44e751bff88ba03e6b812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Cie=C5=9Blak?= Date: Fri, 14 Jun 2024 15:27:45 +0200 Subject: [PATCH] Fix test --- pkg/acceptance/helpers/database_client.go | 16 +++++++--------- pkg/resources/database_acceptance_test.go | 3 ++- pkg/resources/database_old_acceptance_test.go | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pkg/acceptance/helpers/database_client.go b/pkg/acceptance/helpers/database_client.go index 06eb35488b..2e9c71cf23 100644 --- 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/resources/database_acceptance_test.go b/pkg/resources/database_acceptance_test.go index 86e9702be8..006ce065a3 100644 --- a/pkg/resources/database_acceptance_test.go +++ b/pkg/resources/database_acceptance_test.go @@ -755,7 +755,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), }, }, diff --git a/pkg/resources/database_old_acceptance_test.go b/pkg/resources/database_old_acceptance_test.go index 0ffb9f04e8..37cc76d7aa 100644 --- 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(