Merge pull request #25 from Riskified/DEV-101495-fix-public-bug

fix bug in show grants for schema and database

Author: yoavshemesh-riskified

postgresql/resource_cockroachdb_changefeed.go

@@ -113,7 +113,7 @@ func resourceCockroachDBChangefeedCreate(db *DBConnection, d *schema.ResourceDat
 	}
 
 	d.SetId(jobID)
-	d.Set(CDCAvroSchemaPrefix, fmt.Sprintf("%s", avroSchemaPrefix))
+	d.Set(CDCAvroSchemaPrefix, avroSchemaPrefix)
 	d.Set(CDCRegistryConnectionName, registryConnectionName)
 	d.Set(CDCKafkaConnectionName, kafkaConnectionName)
 	d.Set(CDCtableList, tableList)
@@ -151,7 +151,7 @@ func resourceCockroachDBChangefeedReadImpl(db *DBConnection, d *schema.ResourceD
 	d.Set(CDCKafkaConnectionName, strings.TrimPrefix(sinkUri, "external://"))
 	// setting the avro schema prefix and confluent schema registry
 	avroSchemaPrefix, confluentSchemaRegistry, initialScanValue, cursorValue := extractDetails(description)
-	d.Set(CDCAvroSchemaPrefix, fmt.Sprintf("%s", strings.TrimSuffix(avroSchemaPrefix, "_")))
+	d.Set(CDCAvroSchemaPrefix, strings.TrimSuffix(avroSchemaPrefix, "_"))
 	d.Set(CDCRegistryConnectionName, confluentSchemaRegistry)
 	if initialScanValue == "yes" {
 		d.Set(CDCInitialScan, "yes")

postgresql/resource_postgresql_grant.go

@@ -272,7 +272,7 @@ func readDatabaseRolePriviges(txn *sql.Tx, db *DBConnection, d *schema.ResourceD
 	var privileges pq.ByteaArray
 	//cockroachdb does not support aclexplode
 	if !db.featureSupported(fetureAclExplode) {
-		query = fmt.Sprintf(`with a as (show grants on database %s for %s) select array_agg(privilege_type) from a`, dbName, role)
+		query = fmt.Sprintf(`with a as (show grants on database %s for %s) select array_agg(privilege_type) from a where grantee='%s'`, dbName, role, role)
 		if err := txn.QueryRow(query).Scan(&privileges); err != nil {
 			return fmt.Errorf("could not read privileges for database %s: %w", dbName, err)
 		}
@@ -301,7 +301,7 @@ func readSchemaRolePriviges(txn *sql.Tx, db *DBConnection, d *schema.ResourceDat
 		dbName = "\"" + dbName + "\""
 	}
 	if !db.featureSupported(fetureAclExplode) {
-		query = fmt.Sprintf(`with a as ( show grants on schema %s for %s) select array_agg(privilege_type) from a;`, dbName, role)
+		query = fmt.Sprintf(`with a as ( show grants on schema %s for %s) select array_agg(privilege_type) from a where grantee='%s';`, dbName, role, role)
 		if err := txn.QueryRow(query).Scan(&privileges); err != nil {
 			return fmt.Errorf("could not read privileges for database %s: %w", dbName, err)
 		}