opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 19:42:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8681 from Luap99/fix-image-exists-panic

Browse Source 
Fix panic in libpod images exists endpoint
This commit is contained in:
OpenShift Merge Robot
2020-12-10 10:16:41 -05:00
committed by GitHub
parent deb00425c2 3fa61f0004
commit 2bb149034b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/handlers/libpod/images.go
View File

@ -51,7 +51,7 @@ func ImageExists(w http.ResponseWriter, r *http.Request) {
return return
} }
if !report.Value { 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 return
} }
utils.WriteResponse(w, http.StatusNoContent, "") utils.WriteResponse(w, http.StatusNoContent, "")

2
test/apiv2/10-images.at
View File

@ -12,6 +12,8 @@ iid=$(jq -r '.[0].Id' <<<"$output")
t GET libpod/images/$iid/exists 204 t GET libpod/images/$iid/exists 204
t GET libpod/images/$PODMAN_TEST_IMAGE_NAME/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 # FIXME: compare to actual podman info
t GET libpod/images/json 200 \ t GET libpod/images/json 200 \