diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-11 22:22:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 22:22:55 +0100 |
| commit | 4bdfeed5bf9c467c8ab53b392747ec722505b179 (patch) | |
| tree | 967c8cc5a213d2f8dfecdd49b15619c878b624dd /pkg/api/handlers/libpod | |
| parent | d34ce1320cc31327675c501d5de94064c4d79f17 (diff) | |
| parent | bdccdd2265340d48a0ba868d8c312fdd3172f1c3 (diff) | |
| download | podman-4bdfeed5bf9c467c8ab53b392747ec722505b179.tar.gz podman-4bdfeed5bf9c467c8ab53b392747ec722505b179.tar.bz2 podman-4bdfeed5bf9c467c8ab53b392747ec722505b179.zip | |
Merge pull request #5169 from edsantiago/apiv2_pod_status_codes
API v2: pods: fix two incorrect return codes
Diffstat (limited to 'pkg/api/handlers/libpod')
| -rw-r--r-- | pkg/api/handlers/libpod/pods.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go index 091368985..8fb305290 100644 --- a/pkg/api/handlers/libpod/pods.go +++ b/pkg/api/handlers/libpod/pods.go @@ -91,7 +91,11 @@ func PodCreate(w http.ResponseWriter, r *http.Request) { pod, err := runtime.NewPod(r.Context(), options...) if err != nil { - utils.Error(w, "Something went wrong.", http.StatusInternalServerError, err) + http_code := http.StatusInternalServerError + if errors.Cause(err) == define.ErrPodExists { + http_code = http.StatusConflict + } + utils.Error(w, "Something went wrong.", http_code, err) return } utils.WriteResponse(w, http.StatusCreated, handlers.IDResponse{ID: pod.CgroupParent()}) @@ -409,5 +413,5 @@ func PodExists(w http.ResponseWriter, r *http.Request) { utils.PodNotFound(w, name, err) return } - utils.WriteResponse(w, http.StatusOK, "") + utils.WriteResponse(w, http.StatusNoContent, "") } |