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>
45 lines
1.1 KiB
Go
45 lines
1.1 KiB
Go
package client // import "github.com/docker/docker/client"
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/url"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/filters"
|
|
"github.com/pkg/errors"
|
|
)
|
|
|
|
// BuildCachePrune requests the daemon to delete unused cache data
|
|
func (cli *Client) BuildCachePrune(ctx context.Context, opts types.BuildCachePruneOptions) (*types.BuildCachePruneReport, error) {
|
|
if err := cli.NewVersionError("1.31", "build prune"); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
report := types.BuildCachePruneReport{}
|
|
|
|
query := url.Values{}
|
|
if opts.All {
|
|
query.Set("all", "1")
|
|
}
|
|
query.Set("keep-storage", fmt.Sprintf("%d", opts.KeepStorage))
|
|
filters, err := filters.ToJSON(opts.Filters)
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "prune could not marshal filters option")
|
|
}
|
|
query.Set("filters", filters)
|
|
|
|
serverResp, err := cli.post(ctx, "/build/prune", query, nil, nil)
|
|
defer ensureReaderClosed(serverResp)
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if err := json.NewDecoder(serverResp.body).Decode(&report); err != nil {
|
|
return nil, fmt.Errorf("Error retrieving disk usage: %v", err)
|
|
}
|
|
|
|
return &report, nil
|
|
}
|