public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-18 10:39:43 +02:00
Code Issues Projects Releases Wiki Activity

Fix an issue when not assigning the merge result.

Browse Source 
Add some tests.
This commit is contained in:
Oleksii Kliukin
2017-12-04 10:49:25 +01:00
parent 831ebb1f32
commit 611cfe96d6
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/cluster.go
+3 -2
View File
@@ -610,12 +610,12 @@ func (c *Cluster) initSystemUsers() {
func (c *Cluster) initRobotUsers() error {
for username, userFlags := range c.Spec.Users {
if !isValidUsername(username) {
return fmt.Errorf("invalid username: '%v'", username)
return fmt.Errorf("invalid username: %q", username)
}
flags, err := normalizeUserFlags(userFlags)
if err != nil {
return fmt.Errorf("invalid flags for user '%v': %v", username, err)
return fmt.Errorf("invalid flags for user %q: %v", username, err)
}
if _, present := c.pgUsers[username]; !present {
c.pgUsers[username] = spec.PgUser{
@@ -630,6 +630,7 @@ func (c *Cluster) initRobotUsers() error {
c.logger.Debugf("merging user %q data", username)
user := c.pgUsers[username]
user.Flags = flags
c.pgUsers[username] = user
}
}
pkg/cluster/util.go
+2 -1
View File
@@ -17,6 +17,7 @@ import (
"github.com/zalando-incubator/postgres-operator/pkg/util"
"github.com/zalando-incubator/postgres-operator/pkg/util/constants"
"github.com/zalando-incubator/postgres-operator/pkg/util/retryutil"
"sort"
)
func isValidUsername(username string) bool {
@@ -77,7 +78,7 @@ func normalizeUserFlags(userFlags []string) ([]string, error) {
if addLogin {
flags = append(flags, constants.RoleFlagLogin)
}
sort.Strings(flags)
return flags, nil
}