e6907243af
We try to perform API-version negotiation as lazy as possible (and only execute when we are about to make an API request). However, some code requires API-version dependent handling (to set options, or remove options based on the version of the API we're using). Currently this code depended on the caller code to perform API negotiation (or to configure the API version) first, which may not happen, and because of that we may be missing options (or set options that are not supported on older API versions). This patch: - splits the code that triggered API-version negotiation to a separate Client.checkVersion() function. - updates NewVersionError to accept a context - updates NewVersionError to perform API-version negotiation (if enabled) - updates various Client functions to manually trigger API-version negotiation Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
36 lines
899 B
Go
36 lines
899 B
Go
package client // import "github.com/docker/docker/client"
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"io"
|
|
|
|
"github.com/docker/docker/api/types/swarm"
|
|
)
|
|
|
|
// SecretInspectWithRaw returns the secret information with raw data
|
|
func (cli *Client) SecretInspectWithRaw(ctx context.Context, id string) (swarm.Secret, []byte, error) {
|
|
if err := cli.NewVersionError(ctx, "1.25", "secret inspect"); err != nil {
|
|
return swarm.Secret{}, nil, err
|
|
}
|
|
if id == "" {
|
|
return swarm.Secret{}, nil, objectNotFoundError{object: "secret", id: id}
|
|
}
|
|
resp, err := cli.get(ctx, "/secrets/"+id, nil, nil)
|
|
defer ensureReaderClosed(resp)
|
|
if err != nil {
|
|
return swarm.Secret{}, nil, err
|
|
}
|
|
|
|
body, err := io.ReadAll(resp.body)
|
|
if err != nil {
|
|
return swarm.Secret{}, nil, err
|
|
}
|
|
|
|
var secret swarm.Secret
|
|
rdr := bytes.NewReader(body)
|
|
err = json.NewDecoder(rdr).Decode(&secret)
|
|
|
|
return secret, body, err
|
|
}
|