fix: grant privileges to share test terraform dependencies (#2473)

Had to add dependencies between share and database, because sometimes the tests are trying to drop the database before share, which is illegal 👮‍♂️
Snowflake-Labs · Feb 12, 2024 · ede8d95 · ede8d95
1 parent a5f969c
commit ede8d95
Show file tree

Hide file tree

Showing 16 changed files with 102 additions and 52 deletions.
diff --git a/docs/resources/grant_privileges_to_share.md b/docs/resources/grant_privileges_to_share.md
@@ -15,6 +15,16 @@ description: |-
 ## Example Usage
 
 ```terraform
+resource "snowflake_share" "example" {
+  name = "test"
+}
+
+resource "snowflake_database" "example" {
+  # remember to define dependency between objects on a share, because shared objects have to be dropped before dropping share
+  depends_on = [snowflake_share.example]
+  name       = "test"
+}
+
 ##################################
 ### on database
 ##################################

diff --git a/docs/resources/share.md b/docs/resources/share.md
@@ -18,6 +18,12 @@ resource "snowflake_share" "test" {
   comment  = "cool comment"
   accounts = ["organizationName.accountName"]
 }
+
+resource "snowflake_database" "example" {
+  # remember to define dependency between objects on a share, because shared objects have to be dropped before dropping share
+  depends_on = [snowflake_share.test]
+  name       = "test"
+}
 ```
 
 <!-- schema generated by tfplugindocs -->

diff --git a/examples/resources/snowflake_grant_privileges_to_share/resource.tf b/examples/resources/snowflake_grant_privileges_to_share/resource.tf
@@ -1,3 +1,13 @@
+resource "snowflake_share" "example" {
+  name = "test"
+}
+
+resource "snowflake_database" "example" {
+  # remember to define dependency between objects on a share, because shared objects have to be dropped before dropping share
+  depends_on = [snowflake_share.example]
+  name       = "test"
+}
+
 ##################################
 ### on database
 ##################################

diff --git a/examples/resources/snowflake_share/resource.tf b/examples/resources/snowflake_share/resource.tf
@@ -3,3 +3,9 @@ resource "snowflake_share" "test" {
   comment  = "cool comment"
   accounts = ["organizationName.accountName"]
 }
+
+resource "snowflake_database" "example" {
+  # remember to define dependency between objects on a share, because shared objects have to be dropped before dropping share
+  depends_on = [snowflake_share.test]
+  name       = "test"
+}
diff --git a/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnAllTablesInSchema/test.tf b/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnAllTablesInSchema/test.tf
@@ -1,16 +1,17 @@
+resource "snowflake_share" "test" {
+  name = var.to_share
+}
+
 resource "snowflake_database" "test" {
-  name = var.database
+  depends_on = [snowflake_share.test]
+  name       = var.database
 }
 
 resource "snowflake_schema" "test" {
   name     = var.schema
   database = snowflake_database.test.name
 }
 
-resource "snowflake_share" "test" {
-  name = var.to_share
-}
-
 resource "snowflake_grant_privileges_to_share" "test_setup" {
   to_share    = snowflake_share.test.name
   privileges  = ["USAGE"]

diff --git a/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnAllTablesInSchema_NoGrant/test.tf b/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnAllTablesInSchema_NoGrant/test.tf
@@ -1,12 +1,14 @@
+resource "snowflake_share" "test" {
+  name = var.to_share
+}
+
 resource "snowflake_database" "test" {
-  name = var.database
+  depends_on = [snowflake_share.test]
+  name       = var.database
 }
 
 resource "snowflake_schema" "test" {
   name     = var.schema
   database = snowflake_database.test.name
 }
 
-resource "snowflake_share" "test" {
-  name = var.to_share
-}
diff --git a/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnDatabase_NoGrant/test.tf b/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnDatabase_NoGrant/test.tf
@@ -1,7 +1,8 @@
-resource "snowflake_database" "test" {
-  name = var.database
-}
-
 resource "snowflake_share" "test" {
   name = var.to_share
 }
+
+resource "snowflake_database" "test" {
+  depends_on = [snowflake_share.test]
+  name       = var.database
+}
diff --git a/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnDatabase_NoPrivileges/test.tf b/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnDatabase_NoPrivileges/test.tf
@@ -1,11 +1,12 @@
-resource "snowflake_database" "test" {
-  name = var.database
-}
-
 resource "snowflake_share" "test" {
   name = var.to_share
 }
 
+resource "snowflake_database" "test" {
+  depends_on = [snowflake_share.test]
+  name       = var.database
+}
+
 resource "snowflake_grant_privileges_to_share" "test" {
   to_share    = snowflake_share.test.name
   on_database = snowflake_database.test.name

diff --git a/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnSchema/test.tf b/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnSchema/test.tf
@@ -1,16 +1,17 @@
+resource "snowflake_share" "test" {
+  name = var.to_share
+}
+
 resource "snowflake_database" "test" {
-  name = var.database
+  depends_on = [snowflake_share.test]
+  name       = var.database
 }
 
 resource "snowflake_schema" "test" {
   name     = var.schema
   database = snowflake_database.test.name
 }
 
-resource "snowflake_share" "test" {
-  name = var.to_share
-}
-
 resource "snowflake_grant_privileges_to_share" "test_setup" {
   to_share    = snowflake_share.test.name
   privileges  = ["USAGE"]

diff --git a/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnSchema_NoGrant/test.tf b/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnSchema_NoGrant/test.tf
@@ -1,12 +1,14 @@
+resource "snowflake_share" "test" {
+  name = var.to_share
+}
+
 resource "snowflake_database" "test" {
-  name = var.database
+  depends_on = [snowflake_share.test]
+  name       = var.database
 }
 
 resource "snowflake_schema" "test" {
   name     = var.schema
   database = snowflake_database.test.name
 }
 
-resource "snowflake_share" "test" {
-  name = var.to_share
-}
diff --git a/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnTable/test.tf b/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnTable/test.tf
@@ -1,5 +1,10 @@
+resource "snowflake_share" "test" {
+  name = var.to_share
+}
+
 resource "snowflake_database" "test" {
-  name = var.database
+  depends_on = [snowflake_share.test]
+  name       = var.database
 }
 
 resource "snowflake_schema" "test" {
@@ -17,10 +22,6 @@ resource "snowflake_table" "test" {
   }
 }
 
-resource "snowflake_share" "test" {
-  name = var.to_share
-}
-
 resource "snowflake_grant_privileges_to_share" "test_setup" {
   to_share    = snowflake_share.test.name
   privileges  = ["USAGE"]

diff --git a/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnTable_NoGrant/test.tf b/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnTable_NoGrant/test.tf
@@ -1,5 +1,10 @@
+resource "snowflake_share" "test" {
+  name = var.to_share
+}
+
 resource "snowflake_database" "test" {
-  name = var.database
+  depends_on = [snowflake_share.test]
+  name       = var.database
 }
 
 resource "snowflake_schema" "test" {
@@ -16,7 +21,3 @@ resource "snowflake_table" "test" {
     type = "NUMBER(38,0)"
   }
 }
-
-resource "snowflake_share" "test" {
-  name = var.to_share
-}
diff --git a/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnTag/test.tf b/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnTag/test.tf
@@ -1,5 +1,10 @@
+resource "snowflake_share" "test" {
+  name = var.to_share
+}
+
 resource "snowflake_database" "test" {
-  name = var.database
+  depends_on = [snowflake_share.test]
+  name       = var.database
 }
 
 resource "snowflake_schema" "test" {
@@ -13,10 +18,6 @@ resource "snowflake_tag" "test" {
   schema   = snowflake_schema.test.name
 }
 
-resource "snowflake_share" "test" {
-  name = var.to_share
-}
-
 resource "snowflake_grant_privileges_to_share" "test_setup" {
   to_share    = snowflake_share.test.name
   privileges  = ["USAGE"]

diff --git a/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnTag_NoGrant/test.tf b/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnTag_NoGrant/test.tf
@@ -1,5 +1,10 @@
+resource "snowflake_share" "test" {
+  name = var.to_share
+}
+
 resource "snowflake_database" "test" {
-  name = var.database
+  depends_on = [snowflake_share.test]
+  name       = var.database
 }
 
 resource "snowflake_schema" "test" {
@@ -12,7 +17,3 @@ resource "snowflake_tag" "test" {
   database = snowflake_database.test.name
   schema   = snowflake_schema.test.name
 }
-
-resource "snowflake_share" "test" {
-  name = var.to_share
-}
diff --git a/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnView/test.tf b/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnView/test.tf
@@ -1,5 +1,10 @@
+resource "snowflake_share" "test" {
+  name = var.to_share
+}
+
 resource "snowflake_database" "test" {
-  name = var.database
+  depends_on = [snowflake_share.test]
+  name       = var.database
 }
 
 resource "snowflake_schema" "test" {
@@ -25,10 +30,6 @@ resource "snowflake_view" "test" {
   statement = "select \"id\" from \"${snowflake_database.test.name}\".\"${snowflake_schema.test.name}\".\"${snowflake_table.test.name}\""
 }
 
-resource "snowflake_share" "test" {
-  name = var.to_share
-}
-
 resource "snowflake_grant_privileges_to_share" "test_setup" {
   to_share    = snowflake_share.test.name
   privileges  = ["USAGE"]

diff --git a/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnView_NoGrant/test.tf b/pkg/resources/testdata/TestAcc_GrantPrivilegesToShare/OnView_NoGrant/test.tf
@@ -1,5 +1,10 @@
+resource "snowflake_share" "test" {
+  name = var.to_share
+}
+
 resource "snowflake_database" "test" {
-  name = var.database
+  depends_on = [snowflake_share.test]
+  name       = var.database
 }
 
 resource "snowflake_schema" "test" {