diff options
| author | Jhon Honce <jhonce@redhat.com> | 2021-05-17 09:30:38 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2021-05-21 09:50:58 -0700 |
| commit | 8bf852d5f0e5d3b22da2a7401d37d1ef3475065f (patch) | |
| tree | 48bf4d1c69a9cdfa12f603c74166b77d54bf30dd /pkg | |
| parent | 6a6ef402c3c8e14a621a98a4029255e3be41d5ef (diff) | |
| download | podman-8bf852d5f0e5d3b22da2a7401d37d1ef3475065f.tar.gz podman-8bf852d5f0e5d3b22da2a7401d37d1ef3475065f.tar.bz2 podman-8bf852d5f0e5d3b22da2a7401d37d1ef3475065f.zip | |
Match swagger to "as built" output
* Remove all Types no longer referenced, they were never used
A future API breaking version of Podman API, may restore these Types
and push formatting into presentation layer vs. server.
Fixes #9578
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/api/handlers/swagger/swagger.go | 18 | ||||
| -rw-r--r-- | pkg/api/handlers/types.go | 9 | ||||
| -rw-r--r-- | pkg/api/server/register_images.go | 2 |
3 files changed, 10 insertions, 19 deletions
diff --git a/pkg/api/handlers/swagger/swagger.go b/pkg/api/handlers/swagger/swagger.go index ef3d12df8..83ff5914e 100644 --- a/pkg/api/handlers/swagger/swagger.go +++ b/pkg/api/handlers/swagger/swagger.go @@ -8,6 +8,15 @@ import ( "github.com/docker/docker/api/types" ) +// Tree response +// swagger:response TreeResponse +type swagTree struct { + // in:body + Body struct { + entities.ImageTreeReport + } +} + // History response // swagger:response DocsHistory type swagHistory struct { @@ -183,12 +192,3 @@ type swagInspectVolumeResponse struct { define.InspectVolumeData } } - -// Image tree response -// swagger:response LibpodImageTreeResponse -type swagImageTreeResponse struct { - // in:body - Body struct { - handlers.ImageTreeResponse - } -} diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go index 2ffd9b0cb..f94c9a1f5 100644 --- a/pkg/api/handlers/types.go +++ b/pkg/api/handlers/types.go @@ -148,15 +148,6 @@ type HistoryResponse struct { Comment string } -type ImageLayer struct{} - -type ImageTreeResponse struct { - ID string `json:"id"` - Tags []string `json:"tags"` - Size string `json:"size"` - Layers []ImageLayer `json:"layers"` -} - type ExecCreateConfig struct { docker.ExecConfig } diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go index b32c0df20..9634bd83b 100644 --- a/pkg/api/server/register_images.go +++ b/pkg/api/server/register_images.go @@ -747,7 +747,7 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error { // - application/json // responses: // 200: - // $ref: '#/responses/LibpodImageTreeResponse' + // $ref: "#/responses/TreeResponse" // 404: // $ref: '#/responses/NoSuchImage' // 500: |