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

reflect code review

Browse Source
This commit is contained in:
Felix Kunde
2021-04-21 17:16:43 +02:00
parent f18cc4913d
commit 5eac3e86ac
3 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/users/users.go
+6 -14
View File
@@ -72,8 +72,8 @@ func (strategy DefaultUserSyncStrategy) ProduceSyncRequests(dbUsers spec.PgUserM
}
}
// No existing roles are deleted or stripped of role memebership/flags
// but they will be renamed acting as a simple blocker
// No existing roles are deleted or stripped of role membership/flags
// but they will be renamed acting as a simple login blocker
for name, dbUser := range dbUsers {
if _, exists := newUsers[name]; !exists {
reqs = append(reqs, spec.PgSyncUserRequest{Kind: spec.PGSyncUserRename, User: dbUser})
@@ -141,18 +141,10 @@ func (strategy DefaultUserSyncStrategy) alterPgUserSet(user spec.PgUser, db *sql
func (strategy DefaultUserSyncStrategy) alterPgUserRename(user spec.PgUser, db *sql.DB) error {
var query string
renamedBack := false
nameSuffixDiff := len(user.Name) - len(constants.RoleRenameSuffix)
if nameSuffixDiff > 0 {
if user.Name[nameSuffixDiff:] == constants.RoleRenameSuffix {
query = fmt.Sprintf(alterUserRenameSQL, user.Name, user.Name[:nameSuffixDiff], "")
renamedBack = true
}
}
if !renamedBack {
if strings.HasSuffix(user.Name, constants.RoleRenameSuffix) {
newName := strings.TrimSuffix(user.Name, constants.RoleRenameSuffix)
query = fmt.Sprintf(alterUserRenameSQL, user.Name, newName, "")
} else {
query = fmt.Sprintf(alterUserRenameSQL, user.Name, user.Name, constants.RoleRenameSuffix)
}