mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +00:00
c6a45784f9
The `VolumeListResult.Items` field was a `volume.ListResponse`, which in itself also had two slices (for volumes, and warnings). The Volumes field contained a slice of pointers to Volumes. This patch: - Re-defines `ImageRemoveResult` as a distinct type, containing the content of the `volume.ListResponse.Volumes` and `.Warnings`. - The `VolumeListResult` doesn't use a pointer for the volumes to make it slightly easier to deal with (possibly the API type could be changed as well, which could allow us to simplify the client code. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
56 lines
1.2 KiB
Go
56 lines
1.2 KiB
Go
package client
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/url"
|
|
"slices"
|
|
|
|
"github.com/moby/moby/api/types/volume"
|
|
)
|
|
|
|
// VolumeListOptions holds parameters to list volumes.
|
|
type VolumeListOptions struct {
|
|
Filters Filters
|
|
}
|
|
|
|
// VolumeListResult holds the result from the [Client.VolumeList] method.
|
|
type VolumeListResult struct {
|
|
// List of volumes.
|
|
Items []volume.Volume
|
|
|
|
// Warnings that occurred when fetching the list of volumes.
|
|
Warnings []string
|
|
}
|
|
|
|
// VolumeList returns the volumes configured in the docker host.
|
|
func (cli *Client) VolumeList(ctx context.Context, options VolumeListOptions) (VolumeListResult, error) {
|
|
query := url.Values{}
|
|
|
|
options.Filters.updateURLValues(query)
|
|
resp, err := cli.get(ctx, "/volumes", query, nil)
|
|
defer ensureReaderClosed(resp)
|
|
if err != nil {
|
|
return VolumeListResult{}, err
|
|
}
|
|
|
|
var apiResp volume.ListResponse
|
|
err = json.NewDecoder(resp.Body).Decode(&apiResp)
|
|
if err != nil {
|
|
return VolumeListResult{}, err
|
|
}
|
|
|
|
res := VolumeListResult{
|
|
Items: make([]volume.Volume, 0, len(apiResp.Volumes)),
|
|
Warnings: slices.Clone(apiResp.Warnings),
|
|
}
|
|
|
|
for _, vol := range apiResp.Volumes {
|
|
if vol != nil {
|
|
res.Items = append(res.Items, *vol)
|
|
}
|
|
}
|
|
|
|
return res, nil
|
|
}
|