InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: add Filters type

Browse Source 
Add a new type to use for building filter predicates for API requests,
replacing "./api/types/filters".Args in the client. Remove the now
unused api/types/filters package.

Signed-off-by: Cory Snider <csnider@mirantis.com>
This commit is contained in:
Cory Snider
2025-10-06 15:18:41 -04:00
parent 778e5bfad3
commit 7ea066c8d1
106 changed files with 380 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
integration/volume/volume_test.go
View File

@@ -10,7 +10,6 @@ import (
cerrdefs "github.com/containerd/errdefs"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/moby/moby/api/types/filters"
"github.com/moby/moby/api/types/volume"
"github.com/moby/moby/client"
"github.com/moby/moby/v2/integration/internal/build"
@@ -271,7 +270,7 @@ func TestVolumePruneAnonymous(t *testing.T) {
assert.NilError(t, err)
// Prune anonymous volumes
pruneReport, err := apiClient.VolumesPrune(ctx, filters.Args{})
pruneReport, err := apiClient.VolumesPrune(ctx, nil)
assert.NilError(t, err)
assert.Check(t, is.Equal(len(pruneReport.VolumesDeleted), 1))
assert.Check(t, is.Equal(pruneReport.VolumesDeleted[0], v.Name))
@@ -283,7 +282,7 @@ func TestVolumePruneAnonymous(t *testing.T) {
_, err = apiClient.VolumeCreate(ctx, volume.CreateOptions{})
assert.NilError(t, err)
pruneReport, err = apiClient.VolumesPrune(ctx, filters.NewArgs(filters.Arg("all", "1")))
pruneReport, err = apiClient.VolumesPrune(ctx, make(client.Filters).Add("all", "1"))
assert.NilError(t, err)
assert.Check(t, is.Equal(len(pruneReport.VolumesDeleted), 2))
@@ -298,7 +297,7 @@ func TestVolumePruneAnonymous(t *testing.T) {
vNamed, err = apiClient.VolumeCreate(ctx, volume.CreateOptions{Name: "test-api141"})
assert.NilError(t, err)
pruneReport, err = clientOld.VolumesPrune(ctx, filters.Args{})
pruneReport, err = clientOld.VolumesPrune(ctx, nil)
assert.NilError(t, err)
assert.Check(t, is.Equal(len(pruneReport.VolumesDeleted), 2))
assert.Check(t, is.Contains(pruneReport.VolumesDeleted, v.Name))
@@ -333,7 +332,7 @@ VOLUME ` + volDest
err = apiClient.ContainerRemove(ctx, id, client.ContainerRemoveOptions{})
assert.NilError(t, err)
pruneReport, err := apiClient.VolumesPrune(ctx, filters.Args{})
pruneReport, err := apiClient.VolumesPrune(ctx, nil)
assert.NilError(t, err)
assert.Assert(t, is.Contains(pruneReport.VolumesDeleted, volumeName))
}