Squashme: Fixes to pass linting test

cyrilgdn · Feb 7, 2022 · 819cc90 · 819cc90
1 parent 5672740
commit 819cc90
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/postgresql/helpers.go b/postgresql/helpers.go
@@ -288,10 +288,7 @@ func setToPgIdentList(schema string, idents *schema.Set) string {
 func setToPgIdentSimpleList(idents *schema.Set) string {
 	quotedIdents := make([]string, idents.Len())
 	for i, ident := range idents.List() {
-		quotedIdents[i] = fmt.Sprintf(
-			"%s",
-			ident.(string),
-		)
+		quotedIdents[i] = ident.(string)
 	}
 	return strings.Join(quotedIdents, ",")
 }

diff --git a/postgresql/resource_postgresql_grant.go b/postgresql/resource_postgresql_grant.go
@@ -638,13 +638,18 @@ func createRevokeQuery(d *schema.ResourceData) string {
 		objects := d.Get("objects").(*schema.Set)
 		columns := d.Get("columns").(*schema.Set)
 		privileges := d.Get("privileges").(*schema.Set)
-		query = fmt.Sprintf(
-			"REVOKE %s (%s) ON TABLE %s FROM %s",
-			setToPgIdentSimpleList(privileges),
-			setToPgIdentSimpleList(columns),
-			setToPgIdentList(d.Get("schema").(string), objects),
-			pq.QuoteIdentifier(d.Get("role").(string)),
-		)
+		if privileges.Len() == 0 || columns.Len() == 0 {
+			// No privileges to revoke, so don't revoke anything
+			query = "SELECT NULL"
+		} else {
+			query = fmt.Sprintf(
+				"REVOKE %s (%s) ON TABLE %s FROM %s",
+				setToPgIdentSimpleList(privileges),
+				setToPgIdentSimpleList(columns),
+				setToPgIdentList(d.Get("schema").(string), objects),
+				pq.QuoteIdentifier(d.Get("role").(string)),
+			)
+		}
 	case "TABLE", "SEQUENCE", "FUNCTION", "PROCEDURE", "ROUTINE":
 		objects := d.Get("objects").(*schema.Set)
 		if objects.Len() > 0 {

diff --git a/postgresql/utils_test.go b/postgresql/utils_test.go
@@ -356,7 +356,7 @@ func testCheckColumnPrivileges(t *testing.T, dbName, roleName string, tables []s
 	}
 
 	updateColumnValues := []string{}
-	for i, _ := range columns {
+	for i := range columns {
 		updateColumnValues = append(updateColumnValues, fmt.Sprint(columns[i], " = ", columnValues[i]))
 	}