diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-10 10:16:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-10 10:16:41 -0500 |
| commit | 2bb149034bd67dd4027768863fed2fce853833ae (patch) | |
| tree | 4e2a04728dbbf2108d2d71837d6a59333cb62db0 | |
| parent | deb00425c2984ea42158ce6afec74474de998bfd (diff) | |
| parent | 3fa61f0004b04340a697a256ff51589a4d3f7c93 (diff) | |
| download | podman-2bb149034bd67dd4027768863fed2fce853833ae.tar.gz podman-2bb149034bd67dd4027768863fed2fce853833ae.tar.bz2 podman-2bb149034bd67dd4027768863fed2fce853833ae.zip | |
Merge pull request #8681 from Luap99/fix-image-exists-panic
Fix panic in libpod images exists endpoint
| -rw-r--r-- | pkg/api/handlers/libpod/images.go | 2 | ||||
| -rw-r--r-- | test/apiv2/10-images.at | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index 6145207ca..505c96126 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -51,7 +51,7 @@ func ImageExists(w http.ResponseWriter, r *http.Request) { return } if !report.Value { - utils.Error(w, "Something went wrong.", http.StatusNotFound, errors.Wrapf(nil, "failed to find image %s", name)) + utils.Error(w, "Something went wrong.", http.StatusNotFound, errors.Errorf("failed to find image %s", name)) return } utils.WriteResponse(w, http.StatusNoContent, "") diff --git a/test/apiv2/10-images.at b/test/apiv2/10-images.at index c105a9278..7b500bf57 100644 --- a/test/apiv2/10-images.at +++ b/test/apiv2/10-images.at @@ -12,6 +12,8 @@ iid=$(jq -r '.[0].Id' <<<"$output") t GET libpod/images/$iid/exists 204 t GET libpod/images/$PODMAN_TEST_IMAGE_NAME/exists 204 +t GET libpod/images/${iid}abcdef/exists 404 \ + .cause="failed to find image ${iid}abcdef" # FIXME: compare to actual podman info t GET libpod/images/json 200 \ |