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>
32 lines
826 B
Go
32 lines
826 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"
|
|
)
|
|
|
|
// PluginList returns the installed plugins
|
|
func (cli *Client) PluginList(ctx context.Context, filter filters.Args) (types.PluginsListResponse, error) {
|
|
var plugins types.PluginsListResponse
|
|
query := url.Values{}
|
|
|
|
if filter.Len() > 0 {
|
|
filterJSON, err := filters.ToParamWithVersion(cli.version, filter)
|
|
if err != nil {
|
|
return plugins, err
|
|
}
|
|
query.Set("filters", filterJSON)
|
|
}
|
|
resp, err := cli.get(ctx, "/plugins", query, nil)
|
|
defer ensureReaderClosed(resp)
|
|
if err != nil {
|
|
return plugins, wrapResponseError(err, resp, "plugin", "")
|
|
}
|
|
|
|
err = json.NewDecoder(resp.body).Decode(&plugins)
|
|
return plugins, err
|
|
}
|