Merge branch 'zalando:master' into MK-fix-deployment-chart

Mart-Kuc · web-flow · commit eabde5817a6c · 2024-10-29T09:44:34.000+01:00
diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
@@ -1390,18 +1390,18 @@ func (c *Cluster) initPreparedDatabaseRoles() error {
 			preparedSchemas = map[string]acidv1.PreparedSchema{"data": {DefaultRoles: util.True()}}
 		}
 
-		var searchPath strings.Builder
-		searchPath.WriteString(constants.DefaultSearchPath)
+		searchPathArr := []string{constants.DefaultSearchPath}
 		for preparedSchemaName := range preparedSchemas {
-			searchPath.WriteString(", " + preparedSchemaName)
+			searchPathArr = append(searchPathArr, fmt.Sprintf("%q", preparedSchemaName))
 		}
+		searchPath := strings.Join(searchPathArr, ", ")
 
 		// default roles per database
-		if err := c.initDefaultRoles(defaultRoles, "admin", preparedDbName, searchPath.String(), preparedDB.SecretNamespace); err != nil {
+		if err := c.initDefaultRoles(defaultRoles, "admin", preparedDbName, searchPath, preparedDB.SecretNamespace); err != nil {
 			return fmt.Errorf("could not initialize default roles for database %s: %v", preparedDbName, err)
 		}
 		if preparedDB.DefaultUsers {
-			if err := c.initDefaultRoles(defaultUsers, "admin", preparedDbName, searchPath.String(), preparedDB.SecretNamespace); err != nil {
+			if err := c.initDefaultRoles(defaultUsers, "admin", preparedDbName, searchPath, preparedDB.SecretNamespace); err != nil {
 				return fmt.Errorf("could not initialize default roles for database %s: %v", preparedDbName, err)
 			}
 		}
@@ -1412,14 +1412,16 @@ func (c *Cluster) initPreparedDatabaseRoles() error {
 				if err := c.initDefaultRoles(defaultRoles,
 					preparedDbName+constants.OwnerRoleNameSuffix,
 					preparedDbName+"_"+preparedSchemaName,
-					constants.DefaultSearchPath+", "+preparedSchemaName, preparedDB.SecretNamespace); err != nil {
+					fmt.Sprintf("%s, %q", constants.DefaultSearchPath, preparedSchemaName),
+					preparedDB.SecretNamespace); err != nil {
 					return fmt.Errorf("could not initialize default roles for database schema %s: %v", preparedSchemaName, err)
 				}
 				if preparedSchema.DefaultUsers {
 					if err := c.initDefaultRoles(defaultUsers,
 						preparedDbName+constants.OwnerRoleNameSuffix,
 						preparedDbName+"_"+preparedSchemaName,
-						constants.DefaultSearchPath+", "+preparedSchemaName, preparedDB.SecretNamespace); err != nil {
+						fmt.Sprintf("%s, %q", constants.DefaultSearchPath, preparedSchemaName),
+						preparedDB.SecretNamespace); err != nil {
 						return fmt.Errorf("could not initialize default users for database schema %s: %v", preparedSchemaName, err)
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -1390,18 +1390,18 @@ func (c *Cluster) initPreparedDatabaseRoles() error {`
`1390`	`1390`	`preparedSchemas = map[string]acidv1.PreparedSchema{"data": {DefaultRoles: util.True()}}`
`1391`	`1391`	`}`
`1392`	`1392`
`1393`		`- var searchPath strings.Builder`
`1394`		`- searchPath.WriteString(constants.DefaultSearchPath)`
	`1393`	`+ searchPathArr := []string{constants.DefaultSearchPath}`
`1395`	`1394`	`for preparedSchemaName := range preparedSchemas {`
`1396`		`- searchPath.WriteString(", " + preparedSchemaName)`
	`1395`	`+ searchPathArr = append(searchPathArr, fmt.Sprintf("%q", preparedSchemaName))`
`1397`	`1396`	`}`
	`1397`	`+ searchPath := strings.Join(searchPathArr, ", ")`
`1398`	`1398`
`1399`	`1399`	`// default roles per database`
`1400`		`- if err := c.initDefaultRoles(defaultRoles, "admin", preparedDbName, searchPath.String(), preparedDB.SecretNamespace); err != nil {`
	`1400`	`+ if err := c.initDefaultRoles(defaultRoles, "admin", preparedDbName, searchPath, preparedDB.SecretNamespace); err != nil {`
`1401`	`1401`	`return fmt.Errorf("could not initialize default roles for database %s: %v", preparedDbName, err)`
`1402`	`1402`	`}`
`1403`	`1403`	`if preparedDB.DefaultUsers {`
`1404`		`- if err := c.initDefaultRoles(defaultUsers, "admin", preparedDbName, searchPath.String(), preparedDB.SecretNamespace); err != nil {`
	`1404`	`+ if err := c.initDefaultRoles(defaultUsers, "admin", preparedDbName, searchPath, preparedDB.SecretNamespace); err != nil {`
`1405`	`1405`	`return fmt.Errorf("could not initialize default roles for database %s: %v", preparedDbName, err)`
`1406`	`1406`	`}`
`1407`	`1407`	`}`
`@@ -1412,14 +1412,16 @@ func (c *Cluster) initPreparedDatabaseRoles() error {`
`1412`	`1412`	`if err := c.initDefaultRoles(defaultRoles,`
`1413`	`1413`	`preparedDbName+constants.OwnerRoleNameSuffix,`
`1414`	`1414`	`preparedDbName+"_"+preparedSchemaName,`
`1415`		`- constants.DefaultSearchPath+", "+preparedSchemaName, preparedDB.SecretNamespace); err != nil {`
	`1415`	`+ fmt.Sprintf("%s, %q", constants.DefaultSearchPath, preparedSchemaName),`
	`1416`	`+ preparedDB.SecretNamespace); err != nil {`
`1416`	`1417`	`return fmt.Errorf("could not initialize default roles for database schema %s: %v", preparedSchemaName, err)`
`1417`	`1418`	`}`
`1418`	`1419`	`if preparedSchema.DefaultUsers {`
`1419`	`1420`	`if err := c.initDefaultRoles(defaultUsers,`
`1420`	`1421`	`preparedDbName+constants.OwnerRoleNameSuffix,`
`1421`	`1422`	`preparedDbName+"_"+preparedSchemaName,`
`1422`		`- constants.DefaultSearchPath+", "+preparedSchemaName, preparedDB.SecretNamespace); err != nil {`
	`1423`	`+ fmt.Sprintf("%s, %q", constants.DefaultSearchPath, preparedSchemaName),`
	`1424`	`+ preparedDB.SecretNamespace); err != nil {`
`1423`	`1425`	`return fmt.Errorf("could not initialize default users for database schema %s: %v", preparedSchemaName, err)`
`1424`	`1426`	`}`
`1425`	`1427`	`}`