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

Fix libpod API conformance to swagger

Browse Source 
* Return empty array when nothing has been pruned.
* Use correct return type swagger doc-comment.

Signed-off-by: Matej Vasek <mvasek@redhat.com>
This commit is contained in:
Matej Vasek
2021-11-01 16:10:10 +01:00
parent 85bad0cc7c
commit 218d91d76d
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/server/register_images.go
View File

@ -1069,7 +1069,7 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
// - application/json // - application/json
// responses: // responses:
// 200: // 200:
// $ref: "#/responses/DocsImageDeleteResponse" // $ref: "#/responses/DocsLibpodPruneResponse"
// 500: // 500:
// $ref: '#/responses/InternalError' // $ref: '#/responses/InternalError'
r.Handle(VersionedPath("/libpod/images/prune"), s.APIHandler(libpod.PruneImages)).Methods(http.MethodPost) r.Handle(VersionedPath("/libpod/images/prune"), s.APIHandler(libpod.PruneImages)).Methods(http.MethodPost)

2
pkg/domain/infra/abi/images.go
View File

@ -57,7 +57,7 @@ func (ir *ImageEngine) Prune(ctx context.Context, opts entities.ImagePruneOption
pruneOptions.Filters = append(pruneOptions.Filters, "containers=false") pruneOptions.Filters = append(pruneOptions.Filters, "containers=false")
} }
var pruneReports []*reports.PruneReport pruneReports := make([]*reports.PruneReport, 0)
// Now prune all images until we converge. // Now prune all images until we converge.
numPreviouslyRemovedImages := 1 numPreviouslyRemovedImages := 1

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

@ -218,6 +218,9 @@ if ! grep -q '400 Bad Request' "${TMPD}/headers.txt"; then
BUILD_TEST_ERROR="1" BUILD_TEST_ERROR="1"
fi fi
t POST libpod/images/prune 200
t POST libpod/images/prune 200 length=0 []
cleanBuildTest cleanBuildTest
if [[ "${BUILD_TEST_ERROR}" ]]; then if [[ "${BUILD_TEST_ERROR}" ]]; then
exit 1 exit 1