clean up

databricks · Jun 7, 2024 · 0759a41 · 0759a41
1 parent 46d7b6f
commit 0759a41
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/catalog/permissions/permissions.go b/catalog/permissions/permissions.go
@@ -120,6 +120,7 @@ var Mappings = SecurableMapping{
 	"volume":             catalog.SecurableType("volume"),
 }
 
+// Unity Catalog accepts privileges with spaces, but will automatically convert them to underscores
 func NormalizePrivilege(privilege string) string {
 	return strings.ToUpper(strings.Replace(privilege, " ", "_", -1))
 }

diff --git a/catalog/resource_grant.go b/catalog/resource_grant.go
@@ -123,8 +123,8 @@ func ResourceGrant() common.Resource {
 	s := common.StructToSchema(permissions.UnityCatalogPrivilegeAssignment{},
 		func(m map[string]*schema.Schema) map[string]*schema.Schema {
 			common.CustomizeSchemaPath(m, "principal").SetForceNew().SetCustomSuppressDiff(common.EqualFoldDiffSuppress)
-			common.MustSchemaPath(m, "principal").DiffSuppressFunc = common.EqualFoldDiffSuppress
 
+			// set custom hash function for privileges
 			common.MustSchemaPath(m, "privileges").Set = func(i any) int {
 				privilege := i.(string)
 				return schema.HashString(permissions.NormalizePrivilege(privilege))

diff --git a/catalog/resource_grants.go b/catalog/resource_grants.go
@@ -128,6 +128,7 @@ func parseId(d *schema.ResourceData) (string, string, error) {
 func ResourceGrants() common.Resource {
 	s := common.StructToSchema(PermissionsList{},
 		func(s map[string]*schema.Schema) map[string]*schema.Schema {
+			// set custom hash function for principal and privileges
 			common.MustSchemaPath(s, "grant", "privileges").Set = func(i any) int {
 				privilege := i.(string)
 				return schema.HashString(permissions.NormalizePrivilege(privilege))