Skip to content

Commit 5f0aa09

Browse files
committed
cr: add const admin
1 parent 076383d commit 5f0aa09

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

pkg/controller/perconaservermongodbclustersync/target_user.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ const (
2929
targetUserSecretUsernameKey = "username"
3030
targetUserSecretPasswordKey = "password"
3131

32+
admin = "admin"
33+
3234
targetUserPasswordMACAnnotation = "psmdb.percona.com/target-user-password-mac"
3335
targetUserPasswordMACKey = "psmdb-target-user-password-annotation-v1"
3436
)
@@ -142,12 +144,12 @@ func ensureTargetMongoUser(ctx context.Context, mc mongo.Client, sec *corev1.Sec
142144
username := string(sec.Data[targetUserSecretUsernameKey])
143145
password := sec.Data[targetUserSecretPasswordKey]
144146

145-
existing, err := mc.GetUserInfo(ctx, username, "admin")
147+
existing, err := mc.GetUserInfo(ctx, username, admin)
146148
if err != nil {
147149
return false, errors.Wrap(err, "look up target user")
148150
}
149151
if existing == nil {
150-
if err := mc.CreateUser(ctx, "admin", username, string(password), syncTargetUserRoles...); err != nil {
152+
if err := mc.CreateUser(ctx, admin, username, string(password), syncTargetUserRoles...); err != nil {
151153
return false, errors.Wrapf(err, "create target user %q", username)
152154
}
153155
setPasswordHashAnnotation(sec, password)
@@ -157,14 +159,14 @@ func ensureTargetMongoUser(ctx context.Context, mc mongo.Client, sec *corev1.Sec
157159
mutated := false
158160
newMAC := passwordAnnotationMAC(password)
159161
if sec.Annotations[targetUserPasswordMACAnnotation] != newMAC {
160-
if err := mc.UpdateUserPass(ctx, "admin", username, string(password)); err != nil {
162+
if err := mc.UpdateUserPass(ctx, admin, username, string(password)); err != nil {
161163
return false, errors.Wrapf(err, "sync target user password %q", username)
162164
}
163165
setPasswordHashAnnotation(sec, password)
164166
mutated = true
165167
}
166168
if !cmp.Equal(existing.Roles, syncTargetUserRoles, sortRolesOpt) {
167-
if err := mc.UpdateUserRoles(ctx, "admin", username, syncTargetUserRoles); err != nil {
169+
if err := mc.UpdateUserRoles(ctx, admin, username, syncTargetUserRoles); err != nil {
168170
return false, errors.Wrapf(err, "sync target user roles %q", username)
169171
}
170172
}

0 commit comments

Comments
 (0)