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
896 B
Go
38 lines
896 B
Go
package client // import "github.com/docker/docker/client"
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/url"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/filters"
|
|
"github.com/docker/docker/api/types/swarm"
|
|
)
|
|
|
|
// SecretList returns the list of secrets.
|
|
func (cli *Client) SecretList(ctx context.Context, options types.SecretListOptions) ([]swarm.Secret, error) {
|
|
if err := cli.NewVersionError("1.25", "secret list"); err != nil {
|
|
return nil, err
|
|
}
|
|
query := url.Values{}
|
|
|
|
if options.Filters.Len() > 0 {
|
|
filterJSON, err := filters.ToJSON(options.Filters)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
query.Set("filters", filterJSON)
|
|
}
|
|
|
|
resp, err := cli.get(ctx, "/secrets", query, nil)
|
|
defer ensureReaderClosed(resp)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
var secrets []swarm.Secret
|
|
err = json.NewDecoder(resp.body).Decode(&secrets)
|
|
return secrets, err
|
|
}
|