Skip to content

Commit bbbfd3c

Browse files
author
jmccormick2001
committed
fix bug in pgo delete user
1 parent db1bfff commit bbbfd3c

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

apiserver/userservice/userimpl.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,7 @@ func DeleteUser(name, selector, ns string) msgs.DeleteUserResponse {
591591
response.Status = msgs.Status{Code: msgs.Ok, Msg: ""}
592592
response.Results = make([]string, 0)
593593

594+
log.Debugf("DeleteUser called name=%s", name)
594595
clusterList := crv1.PgclusterList{}
595596

596597
//get the clusters list
@@ -625,6 +626,8 @@ func DeleteUser(name, selector, ns string) msgs.DeleteUserResponse {
625626
return response
626627
}
627628

629+
log.Debugf("DeleteUser %s managed %t", name, managed)
630+
628631
err = deleteUser(ns, clusterName, info, name, managed)
629632
if err != nil {
630633
log.Error(err)

apiserver/userservice/userservice.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@ func CreateUserHandler(w http.ResponseWriter, r *http.Request) {
110110
func DeleteUserHandler(w http.ResponseWriter, r *http.Request) {
111111
vars := mux.Vars(r)
112112

113-
username := vars["name"]
113+
name := vars["name"]
114114
selector := r.URL.Query().Get("selector")
115115
namespace := r.URL.Query().Get("namespace")
116116
clientVersion := r.URL.Query().Get("version")
117117

118-
log.Debugf("DeleteUserHandler parameters selector [%s] namespace [%s] version [%s] name [%s]", selector, namespace, clientVersion, username)
118+
log.Debugf("DeleteUserHandler parameters selector [%s] namespace [%s] version [%s] name [%s]", selector, namespace, clientVersion, name)
119119

120120
username, err := apiserver.Authn(apiserver.DELETE_USER_PERM, w, r)
121121
if err != nil {
@@ -144,7 +144,7 @@ func DeleteUserHandler(w http.ResponseWriter, r *http.Request) {
144144
return
145145
}
146146

147-
resp = DeleteUser(username, selector, ns)
147+
resp = DeleteUser(name, selector, ns)
148148
json.NewEncoder(w).Encode(resp)
149149

150150
}

0 commit comments

Comments
 (0)