9c846b2fcc
Unlike a plain `net/http/client.Do()`, requests made through client/request use the `sendRequest` function, which parses the server response, and may convert non-transport errors into errors (through `cli.checkResponseErr()`). This means that we cannot assume that no reader was opened if an error is returned. This patch changes various locations where `ensureReaderClosed` was only called in the non-error situation, and uses a `defer` to make sure it's always called. `ensureReaderClosed` itself already checks if the response's body was set, so in situations where the error was due to a transport error, calling `ensureReaderClosed` should be a no-op. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
38 lines
1.1 KiB
Go
38 lines
1.1 KiB
Go
package client // import "github.com/docker/docker/client"
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"io/ioutil"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
)
|
|
|
|
// VolumeInspect returns the information about a specific volume in the docker host.
|
|
func (cli *Client) VolumeInspect(ctx context.Context, volumeID string) (types.Volume, error) {
|
|
volume, _, err := cli.VolumeInspectWithRaw(ctx, volumeID)
|
|
return volume, err
|
|
}
|
|
|
|
// VolumeInspectWithRaw returns the information about a specific volume in the docker host and its raw representation
|
|
func (cli *Client) VolumeInspectWithRaw(ctx context.Context, volumeID string) (types.Volume, []byte, error) {
|
|
if volumeID == "" {
|
|
return types.Volume{}, nil, objectNotFoundError{object: "volume", id: volumeID}
|
|
}
|
|
|
|
var volume types.Volume
|
|
resp, err := cli.get(ctx, "/volumes/"+volumeID, nil, nil)
|
|
defer ensureReaderClosed(resp)
|
|
if err != nil {
|
|
return volume, nil, wrapResponseError(err, resp, "volume", volumeID)
|
|
}
|
|
|
|
body, err := ioutil.ReadAll(resp.body)
|
|
if err != nil {
|
|
return volume, nil, err
|
|
}
|
|
rdr := bytes.NewReader(body)
|
|
err = json.NewDecoder(rdr).Decode(&volume)
|
|
return volume, body, err
|
|
}
|