From 4caf68f4f60cddbe95f71b5a395e022ccc8cbf16 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 5 Mar 2022 20:52:29 +0100 Subject: [PATCH] api/types: rename volume.VolumeUsageData to volume.UsageData Signed-off-by: Sebastiaan van Stijn --- api/swagger.yaml | 1 + api/types/deprecated.go | 4 ++-- api/types/volume/volume.go | 8 ++++---- volume/service/convert.go | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/api/swagger.yaml b/api/swagger.yaml index b418cd2f1f..39d18e2e99 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -2009,6 +2009,7 @@ definitions: UsageData: type: "object" x-nullable: true + x-go-name: "UsageData" required: [Size, RefCount] description: | Usage details about the volume. This information is used by the diff --git a/api/types/deprecated.go b/api/types/deprecated.go index 7666a7173a..216d1df0ff 100644 --- a/api/types/deprecated.go +++ b/api/types/deprecated.go @@ -10,5 +10,5 @@ type Volume = volume.Volume // VolumeUsageData Usage details about the volume. This information is used by the // `GET /system/df` endpoint, and omitted in other endpoints. // -// Deprecated: use github.com/docker/docker/api/types/volume.VolumeUsageData -type VolumeUsageData = volume.VolumeUsageData +// Deprecated: use github.com/docker/docker/api/types/volume.UsageData +type VolumeUsageData = volume.UsageData diff --git a/api/types/volume/volume.go b/api/types/volume/volume.go index 047b54c598..2e40247505 100644 --- a/api/types/volume/volume.go +++ b/api/types/volume/volume.go @@ -47,14 +47,14 @@ type Volume struct { Status map[string]interface{} `json:"Status,omitempty"` // usage data - UsageData *VolumeUsageData `json:"UsageData,omitempty"` + UsageData *UsageData `json:"UsageData,omitempty"` } -// VolumeUsageData Usage details about the volume. This information is used by the +// UsageData Usage details about the volume. This information is used by the // `GET /system/df` endpoint, and omitted in other endpoints. // -// swagger:model VolumeUsageData -type VolumeUsageData struct { +// swagger:model UsageData +type UsageData struct { // The number of containers referencing this volume. This field // is set to `-1` if the reference-count is not available. diff --git a/volume/service/convert.go b/volume/service/convert.go index baad41ab09..01828280b4 100644 --- a/volume/service/convert.go +++ b/volume/service/convert.go @@ -69,7 +69,7 @@ func (s *VolumesService) volumesToAPI(ctx context.Context, volumes []volume.Volu logrus.WithError(err).WithField("volume", v.Name()).Warnf("Failed to determine size of volume") sz = -1 } - apiV.UsageData = &volumetypes.VolumeUsageData{Size: sz, RefCount: int64(s.vs.CountReferences(v))} + apiV.UsageData = &volumetypes.UsageData{Size: sz, RefCount: int64(s.vs.CountReferences(v))} } out = append(out, &apiV)