7025247324
This fix tries to address the issue raised in 29999 where it was not possible to mask these items (like important non-removable stuff) from `docker system prune`. This fix adds `label` and `label!` field for `--filter` in `system prune`, so that it is possible to selectively prune items like: ``` $ docker container prune --filter label=foo $ docker container prune --filter label!=bar ``` Additional unit tests and integration tests have been added. This fix fixes 29999. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
124 lines
3.1 KiB
Go
124 lines
3.1 KiB
Go
package client
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/filters"
|
|
"github.com/docker/docker/pkg/testutil/assert"
|
|
"golang.org/x/net/context"
|
|
)
|
|
|
|
func TestContainersPruneError(t *testing.T) {
|
|
client := &Client{
|
|
client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
|
|
version: "1.25",
|
|
}
|
|
|
|
filters := filters.NewArgs()
|
|
|
|
_, err := client.ContainersPrune(context.Background(), filters)
|
|
assert.Error(t, err, "Error response from daemon: Server error")
|
|
}
|
|
|
|
func TestContainersPrune(t *testing.T) {
|
|
expectedURL := "/v1.25/containers/prune"
|
|
|
|
danglingFilters := filters.NewArgs()
|
|
danglingFilters.Add("dangling", "true")
|
|
|
|
noDanglingFilters := filters.NewArgs()
|
|
noDanglingFilters.Add("dangling", "false")
|
|
|
|
danglingUntilFilters := filters.NewArgs()
|
|
danglingUntilFilters.Add("dangling", "true")
|
|
danglingUntilFilters.Add("until", "2016-12-15T14:00")
|
|
|
|
labelFilters := filters.NewArgs()
|
|
labelFilters.Add("dangling", "true")
|
|
labelFilters.Add("label", "label1=foo")
|
|
labelFilters.Add("label", "label2!=bar")
|
|
|
|
listCases := []struct {
|
|
filters filters.Args
|
|
expectedQueryParams map[string]string
|
|
}{
|
|
{
|
|
filters: filters.Args{},
|
|
expectedQueryParams: map[string]string{
|
|
"until": "",
|
|
"filter": "",
|
|
"filters": "",
|
|
},
|
|
},
|
|
{
|
|
filters: danglingFilters,
|
|
expectedQueryParams: map[string]string{
|
|
"until": "",
|
|
"filter": "",
|
|
"filters": `{"dangling":{"true":true}}`,
|
|
},
|
|
},
|
|
{
|
|
filters: danglingUntilFilters,
|
|
expectedQueryParams: map[string]string{
|
|
"until": "",
|
|
"filter": "",
|
|
"filters": `{"dangling":{"true":true},"until":{"2016-12-15T14:00":true}}`,
|
|
},
|
|
},
|
|
{
|
|
filters: noDanglingFilters,
|
|
expectedQueryParams: map[string]string{
|
|
"until": "",
|
|
"filter": "",
|
|
"filters": `{"dangling":{"false":true}}`,
|
|
},
|
|
},
|
|
{
|
|
filters: labelFilters,
|
|
expectedQueryParams: map[string]string{
|
|
"until": "",
|
|
"filter": "",
|
|
"filters": `{"dangling":{"true":true},"label":{"label1=foo":true,"label2!=bar":true}}`,
|
|
},
|
|
},
|
|
}
|
|
for _, listCase := range listCases {
|
|
client := &Client{
|
|
client: newMockClient(func(req *http.Request) (*http.Response, error) {
|
|
if !strings.HasPrefix(req.URL.Path, expectedURL) {
|
|
return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
|
|
}
|
|
query := req.URL.Query()
|
|
for key, expected := range listCase.expectedQueryParams {
|
|
actual := query.Get(key)
|
|
assert.Equal(t, actual, expected)
|
|
}
|
|
content, err := json.Marshal(types.ContainersPruneReport{
|
|
ContainersDeleted: []string{"container_id1", "container_id2"},
|
|
SpaceReclaimed: 9999,
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &http.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: ioutil.NopCloser(bytes.NewReader(content)),
|
|
}, nil
|
|
}),
|
|
version: "1.25",
|
|
}
|
|
|
|
report, err := client.ContainersPrune(context.Background(), listCase.filters)
|
|
assert.NilError(t, err)
|
|
assert.Equal(t, len(report.ContainersDeleted), 2)
|
|
assert.Equal(t, report.SpaceReclaimed, uint64(9999))
|
|
}
|
|
}
|