Skip to content

Commit 5def44d

Browse files
author
Jeff McCormick
committed
changed to update password cmd
1 parent 38c410d commit 5def44d

File tree

2 files changed

+36
-4
lines changed

2 files changed

+36
-4
lines changed

client/cmd/user.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ func userManager() {
151151
fmt.Println("changing password of user " + ChangePasswordForUser)
152152
newPassword := util.GeneratePassword(PasswordLength)
153153
newExpireDate := GeneratePasswordExpireDate(PasswordAgeDays)
154-
err = updatePassword(info, ChangePasswordForUser, newPassword, newExpireDate)
154+
err = updatePassword(cluster.Spec.Name, info, ChangePasswordForUser, newPassword, newExpireDate)
155155
if err != nil {
156156
log.Error(err.Error())
157157
os.Exit(2)
@@ -166,7 +166,7 @@ func userManager() {
166166
addUser(d.ObjectMeta.Name, info, AddUser)
167167
newPassword := util.GeneratePassword(PasswordLength)
168168
newExpireDate := GeneratePasswordExpireDate(PasswordAgeDays)
169-
err = updatePassword(info, AddUser, newPassword, newExpireDate)
169+
err = updatePassword(cluster.Spec.Name, info, AddUser, newPassword, newExpireDate)
170170
if err != nil {
171171
log.Error(err.Error())
172172
os.Exit(2)
@@ -182,7 +182,7 @@ func userManager() {
182182
if UpdatePasswords {
183183
newPassword := util.GeneratePassword(PasswordLength)
184184
newExpireDate := GeneratePasswordExpireDate(PasswordAgeDays)
185-
err = updatePassword(v.ConnDetails, v.Rolname, newPassword, newExpireDate)
185+
err = updatePassword(cluster.Spec.Name, v.ConnDetails, v.Rolname, newPassword, newExpireDate)
186186
if err != nil {
187187
fmt.Println("error in updating password")
188188
}
@@ -246,7 +246,7 @@ func callDB(info ConnInfo, clusterName, maxdays string) []PswResult {
246246

247247
}
248248

249-
func updatePassword(p ConnInfo, username, newPassword, passwordExpireDate string) error {
249+
func updatePassword(clusterName string, p ConnInfo, username, newPassword, passwordExpireDate string) error {
250250
var err error
251251
var conn *sql.DB
252252

@@ -283,6 +283,11 @@ func updatePassword(p ConnInfo, username, newPassword, passwordExpireDate string
283283
}
284284
}()
285285

286+
err = util.UpdateUserSecret(Clientset, clusterName, username, newPassword, Namespace)
287+
if err != nil {
288+
log.Debug(err.Error())
289+
return err
290+
}
286291
return err
287292
}
288293

operator/util/secrets.go

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,3 +223,30 @@ func CreateUserSecret(clientset *kubernetes.Clientset, clustername, username, pa
223223

224224
return err
225225
}
226+
227+
func UpdateUserSecret(clientset *kubernetes.Clientset, clustername, username, password, namespace string) error {
228+
229+
var err error
230+
231+
secretName := clustername + "-" + username + "-secret"
232+
233+
//delete current secret
234+
options := meta_v1.DeleteOptions{}
235+
err = clientset.Secrets(namespace).Delete(secretName, &options)
236+
if err != nil {
237+
log.Error("error deleting secret" + err.Error())
238+
return err
239+
} else {
240+
log.Info("deleted secret " + secretName)
241+
}
242+
//create secret with updated password
243+
err = CreateUserSecret(clientset, clustername, username, password, namespace)
244+
if err != nil {
245+
log.Error("error creating secret" + err.Error())
246+
return err
247+
} else {
248+
log.Info("created secret " + secretName)
249+
}
250+
251+
return err
252+
}

0 commit comments

Comments
 (0)