From 5b79cf15a0226dc3dad5053615ee652823376cd3 Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Thu, 19 May 2022 10:27:31 -0700 Subject: Swagger refactor/cleanup * Remove duplicate or unused types and constants * Move all documetation-only models and responses into swagger package * Remove all unecessary names, go-swagger will determine names from struct declarations * Use Libpod suffix to differentiate between compat and libpod models and responses. Taken from swagger:operation declarations. * Models and responses that start with lowercase are for swagger use only while uppercase are used "as is" in the code and swagger comments * Used gofumpt on new code ```release-note ``` Signed-off-by: Jhon Honce --- pkg/domain/entities/types.go | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'pkg/domain/entities/types.go') diff --git a/pkg/domain/entities/types.go b/pkg/domain/entities/types.go index bed3183e9..5ae8a4931 100644 --- a/pkg/domain/entities/types.go +++ b/pkg/domain/entities/types.go @@ -9,6 +9,7 @@ import ( "github.com/containers/podman/v4/libpod/events" "github.com/containers/podman/v4/pkg/specgen" "github.com/containers/storage/pkg/archive" + dockerAPI "github.com/docker/docker/api/types" ) type Container struct { @@ -26,8 +27,10 @@ type Report struct { type PodDeleteReport struct{ Report } -type VolumeDeleteOptions struct{} -type VolumeDeleteReport struct{ Report } +type ( + VolumeDeleteOptions struct{} + VolumeDeleteReport struct{ Report } +) type NetFlags struct { AddHosts []string `json:"add-host,omitempty"` @@ -59,7 +62,7 @@ type NetOptions struct { NetworkOptions map[string][]string `json:"network_options,omitempty"` } -// All CLI inspect commands and inspect sub-commands use the same options +// InspectOptions all CLI inspect commands and inspect sub-commands use the same options type InspectOptions struct { // Format - change the output to JSON or a Go template. Format string `json:",omitempty"` @@ -73,7 +76,7 @@ type InspectOptions struct { All bool `json:",omitempty"` } -// All API and CLI diff commands and diff sub-commands use the same options +// DiffOptions all API and CLI diff commands and diff sub-commands use the same options type DiffOptions struct { Format string `json:",omitempty"` // CLI only Latest bool `json:",omitempty"` // API and CLI, only supported by containers @@ -115,3 +118,11 @@ type BuildReport struct { // ID of the image. ID string } + +type IDOrNameResponse struct { + // The Id or Name of an object + IDOrName string +} + +// swagger:model +type IDResponse dockerAPI.IDResponse -- cgit v1.2.3-54-g00ecf