fix: Fix tag tests in view and in materialized view (#2457)

Added generated tag names because sometimes tests were failing because the name was already occupied.
Snowflake-Labs · Feb 2, 2024 · 2de942a · 2de942a
1 parent fdb4f88
commit 2de942a
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 29 deletions.
diff --git a/pkg/resources/materialized_view_acceptance_test.go b/pkg/resources/materialized_view_acceptance_test.go
@@ -102,6 +102,8 @@ func TestAcc_MaterializedView(t *testing.T) {
 func TestAcc_MaterializedView_Tags(t *testing.T) {
 	tableName := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
 	viewName := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
+	tag1Name := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
+	tag2Name := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
 
 	queryEscaped := fmt.Sprintf("SELECT ID FROM \\\"%s\\\"", tableName)
 
@@ -115,20 +117,20 @@ func TestAcc_MaterializedView_Tags(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create tags
 			{
-				Config: materializedViewConfigWithTags(acc.TestWarehouseName, tableName, viewName, queryEscaped, acc.TestDatabaseName, acc.TestSchemaName, "test_tag"),
+				Config: materializedViewConfigWithTags(acc.TestWarehouseName, tableName, viewName, queryEscaped, acc.TestDatabaseName, acc.TestSchemaName, "test_tag", tag1Name, tag2Name),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("snowflake_materialized_view.test", "name", viewName),
 					resource.TestCheckResourceAttr("snowflake_materialized_view.test", "tag.#", "1"),
-					resource.TestCheckResourceAttr("snowflake_materialized_view.test", "tag.0.name", "tag1"),
+					resource.TestCheckResourceAttr("snowflake_materialized_view.test", "tag.0.name", tag1Name),
 				),
 			},
 			// update tags
 			{
-				Config: materializedViewConfigWithTags(acc.TestWarehouseName, tableName, viewName, queryEscaped, acc.TestDatabaseName, acc.TestSchemaName, "test_tag_2"),
+				Config: materializedViewConfigWithTags(acc.TestWarehouseName, tableName, viewName, queryEscaped, acc.TestDatabaseName, acc.TestSchemaName, "test_tag_2", tag1Name, tag2Name),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("snowflake_materialized_view.test", "name", viewName),
 					resource.TestCheckResourceAttr("snowflake_materialized_view.test", "tag.#", "1"),
-					resource.TestCheckResourceAttr("snowflake_materialized_view.test", "tag.0.name", "tag2"),
+					resource.TestCheckResourceAttr("snowflake_materialized_view.test", "tag.0.name", tag2Name),
 				),
 			},
 			// IMPORT
@@ -209,12 +211,12 @@ resource "snowflake_materialized_view" "test" {
 `, tableName, databaseName, schemaName, viewName, comment, databaseName, schemaName, warehouseName, isSecure, orReplace, q)
 }
 
-func materializedViewConfigWithTags(warehouseName string, tableName string, viewName string, q string, databaseName string, schemaName string, tag string) string {
+func materializedViewConfigWithTags(warehouseName string, tableName string, viewName string, q string, databaseName string, schemaName string, tag string, tag1Name string, tag2Name string) string {
 	return fmt.Sprintf(`
 resource "snowflake_table" "test" {
-	name     = "%s"
-	database = "%s"
-	schema   = "%s"
+	name     = "%[1]s"
+	database = "%[2]s"
+	schema   = "%[3]s"
 
 	column {
 		name = "ID"
@@ -223,32 +225,36 @@ resource "snowflake_table" "test" {
 }
 
 resource "snowflake_tag" "test_tag" {
-	name     = "tag1"
-	database = "%s"
-	schema   = "%s"
+	name     = "%[8]s"
+	database = "%[2]s"
+	schema   = "%[3]s"
 }
 
 resource "snowflake_tag" "test_tag_2" {
-	name     = "tag2"
-	database = "%s"
-	schema   = "%s"
+	name     = "%[9]s"
+	database = "%[2]s"
+	schema   = "%[3]s"
 }
 
 resource "snowflake_materialized_view" "test" {
-	name      = "%s"
-	database  = "%s"
-	schema    = "%s"
-	warehouse = "%s"
-	statement = "%s"
+	name      = "%[4]s"
+	database  = "%[2]s"
+	schema    = "%[3]s"
+	warehouse = "%[5]s"
+	statement = "%[6]s"
 
 	tag {
-		name = snowflake_tag.%s.name
-		schema = snowflake_tag.%s.schema
-		database = snowflake_tag.%s.database
+		name = snowflake_tag.%[7]s.name
+		schema = snowflake_tag.%[7]s.schema
+		database = snowflake_tag.%[7]s.database
 		value = "some_value"
 	}
+
+	depends_on = [
+		snowflake_table.test
+	]
 }
-`, tableName, databaseName, schemaName, databaseName, schemaName, databaseName, schemaName, viewName, databaseName, schemaName, warehouseName, q, tag, tag, tag)
+`, tableName, databaseName, schemaName, viewName, warehouseName, q, tag, tag1Name, tag2Name)
 }
 
 func testAccCheckMaterializedViewDestroy(s *terraform.State) error {

diff --git a/pkg/resources/testdata/TestAcc_View_Tags/1/test.tf b/pkg/resources/testdata/TestAcc_View_Tags/1/test.tf
@@ -1,11 +1,11 @@
 resource "snowflake_tag" "test_tag" {
-  name     = "tag1"
+  name     = var.tag1Name
   database = var.database
   schema   = var.schema
 }
 
 resource "snowflake_tag" "test_tag_2" {
-  name     = "tag2"
+  name     = var.tag2Name
   database = var.database
   schema   = var.schema
 }

diff --git a/pkg/resources/testdata/TestAcc_View_Tags/1/variables.tf b/pkg/resources/testdata/TestAcc_View_Tags/1/variables.tf
@@ -13,3 +13,11 @@ variable "schema" {
 variable "statement" {
   type = string
 }
+
+variable "tag1Name" {
+  type = string
+}
+
+variable "tag2Name" {
+  type = string
+}
diff --git a/pkg/resources/testdata/TestAcc_View_Tags/2/test.tf b/pkg/resources/testdata/TestAcc_View_Tags/2/test.tf
@@ -1,11 +1,11 @@
 resource "snowflake_tag" "test_tag" {
-  name     = "tag1"
+  name     = var.tag1Name
   database = var.database
   schema   = var.schema
 }
 
 resource "snowflake_tag" "test_tag_2" {
-  name     = "tag2"
+  name     = var.tag2Name
   database = var.database
   schema   = var.schema
 }

diff --git a/pkg/resources/testdata/TestAcc_View_Tags/2/variables.tf b/pkg/resources/testdata/TestAcc_View_Tags/2/variables.tf
@@ -13,3 +13,11 @@ variable "schema" {
 variable "statement" {
   type = string
 }
+
+variable "tag1Name" {
+  type = string
+}
+
+variable "tag2Name" {
+  type = string
+}
diff --git a/pkg/resources/view_acceptance_test.go b/pkg/resources/view_acceptance_test.go
@@ -124,6 +124,8 @@ func TestAcc_View(t *testing.T) {
 
 func TestAcc_View_Tags(t *testing.T) {
 	viewName := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
+	tag1Name := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
+	tag2Name := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
 
 	query := "SELECT ROLE_NAME, ROLE_OWNER FROM INFORMATION_SCHEMA.APPLICABLE_ROLES"
 
@@ -133,6 +135,8 @@ func TestAcc_View_Tags(t *testing.T) {
 			"database":  config.StringVariable(acc.TestDatabaseName),
 			"schema":    config.StringVariable(acc.TestSchemaName),
 			"statement": config.StringVariable(query),
+			"tag1Name":  config.StringVariable(tag1Name),
+			"tag2Name":  config.StringVariable(tag2Name),
 		}
 	}
 
@@ -151,7 +155,7 @@ func TestAcc_View_Tags(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("snowflake_view.test", "name", viewName),
 					resource.TestCheckResourceAttr("snowflake_view.test", "tag.#", "1"),
-					resource.TestCheckResourceAttr("snowflake_view.test", "tag.0.name", "tag1"),
+					resource.TestCheckResourceAttr("snowflake_view.test", "tag.0.name", tag1Name),
 					resource.TestCheckResourceAttr("snowflake_view.test", "tag.0.value", "some_value"),
 				),
 			},
@@ -162,7 +166,7 @@ func TestAcc_View_Tags(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("snowflake_view.test", "name", viewName),
 					resource.TestCheckResourceAttr("snowflake_view.test", "tag.#", "1"),
-					resource.TestCheckResourceAttr("snowflake_view.test", "tag.0.name", "tag2"),
+					resource.TestCheckResourceAttr("snowflake_view.test", "tag.0.name", tag2Name),
 					resource.TestCheckResourceAttr("snowflake_view.test", "tag.0.value", "some_value"),
 				),
 			},