diff options
| author | Matej Vasek <mvasek@redhat.com> | 2021-11-01 22:30:57 +0100 |
|---|---|---|
| committer | Matej Vasek <mvasek@redhat.com> | 2021-11-01 22:37:35 +0100 |
| commit | 48d0d2b4a379b380b0f890a0fbb850a83f0d5fda (patch) | |
| tree | d58b0bd567820fea0c07d96c848f2ff3d15a51f4 | |
| parent | 85bad0cc7c68b71ab7ddb6ed09b862145c6c6d0e (diff) | |
| download | podman-48d0d2b4a379b380b0f890a0fbb850a83f0d5fda.tar.gz podman-48d0d2b4a379b380b0f890a0fbb850a83f0d5fda.tar.bz2 podman-48d0d2b4a379b380b0f890a0fbb850a83f0d5fda.zip | |
Fix swagger definitions
[NO TESTS NEEDED]
Signed-off-by: Matej Vasek <mvasek@redhat.com>
| -rw-r--r-- | pkg/api/server/register_images.go | 4 | ||||
| -rw-r--r-- | pkg/api/server/swagger.go | 14 | ||||
| -rw-r--r-- | pkg/domain/entities/images.go | 1 |
3 files changed, 14 insertions, 5 deletions
diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go index 95a8b4939..e21cc2a33 100644 --- a/pkg/api/server/register_images.go +++ b/pkg/api/server/register_images.go @@ -103,7 +103,7 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error { // - application/json // responses: // 200: - // $ref: "#/responses/DockerImageSummary" + // $ref: "#/responses/DockerImageSummaryResponse" // 500: // $ref: '#/responses/InternalError' r.Handle(VersionedPath("/images/json"), s.APIHandler(compat.GetImages)).Methods(http.MethodGet) @@ -837,7 +837,7 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error { // - application/json // responses: // 200: - // $ref: "#/responses/DockerImageSummary" + // $ref: "#/responses/LibpodImageSummaryResponse" // 500: // $ref: '#/responses/InternalError' r.Handle(VersionedPath("/libpod/images/json"), s.APIHandler(libpod.GetImages)).Methods(http.MethodGet) diff --git a/pkg/api/server/swagger.go b/pkg/api/server/swagger.go index 0fd66652e..3f8f6f9c5 100644 --- a/pkg/api/server/swagger.go +++ b/pkg/api/server/swagger.go @@ -6,6 +6,7 @@ import ( "github.com/containers/podman/v3/pkg/domain/entities" "github.com/containers/podman/v3/pkg/domain/entities/reports" "github.com/containers/podman/v3/pkg/errorhandling" + docker "github.com/docker/docker/api/types" ) // No such image @@ -134,9 +135,16 @@ type swagPodAlreadyStopped struct { } } -// Image summary -// swagger:response DockerImageSummary -type swagImageSummary struct { +// Image summary for compat API +// swagger:response DockerImageSummaryResponse +type swagDockerImageSummaryResponse struct { + // in:body + Body []docker.ImageSummary +} + +// Image summary for libpod API +// swagger:response LibpodImageSummaryResponse +type swagLibpodImageSummaryResponse struct { // in:body Body []entities.ImageSummary } diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go index ac5e6f410..38cdc8f2f 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -50,6 +50,7 @@ func (i *Image) Id() string { // nolint return i.ID } +// swagger:model LibpodImageSummary type ImageSummary struct { ID string `json:"Id"` ParentId string // nolint |