chore: Random ids rework part4 (#2837)

Do not use the following methods for id creation in tests: - NewDatabaseObjectIdentifier - NewDatabaseObjectIdentifierFromFullyQualifiedName - NewSchemaObjectIdentifierInSchema - NewSchemaObjectIdentifier - NewSchemaObjectIdentifierWithArguments - NewSchemaObjectIdentifierFromFullyQualifiedName
Snowflake-Labs · May 29, 2024 · 64518a3 · 64518a3
1 parent 30fe136
commit 64518a3
Show file tree

Hide file tree

Showing 99 changed files with 1,096 additions and 1,073 deletions.
diff --git a/pkg/acceptance/helpers/table_client.go b/pkg/acceptance/helpers/table_client.go
@@ -76,7 +76,7 @@ func (c *TableClient) DropTableFunc(t *testing.T, id sdk.SchemaObjectIdentifier)
 
 	return func() {
 		// to prevent error when schema was removed before the table
-		_, err := c.context.client.Schemas.ShowByID(ctx, sdk.NewDatabaseObjectIdentifier(id.DatabaseName(), id.SchemaName()))
+		_, err := c.context.client.Schemas.ShowByID(ctx, id.SchemaId())
 		if errors.Is(err, sdk.ErrObjectNotExistOrAuthorized) {
 			return
 		}

diff --git a/pkg/datasources/alerts_acceptance_test.go b/pkg/datasources/alerts_acceptance_test.go
@@ -6,12 +6,13 @@ import (
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
 func TestAcc_Alerts(t *testing.T) {
-	name := acc.TestClient().Ids.Alpha()
+	alertId := acc.TestClient().Ids.RandomSchemaObjectIdentifier()
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
@@ -22,33 +23,33 @@ func TestAcc_Alerts(t *testing.T) {
 		CheckDestroy: nil,
 		Steps: []resource.TestStep{
 			{
-				Config: alertsResourceConfig(name) + alertsDatasourceConfigNoOptionals(),
+				Config: alertsResourceConfig(alertId) + alertsDatasourceConfigNoOptionals(),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.snowflake_alerts.test_datasource_alert", "alerts.#"),
 				),
 			},
 			{
-				Config: alertsResourceConfig(name) + alertsDatasourceConfigDbOnly(),
+				Config: alertsResourceConfig(alertId) + alertsDatasourceConfigDbOnly(),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.snowflake_alerts.test_datasource_alert", "alerts.#"),
 				),
 			},
 			{
-				Config: alertsResourceConfig(name) + alertsDatasourceConfigDbAndSchema(),
+				Config: alertsResourceConfig(alertId) + alertsDatasourceConfigDbAndSchema(),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.snowflake_alerts.test_datasource_alert", "alerts.#"),
-					resource.TestCheckResourceAttr("data.snowflake_alerts.test_datasource_alert", "alerts.0.name", name),
+					resource.TestCheckResourceAttr("data.snowflake_alerts.test_datasource_alert", "alerts.0.name", alertId.Name()),
 				),
 			},
 			{
-				Config: alertsResourceConfig(name) + alertsDatasourceConfigAllOptionals(name),
+				Config: alertsResourceConfig(alertId) + alertsDatasourceConfigAllOptionals(alertId),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.snowflake_alerts.test_datasource_alert", "alerts.#"),
-					resource.TestCheckResourceAttr("data.snowflake_alerts.test_datasource_alert", "alerts.0.name", name),
+					resource.TestCheckResourceAttr("data.snowflake_alerts.test_datasource_alert", "alerts.0.name", alertId.Name()),
 				),
 			},
 			{
-				Config: alertsResourceConfig(name) + alertsDatasourceConfigSchemaOnly(),
+				Config: alertsResourceConfig(alertId) + alertsDatasourceConfigSchemaOnly(),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.snowflake_alerts.test_datasource_alert", "alerts.#"),
 				),
@@ -57,7 +58,7 @@ func TestAcc_Alerts(t *testing.T) {
 	})
 }
 
-func alertsResourceConfig(name string) string {
+func alertsResourceConfig(alertId sdk.SchemaObjectIdentifier) string {
 	return fmt.Sprintf(`
 resource "snowflake_alert" "test_resource_alert" {
 	name     	      = "%s"
@@ -72,7 +73,7 @@ resource "snowflake_alert" "test_resource_alert" {
 		interval = "60"
 	}
 }
-`, name, acc.TestDatabaseName, acc.TestSchemaName, acc.TestWarehouseName)
+`, alertId.Name(), alertId.DatabaseName(), alertId.SchemaName(), acc.TestWarehouseName)
 }
 
 func alertsDatasourceConfigNoOptionals() string {
@@ -98,14 +99,14 @@ data "snowflake_alerts" "test_datasource_alert" {
 `, acc.TestDatabaseName, acc.TestSchemaName)
 }
 
-func alertsDatasourceConfigAllOptionals(name string) string {
+func alertsDatasourceConfigAllOptionals(alertId sdk.SchemaObjectIdentifier) string {
 	return fmt.Sprintf(`
 data "snowflake_alerts" "test_datasource_alert" {
 	database  	      = "%s"
 	schema  	      = "%s"
 	pattern  	      = "%s"
 }
-`, acc.TestDatabaseName, acc.TestSchemaName, name)
+`, alertId.DatabaseName(), alertId.SchemaName(), alertId.Name())
 }
 
 func alertsDatasourceConfigSchemaOnly() string {

diff --git a/pkg/resources/dynamic_table_acceptance_test.go b/pkg/resources/dynamic_table_acceptance_test.go
@@ -161,8 +161,8 @@ func TestAcc_DynamicTable_issue2173(t *testing.T) {
 	tableName := dynamicTableName + "_table"
 	tableId := acc.TestClient().Ids.NewSchemaObjectIdentifier(tableName)
 	query := fmt.Sprintf(`select "ID" from %s`, tableId.FullyQualifiedName())
-	otherSchema := acc.TestClient().Ids.Alpha()
-	otherSchemaId := sdk.NewDatabaseObjectIdentifier(acc.TestDatabaseName, otherSchema)
+	otherSchemaId := acc.TestClient().Ids.RandomDatabaseObjectIdentifier()
+	otherSchemaName := otherSchemaId.Name()
 	newDynamicTableId := acc.TestClient().Ids.NewSchemaObjectIdentifierInSchema(dynamicTableName, otherSchemaId)
 	m := func() map[string]config.Variable {
 		return map[string]config.Variable{
@@ -173,7 +173,7 @@ func TestAcc_DynamicTable_issue2173(t *testing.T) {
 			"query":        config.StringVariable(query),
 			"comment":      config.StringVariable("Terraform acceptance test for GH issue 2173"),
 			"table_name":   config.StringVariable(tableName),
-			"other_schema": config.StringVariable(otherSchema),
+			"other_schema": config.StringVariable(otherSchemaName),
 		}
 	}
 
@@ -192,7 +192,7 @@ func TestAcc_DynamicTable_issue2173(t *testing.T) {
 					PreApply: []plancheck.PlanCheck{plancheck.ExpectNonEmptyPlan()},
 				},
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("snowflake_schema.other_schema", "name", otherSchema),
+					resource.TestCheckResourceAttr("snowflake_schema.other_schema", "name", otherSchemaName),
 					resource.TestCheckResourceAttr("snowflake_table.t", "name", tableName),
 				),
 			},

diff --git a/pkg/resources/dynamic_table_test.go b/pkg/resources/dynamic_table_test.go
@@ -19,7 +19,7 @@ func init() {
 			}
 			ctx := context.Background()
 			dynamicTables, err := client.DynamicTables.Show(ctx, sdk.NewShowDynamicTableRequest().WithIn(&sdk.In{
-				Schema: sdk.NewDatabaseObjectIdentifier(acc.TestDatabaseName, acc.TestSchemaName),
+				Schema: acc.TestClient().Ids.SchemaId(),
 			}))
 			if err != nil {
 				return fmt.Errorf("error getting dynamic tables during sweep: %w", err)

diff --git a/pkg/resources/external_function_acceptance_test.go b/pkg/resources/external_function_acceptance_test.go
@@ -226,7 +226,8 @@ func TestAcc_ExternalFunction_complete(t *testing.T) {
 }
 
 func TestAcc_ExternalFunction_migrateFromVersion085(t *testing.T) {
-	name := acc.TestClient().Ids.Alpha()
+	id := acc.TestClient().Ids.RandomSchemaObjectIdentifierWithArguments([]sdk.DataType{sdk.DataTypeVARCHAR, sdk.DataTypeVARCHAR})
+	name := id.Name()
 	resourceName := "snowflake_external_function.f"
 
 	resource.Test(t, resource.TestCase{
@@ -261,7 +262,7 @@ func TestAcc_ExternalFunction_migrateFromVersion085(t *testing.T) {
 					PreApply: []plancheck.PlanCheck{plancheck.ExpectEmptyPlan()},
 				},
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(resourceName, "id", sdk.NewSchemaObjectIdentifierWithArguments(acc.TestDatabaseName, acc.TestSchemaName, name, []sdk.DataType{sdk.DataTypeVARCHAR, sdk.DataTypeVARCHAR}).FullyQualifiedName()),
+					resource.TestCheckResourceAttr(resourceName, "id", id.FullyQualifiedName()),
 					resource.TestCheckResourceAttr(resourceName, "name", name),
 					resource.TestCheckResourceAttr(resourceName, "database", acc.TestDatabaseName),
 					resource.TestCheckResourceAttr(resourceName, "schema", acc.TestSchemaName),

diff --git a/pkg/resources/function_acceptance_test.go b/pkg/resources/function_acceptance_test.go
@@ -185,7 +185,8 @@ func TestAcc_Function_complex(t *testing.T) {
 
 // proves issue https://github.com/Snowflake-Labs/terraform-provider-snowflake/issues/2490
 func TestAcc_Function_migrateFromVersion085(t *testing.T) {
-	name := acc.TestClient().Ids.Alpha()
+	id := acc.TestClient().Ids.RandomSchemaObjectIdentifierWithArguments([]sdk.DataType{sdk.DataTypeVARCHAR})
+	name := id.Name()
 	comment := random.Comment()
 	resourceName := "snowflake_function.f"
 
@@ -220,7 +221,7 @@ func TestAcc_Function_migrateFromVersion085(t *testing.T) {
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
 				Config:                   functionConfig(acc.TestDatabaseName, acc.TestSchemaName, name, comment),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(resourceName, "id", sdk.NewSchemaObjectIdentifierWithArguments(acc.TestDatabaseName, acc.TestSchemaName, name, []sdk.DataType{sdk.DataTypeVARCHAR}).FullyQualifiedName()),
+					resource.TestCheckResourceAttr(resourceName, "id", id.FullyQualifiedName()),
 					resource.TestCheckResourceAttr(resourceName, "name", name),
 					resource.TestCheckResourceAttr(resourceName, "database", acc.TestDatabaseName),
 					resource.TestCheckResourceAttr(resourceName, "schema", acc.TestSchemaName),

diff --git a/pkg/resources/grant_database_role_acceptance_test.go b/pkg/resources/grant_database_role_acceptance_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/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/config"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -128,19 +127,18 @@ func TestAcc_GrantDatabaseRole_accountRole(t *testing.T) {
 
 // proves https://github.com/Snowflake-Labs/terraform-provider-snowflake/issues/2410 is fixed
 func TestAcc_GrantDatabaseRole_share(t *testing.T) {
-	databaseName := acc.TestClient().Ids.Alpha()
-	databaseRoleName := acc.TestClient().Ids.Alpha()
-	databaseRoleId := sdk.NewDatabaseObjectIdentifier(databaseName, databaseRoleName).FullyQualifiedName()
+	databaseId := acc.TestClient().Ids.RandomAccountObjectIdentifier()
+	databaseRoleId := acc.TestClient().Ids.RandomDatabaseObjectIdentifierInDatabase(databaseId)
 	shareId := acc.TestClient().Ids.RandomAccountObjectIdentifier()
-	shareName := shareId.Name()
-	resourceName := "snowflake_grant_database_role.test"
+
 	configVariables := func() config.Variables {
 		return config.Variables{
-			"database":           config.StringVariable(databaseName),
-			"database_role_name": config.StringVariable(databaseRoleName),
-			"share_name":         config.StringVariable(shareName),
+			"database":           config.StringVariable(databaseId.Name()),
+			"database_role_name": config.StringVariable(databaseRoleId.Name()),
+			"share_name":         config.StringVariable(shareId.Name()),
 		}
 	}
+	resourceName := "snowflake_grant_database_role.test"
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
 		PreCheck:                 func() { acc.TestAccPreCheck(t) },
@@ -153,9 +151,9 @@ func TestAcc_GrantDatabaseRole_share(t *testing.T) {
 				ConfigDirectory: config.StaticDirectory("testdata/TestAcc_GrantDatabaseRole/share"),
 				ConfigVariables: configVariables(),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(resourceName, "database_role_name", databaseRoleId),
-					resource.TestCheckResourceAttr(resourceName, "share_name", shareName),
-					resource.TestCheckResourceAttr(resourceName, "id", fmt.Sprintf(`%v|%v|%v`, databaseRoleId, "SHARE", shareId.FullyQualifiedName())),
+					resource.TestCheckResourceAttr(resourceName, "database_role_name", databaseRoleId.FullyQualifiedName()),
+					resource.TestCheckResourceAttr(resourceName, "share_name", shareId.Name()),
+					resource.TestCheckResourceAttr(resourceName, "id", fmt.Sprintf(`%v|%v|%v`, databaseRoleId.FullyQualifiedName(), "SHARE", shareId.FullyQualifiedName())),
 				),
 			},
 			// test import