diff options
| author |   Ritu Sood <ritu.sood@intel.com> | 2020-09-25 16:36:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-09-25 16:36:24 +0000 |
| commit | 8b5c4236639a46f39cbfe852590f34e64f58a85a (patch) | |
| tree | a2130c27227dbeffb903888b777ece8afd8f8302 /src/dcm/api/userPermissionsHandler.go | |
| parent | 6498e883dcbc005b32f86f8a57c96950c359d98e (diff) | |
| parent | c585d2b091875dbc9575a960f4f42c1f14ec3366 (diff) | |
Merge "Enhance error handling and HTTP codes in DCM"
Diffstat (limited to 'src/dcm/api/userPermissionsHandler.go')
| -rw-r--r-- | src/dcm/api/userPermissionsHandler.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/dcm/api/userPermissionsHandler.go b/src/dcm/api/userPermissionsHandler.go index 156c390f..3ac955fa 100644 --- a/src/dcm/api/userPermissionsHandler.go +++ b/src/dcm/api/userPermissionsHandler.go @@ -89,8 +89,12 @@ func (h userPermissionHandler) getHandler(w http.ResponseWriter, r *http.Request return } } else { - ret, err = h.client.GetAllUserPerms(project, logicalCloud) + ret, err = h.client.GetUserPerm(project, logicalCloud, name) if err != nil { + if err.Error() == "User Permission does not exist" { + http.Error(w, err.Error(), http.StatusNotFound) + return + } http.Error(w, err.Error(), http.StatusInternalServerError) return } @@ -131,12 +135,16 @@ func (h userPermissionHandler) updateHandler(w http.ResponseWriter, r *http.Requ ret, err := h.client.UpdateUserPerm(project, logicalCloud, name, v) if err != nil { + if err.Error() == "User Permission does not exist" { + http.Error(w, err.Error(), http.StatusNotFound) + return + } http.Error(w, err.Error(), http.StatusInternalServerError) return } w.Header().Set("Content-Type", "application/json") - w.WriteHeader(http.StatusCreated) + w.WriteHeader(http.StatusOK) err = json.NewEncoder(w).Encode(ret) if err != nil { http.Error(w, err.Error(), |