resource_grant: Handle revoke of grants properly

pendo-io · Mar 4, 2019 · 27659f2 · 27659f2
1 parent d5b9627
commit 27659f2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/mysql/resource_grant.go b/mysql/resource_grant.go
@@ -275,6 +275,7 @@ func DeleteGrant(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	roles := d.Get("roles").(*schema.Set)
+	privileges := d.Get("privileges").(*schema.Set)
 
 	var sql string
 	if !isRole && len(roles.List()) == 0 {
@@ -293,6 +294,9 @@ func DeleteGrant(d *schema.ResourceData, meta interface{}) error {
 	whatToRevoke := fmt.Sprintf("ALL ON %s.%s", database, table)
 	if len(roles.List()) > 0 {
 		whatToRevoke = flattenList(roles.List(), "'%s'")
+	} else if len(privileges.List()) > 0 {
+		privilegeList = flattenList(privileges.List(), "'%s'")
+		whatToRevoke = fmt.Sprintf("%s ON %s.%s", privilegeList, database, table)
 	}
 
 	sql = fmt.Sprintf("REVOKE %s FROM %s", whatToRevoke, userOrRole)