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 (
|
|
"context"
|
|
"encoding/json"
|
|
"net/url"
|
|
|
|
registrytypes "github.com/docker/docker/api/types/registry"
|
|
)
|
|
|
|
// DistributionInspect returns the image digest with full Manifest
|
|
func (cli *Client) DistributionInspect(ctx context.Context, image, encodedRegistryAuth string) (registrytypes.DistributionInspect, error) {
|
|
// Contact the registry to retrieve digest and platform information
|
|
var distributionInspect registrytypes.DistributionInspect
|
|
if image == "" {
|
|
return distributionInspect, objectNotFoundError{object: "distribution", id: image}
|
|
}
|
|
|
|
if err := cli.NewVersionError("1.30", "distribution inspect"); err != nil {
|
|
return distributionInspect, err
|
|
}
|
|
var headers map[string][]string
|
|
|
|
if encodedRegistryAuth != "" {
|
|
headers = map[string][]string{
|
|
"X-Registry-Auth": {encodedRegistryAuth},
|
|
}
|
|
}
|
|
|
|
resp, err := cli.get(ctx, "/distribution/"+image+"/json", url.Values{}, headers)
|
|
defer ensureReaderClosed(resp)
|
|
if err != nil {
|
|
return distributionInspect, err
|
|
}
|
|
|
|
err = json.NewDecoder(resp.body).Decode(&distributionInspect)
|
|
return distributionInspect, err
|
|
}
|