Merge pull request #10174 from rhatdan/volume

Remove unused VolumeList* structs

1 files changed, 4 insertions, 38 deletions

diff --git a/pkg/domain/entities/volumes.go b/pkg/domain/entities/volumes.go
index 55a6a1b14..62f5401cc 100644
--- a/pkg/domain/entities/volumes.go
+++ b/pkg/domain/entities/volumes.go
@@ -4,6 +4,8 @@ import (
 	"net/url"
 
 	"github.com/containers/podman/v3/libpod/define"
+	docker_api_types "github.com/docker/docker/api/types"
+	docker_api_types_volume "github.com/docker/docker/api/types/volume"
 )
 
 // Volume volume
@@ -91,42 +93,6 @@ type VolumeConfigResponse struct {
 	define.InspectVolumeData
 }
 
-// VolumeInfo Volume list response
-// swagger:model VolumeInfo
-type VolumeInfo struct {
-
-	// Date/Time the volume was created.
-	CreatedAt string `json:"CreatedAt,omitempty"`
-
-	// Name of the volume driver used by the volume. Only supports local driver
-	// Required: true
-	Driver string `json:"Driver"`
-
-	// User-defined key/value metadata.
-	// Always included
-	Labels map[string]string `json:"Labels"`
-
-	// Mount path of the volume on the host.
-	// Required: true
-	Mountpoint string `json:"Mountpoint"`
-
-	// Name of the volume.
-	// Required: true
-	Name string `json:"Name"`
-
-	// The driver specific options used when creating the volume.
-	// Required: true
-	Options map[string]string `json:"Options"`
-
-	// The level at which the volume exists.
-	// Libpod does not implement volume scoping, and this is provided solely for
-	// Docker compatibility. The value is only "local".
-	// Required: true
-	Scope string `json:"Scope"`
-
-	// TODO: We don't include the volume `Status` for now
-}
-
 type VolumeRmOptions struct {
 	All   bool
 	Force bool
@@ -158,7 +124,7 @@ type VolumeListReport struct {
 // VolumeListBody Volume list response
 // swagger:model VolumeListBody
 type VolumeListBody struct {
-	Volumes []*VolumeInfo
+	Volumes []docker_api_types_volume.VolumeListOKBody
 }
 
 // Volume list response
@@ -191,7 +157,7 @@ type SwagDockerVolumeInfoResponse struct {
 type SwagDockerVolumePruneResponse struct {
 	// in:body
 	Body struct {
-		//		docker_api_types.VolumesPruneReport
+		docker_api_types.VolumesPruneReport
 	}
 }