diff options
| author | Matej Vasek <mvasek@redhat.com> | 2021-11-01 16:10:10 +0100 |
|---|---|---|
| committer | Matej Vasek <mvasek@redhat.com> | 2021-11-01 16:53:49 +0100 |
| commit | 218d91d76d49c7329704a80411ad2c115b074f84 (patch) | |
| tree | 8ef32d6ae77b05866d0eb88ff251477f07f359a1 | |
| parent | 85bad0cc7c68b71ab7ddb6ed09b862145c6c6d0e (diff) | |
| download | podman-218d91d76d49c7329704a80411ad2c115b074f84.tar.gz podman-218d91d76d49c7329704a80411ad2c115b074f84.tar.bz2 podman-218d91d76d49c7329704a80411ad2c115b074f84.zip | |
Fix libpod API conformance to swagger
* Return empty array when nothing has been pruned.
* Use correct return type swagger doc-comment.
Signed-off-by: Matej Vasek <mvasek@redhat.com>
| -rw-r--r-- | pkg/api/server/register_images.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/images.go | 2 | ||||
| -rw-r--r-- | test/apiv2/10-images.at | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go index 95a8b4939..82b4c2d89 100644 --- a/pkg/api/server/register_images.go +++ b/pkg/api/server/register_images.go @@ -1069,7 +1069,7 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error { // - application/json // responses: // 200: - // $ref: "#/responses/DocsImageDeleteResponse" + // $ref: "#/responses/DocsLibpodPruneResponse" // 500: // $ref: '#/responses/InternalError' r.Handle(VersionedPath("/libpod/images/prune"), s.APIHandler(libpod.PruneImages)).Methods(http.MethodPost) diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index 8878bf128..7aa202334 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -57,7 +57,7 @@ func (ir *ImageEngine) Prune(ctx context.Context, opts entities.ImagePruneOption pruneOptions.Filters = append(pruneOptions.Filters, "containers=false") } - var pruneReports []*reports.PruneReport + pruneReports := make([]*reports.PruneReport, 0) // Now prune all images until we converge. numPreviouslyRemovedImages := 1 diff --git a/test/apiv2/10-images.at b/test/apiv2/10-images.at index d3fde9f9d..b7bcaf81d 100644 --- a/test/apiv2/10-images.at +++ b/test/apiv2/10-images.at @@ -218,6 +218,9 @@ if ! grep -q '400 Bad Request' "${TMPD}/headers.txt"; then BUILD_TEST_ERROR="1" fi +t POST libpod/images/prune 200 +t POST libpod/images/prune 200 length=0 [] + cleanBuildTest if [[ "${BUILD_TEST_ERROR}" ]]; then exit 1 |