passing tests

pkg/resources/grant_privileges_to_account_role.go

@@ -314,6 +314,9 @@ func ImportGrantPrivilegesToAccountRole() func(ctx context.Context, d *schema.Re
 		if err := d.Set("privileges", id.Privileges); err != nil {
 			return nil, err
 		}
+		if err := d.Set("on_account", false); err != nil {
+			return nil, err
+		}
 
 		switch id.Kind {
 		case OnAccountAccountRoleGrantKind:

pkg/resources/testdata/TestAcc_GrantPrivilegesToAccountRole/AlwaysApply/test.tf

@@ -1,6 +1,9 @@
-resource "snowflake_grant_privileges_to_database_role" "test" {
-  database_role_name = "${var.database}.${var.name}"
+resource "snowflake_grant_privileges_to_account_role" "test" {
+  role_name = var.name
   all_privileges     = var.all_privileges
-  on_database        = var.database
   always_apply       = var.always_apply
+  on_account_object {
+    object_type = "DATABASE"
+    object_name = var.database
+  }
 }

pkg/resources/testdata/TestAcc_GrantPrivilegesToAccountRole/OnAccountObject_InfinitePlan/test.tf

@@ -0,0 +1,8 @@
+resource "snowflake_grant_privileges_to_role" "test" {
+  privileges = ["CREATE SCHEMA"]
+  role_name  = "\"${var.name}\""
+  on_account_object {
+    object_type = "DATABASE"
+    object_name = var.database
+  }
+}

pkg/resources/testdata/TestAcc_GrantPrivilegesToAccountRole/OnAccountObject_InfinitePlan/variables.tf

@@ -0,0 +1,7 @@
+variable "name" {
+  type = string
+}
+
+variable "database" {
+  type = string
+}

pkg/resources/testdata/TestAcc_GrantPrivilegesToAccountRole/OnAllSchemasInDatabase/test.tf

@@ -1,9 +1,9 @@
-resource "snowflake_grant_privileges_to_database_role" "test" {
-  database_role_name = "\"${var.database}\".\"${var.name}\""
+resource "snowflake_grant_privileges_to_account_role" "test" {
+  role_name = var.name
   privileges         = var.privileges
   with_grant_option  = var.with_grant_option
 
   on_schema {
-    all_schemas_in_database = "\"${var.database}\""
+    all_schemas_in_database = var.database
   }
 }

pkg/resources/testdata/TestAcc_GrantPrivilegesToAccountRole/OnFutureSchemasInDatabase/test.tf

@@ -1,9 +1,9 @@
-resource "snowflake_grant_privileges_to_database_role" "test" {
-  database_role_name = "\"${var.database}\".\"${var.name}\""
+resource "snowflake_grant_privileges_to_account_role" "test" {
+  role_name = var.name
   privileges         = var.privileges
   with_grant_option  = var.with_grant_option
 
   on_schema {
-    future_schemas_in_database = "\"${var.database}\""
+    future_schemas_in_database = var.database
   }
 }

pkg/resources/testdata/TestAcc_GrantPrivilegesToAccountRole/OnSchema/test.tf

@@ -1,5 +1,5 @@
-resource "snowflake_grant_privileges_to_database_role" "test" {
-  database_role_name = "\"${var.database}\".\"${var.name}\""
+resource "snowflake_grant_privileges_to_account_role" "test" {
+  role_name = var.name
   privileges         = var.privileges
   with_grant_option  = var.with_grant_option
 

pkg/resources/testdata/TestAcc_GrantPrivilegesToAccountRole/OnSchemaObject_OnAll_InDatabase/test.tf

@@ -1,12 +1,12 @@
-resource "snowflake_grant_privileges_to_database_role" "test" {
-  database_role_name = "\"${var.database}\".\"${var.name}\""
+resource "snowflake_grant_privileges_to_account_role" "test" {
+  role_name = var.name
   privileges         = var.privileges
   with_grant_option  = var.with_grant_option
 
   on_schema_object {
     all {
       object_type_plural = "TABLES"
-      in_database        = "\"${var.database}\""
+      in_database        = var.database
     }
   }
 }

pkg/resources/testdata/TestAcc_GrantPrivilegesToAccountRole/OnSchemaObject_OnFuture_InDatabase/test.tf

@@ -1,12 +1,12 @@
-resource "snowflake_grant_privileges_to_database_role" "test" {
-  database_role_name = "\"${var.database}\".\"${var.name}\""
+resource "snowflake_grant_privileges_to_account_role" "test" {
+  role_name = var.name
   privileges         = var.privileges
   with_grant_option  = var.with_grant_option
 
   on_schema_object {
     future {
       object_type_plural = "TABLES"
-      in_database        = "\"${var.database}\""
+      in_database        = var.database
     }
   }
 }

pkg/resources/testdata/TestAcc_GrantPrivilegesToAccountRole/OnSchemaObject_OnObject/test.tf

@@ -9,9 +9,9 @@ resource "snowflake_table" "test" {
   }
 }
 
-resource "snowflake_grant_privileges_to_database_role" "test" {
+resource "snowflake_grant_privileges_to_account_role" "test" {
   depends_on         = [snowflake_table.test]
-  database_role_name = "\"${var.database}\".\"${var.name}\""
+  role_name = var.name
   privileges         = var.privileges
   with_grant_option  = var.with_grant_option
 

pkg/resources/testdata/TestAcc_GrantPrivilegesToAccountRole/OnSchema_ExactlyOneOf/test.tf

@@ -1,5 +1,5 @@
-resource "snowflake_grant_privileges_to_database_role" "test" {
-  database_role_name = "some_database.role_name"
+resource "snowflake_grant_privileges_to_account_role" "test" {
+  role_name =       "role_name"
   privileges         = ["USAGE"]
 
   on_schema {

pkg/resources/testdata/TestAcc_GrantPrivilegesToAccountRole/UpdatePrivileges/all_privileges/test.tf

@@ -1,5 +1,8 @@
-resource "snowflake_grant_privileges_to_database_role" "test" {
-  database_role_name = "\"${var.database}\".\"${var.name}\""
+resource "snowflake_grant_privileges_to_account_role" "test" {
+  role_name = var.name
   all_privileges     = var.all_privileges
-  on_database        = "\"${var.database}\""
+  on_account_object {
+    object_type = "DATABASE"
+    object_name = var.database
+  }
 }

pkg/resources/testdata/TestAcc_GrantPrivilegesToAccountRole/UpdatePrivileges/privileges/test.tf

@@ -1,5 +1,8 @@
-resource "snowflake_grant_privileges_to_database_role" "test" {
-  database_role_name = "\"${var.database}\".\"${var.name}\""
+resource "snowflake_grant_privileges_to_account_role" "test" {
+  role_name = var.name
   privileges         = var.privileges
-  on_database        = "\"${var.database}\""
+  on_account_object {
+    object_type = "DATABASE"
+    object_name = var.database
+  }
 }

pkg/resources/testdata/TestAcc_GrantPrivilegesToAccountRole/UpdatePrivileges_SnowflakeChecked/all_privileges/test.tf

@@ -1,5 +1,8 @@
-resource "snowflake_grant_privileges_to_database_role" "test" {
-  database_role_name = "\"${var.database}\".\"${var.name}\""
+resource "snowflake_grant_privileges_to_account_role" "test" {
+  role_name = var.name
   all_privileges     = var.all_privileges
-  on_database        = "\"${var.database}\""
+  on_account_object {
+    object_type = "DATABASE"
+    object_name = var.database
+  }
 }

pkg/resources/testdata/TestAcc_GrantPrivilegesToAccountRole/UpdatePrivileges_SnowflakeChecked/on_schema/test.tf

@@ -3,9 +3,9 @@ resource "snowflake_schema" "test" {
   name     = var.schema_name
 }
 
-resource "snowflake_grant_privileges_to_database_role" "test" {
+resource "snowflake_grant_privileges_to_account_role" "test" {
   depends_on         = [snowflake_schema.test]
-  database_role_name = "\"${var.database}\".\"${var.name}\""
+  role_name = var.name
   privileges         = var.privileges
   on_schema {
     schema_name = "${var.database}.${var.schema_name}"

pkg/resources/testdata/TestAcc_GrantPrivilegesToAccountRole/UpdatePrivileges_SnowflakeChecked/privileges/test.tf

@@ -1,5 +1,8 @@
-resource "snowflake_grant_privileges_to_database_role" "test" {
-  database_role_name = "\"${var.database}\".\"${var.name}\""
+resource "snowflake_grant_privileges_to_account_role" "test" {
+ role_name = var.name
   privileges         = var.privileges
-  on_database        = "\"${var.database}\""
+ on_account_object {
+  object_type = "DATABASE"
+  object_name = var.database
+ }
 }