deleted file mode 100644

@@ -1,24 +0,0 @@

-package filters

-

-import "fmt"

-

-// invalidFilter indicates that the provided filter or its value is invalid

-type invalidFilter struct {

-	Filter string

-	Value  []string

-}

-

-func (e invalidFilter) Error() string {

-	msg := "invalid filter"

-	if e.Filter != "" {

-		msg += " '" + e.Filter

-		if e.Value != nil {

-			msg = fmt.Sprintf("%s=%s", msg, e.Value)

-		}

-		msg += "'"

-	}

-	return msg

-}

-

-// InvalidParameter marks this error as ErrInvalidParameter

-func (e invalidFilter) InvalidParameter() {}

deleted file mode 100644

@@ -1,65 +0,0 @@

-/*

-Package filters provides tools for encoding a mapping of keys to a set of

-multiple values.

-*/

-package filters

-

-import (

-	"encoding/json"

-)

-

-// Args stores a mapping of keys to a set of multiple values.

-type Args struct {

-	fields map[string]map[string]bool

-}

-

-// KeyValuePair are used to initialize a new Args

-type KeyValuePair struct {

-	Key   string

-	Value string

-}

-

-// Arg creates a new KeyValuePair for initializing Args

-func Arg(key, value string) KeyValuePair {

-	return KeyValuePair{Key: key, Value: value}

-}

-

-// NewArgs returns a new Args populated with the initial args

-func NewArgs(initialArgs ...KeyValuePair) Args {

-	args := Args{fields: map[string]map[string]bool{}}

-	for _, arg := range initialArgs {

-		args.Add(arg.Key, arg.Value)

-	}

-	return args

-}

-

-// MarshalJSON returns a JSON byte representation of the Args

-func (args Args) MarshalJSON() ([]byte, error) {

-	if len(args.fields) == 0 {

-		return []byte("{}"), nil

-	}

-	return json.Marshal(args.fields)

-}

-

-// ToJSON returns the Args as a JSON encoded string

-func ToJSON(a Args) (string, error) {

-	if a.Len() == 0 {

-		return "", nil

-	}

-	buf, err := json.Marshal(a)

-	return string(buf), err

-}

-

-// Add a new value to the set of values

-func (args Args) Add(key, value string) {

-	if _, ok := args.fields[key]; ok {

-		args.fields[key][value] = true

-	} else {

-		args.fields[key] = map[string]bool{value: true}

-	}

-}

-

-// Len returns the number of keys in the mapping

-func (args Args) Len() int {

-	return len(args.fields)

-}

deleted file mode 100644

@@ -1,62 +0,0 @@

-package filters

-

-import (

-	"encoding/json"

-	"testing"

-

-	"gotest.tools/v3/assert"

-	is "gotest.tools/v3/assert/cmp"

-)

-

-func TestMarshalJSON(t *testing.T) {

-	a := NewArgs(

-		Arg("created", "today"),

-		Arg("image.name", "ubuntu*"),

-		Arg("image.name", "*untu"),

-	)

-

-	s, err := a.MarshalJSON()

-	assert.Check(t, err)

-	const expected = `{"created":{"today":true},"image.name":{"*untu":true,"ubuntu*":true}}`

-	assert.Check(t, is.Equal(string(s), expected))

-}

-

-func TestMarshalJSONWithEmpty(t *testing.T) {

-	s, err := json.Marshal(NewArgs())

-	assert.Check(t, err)

-	const expected = `{}`

-	assert.Check(t, is.Equal(string(s), expected))

-}

-

-func TestToJSON(t *testing.T) {

-	a := NewArgs(

-		Arg("created", "today"),

-		Arg("image.name", "ubuntu*"),

-		Arg("image.name", "*untu"),

-	)

-

-	s, err := ToJSON(a)

-	assert.Check(t, err)

-	const expected = `{"created":{"today":true},"image.name":{"*untu":true,"ubuntu*":true}}`

-	assert.Check(t, is.Equal(s, expected))

-}

-

-func TestAdd(t *testing.T) {

-	f := NewArgs()

-	f.Add("status", "running")

-	v := f.fields["status"]

-	assert.Check(t, is.DeepEqual(v, []string{"running"}))

-

-	f.Add("status", "paused")

-	v = f.fields["status"]

-	assert.Check(t, is.Len(v, 2))

-	assert.Check(t, is.Contains(v, "running"))

-	assert.Check(t, is.Contains(v, "paused"))

-}

-

-func TestLen(t *testing.T) {

-	f := NewArgs()

-	assert.Check(t, is.Equal(f.Len(), 0))

-	f.Add("status", "running")

-	assert.Check(t, is.Equal(f.Len(), 1))

-}

@@ -8,7 +8,6 @@ import (

 	"strconv"

 	"github.com/moby/moby/api/types/build"

-	"github.com/moby/moby/api/types/filters"

 	"github.com/moby/moby/api/types/versions"

 )

@@ -18,7 +17,7 @@ type BuildCachePruneOptions struct {

 	ReservedSpace int64

 	MaxUsedSpace  int64

 	MinFreeSpace  int64

-	Filters       filters.Args

+	Filters       Filters

 }

 // BuildCachePruneResult holds the result from the BuildCachePrune method.

@@ -49,11 +48,7 @@ func (cli *Client) BuildCachePrune(ctx context.Context, opts BuildCachePruneOpti

 	if opts.MinFreeSpace != 0 {

 		query.Set("min-free-space", strconv.Itoa(int(opts.MinFreeSpace)))

 	}

-	f, err := filters.ToJSON(opts.Filters)

-	if err != nil {

-		return BuildCachePruneResult{}, fmt.Errorf("prune could not marshal filters option: %w", err)

-	}

-	query.Set("filters", f)

+	opts.Filters.updateURLValues(query)

 	resp, err := cli.post(ctx, "/build/prune", query, nil, nil)

 	defer ensureReaderClosed(resp)

@@ -8,7 +8,6 @@ import (

 	"github.com/moby/moby/api/types"

 	"github.com/moby/moby/api/types/container"

 	"github.com/moby/moby/api/types/events"

-	"github.com/moby/moby/api/types/filters"

 	"github.com/moby/moby/api/types/image"

 	"github.com/moby/moby/api/types/network"

 	"github.com/moby/moby/api/types/plugin"

@@ -89,7 +88,7 @@ type ContainerAPIClient interface {

 	ContainerWait(ctx context.Context, container string, condition container.WaitCondition) (<-chan container.WaitResponse, <-chan error)

 	CopyFromContainer(ctx context.Context, container, srcPath string) (io.ReadCloser, container.PathStat, error)

 	CopyToContainer(ctx context.Context, container, path string, content io.Reader, options CopyToContainerOptions) error

-	ContainersPrune(ctx context.Context, pruneFilters filters.Args) (container.PruneReport, error)

+	ContainersPrune(ctx context.Context, pruneFilters Filters) (container.PruneReport, error)

 }

 type ExecAPIClient interface {

@@ -119,7 +118,7 @@ type ImageAPIClient interface {

 	ImageRemove(ctx context.Context, image string, options ImageRemoveOptions) ([]image.DeleteResponse, error)

 	ImageSearch(ctx context.Context, term string, options ImageSearchOptions) ([]registry.SearchResult, error)

 	ImageTag(ctx context.Context, image, ref string) error

-	ImagesPrune(ctx context.Context, pruneFilter filters.Args) (image.PruneReport, error)

+	ImagesPrune(ctx context.Context, pruneFilter Filters) (image.PruneReport, error)

 	ImageInspect(ctx context.Context, image string, _ ...ImageInspectOption) (image.InspectResponse, error)

 	ImageHistory(ctx context.Context, image string, _ ...ImageHistoryOption) ([]image.HistoryResponseItem, error)

@@ -136,7 +135,7 @@ type NetworkAPIClient interface {

 	NetworkInspectWithRaw(ctx context.Context, network string, options NetworkInspectOptions) (network.Inspect, []byte, error)

 	NetworkList(ctx context.Context, options NetworkListOptions) ([]network.Summary, error)

 	NetworkRemove(ctx context.Context, network string) error

-	NetworksPrune(ctx context.Context, pruneFilter filters.Args) (network.PruneReport, error)

+	NetworksPrune(ctx context.Context, pruneFilter Filters) (network.PruneReport, error)

 }

 // NodeAPIClient defines API client methods for the nodes

@@ -149,7 +148,7 @@ type NodeAPIClient interface {

 // PluginAPIClient defines API client methods for the plugins

 type PluginAPIClient interface {

-	PluginList(ctx context.Context, filter filters.Args) (plugin.ListResponse, error)

+	PluginList(ctx context.Context, filter Filters) (plugin.ListResponse, error)

 	PluginRemove(ctx context.Context, name string, options PluginRemoveOptions) error

 	PluginEnable(ctx context.Context, name string, options PluginEnableOptions) error

 	PluginDisable(ctx context.Context, name string, options PluginDisableOptions) error

@@ -201,7 +200,7 @@ type VolumeAPIClient interface {

 	VolumeInspectWithRaw(ctx context.Context, volumeID string) (volume.Volume, []byte, error)

 	VolumeList(ctx context.Context, options VolumeListOptions) (volume.ListResponse, error)

 	VolumeRemove(ctx context.Context, volumeID string, force bool) error

-	VolumesPrune(ctx context.Context, pruneFilter filters.Args) (volume.PruneReport, error)

+	VolumesPrune(ctx context.Context, pruneFilter Filters) (volume.PruneReport, error)

 	VolumeUpdate(ctx context.Context, volumeID string, version swarm.Version, options volume.UpdateOptions) error

 }

@@ -5,22 +5,13 @@ import (

 	"encoding/json"

 	"net/url"

-	"github.com/moby/moby/api/types/filters"

 	"github.com/moby/moby/api/types/swarm"

 )

 // ConfigList returns the list of configs.

 func (cli *Client) ConfigList(ctx context.Context, options ConfigListOptions) ([]swarm.Config, error) {

 	query := url.Values{}

-

-	if options.Filters.Len() > 0 {

-		filterJSON, err := filters.ToJSON(options.Filters)

-		if err != nil {

-			return nil, err

-		}

-

-		query.Set("filters", filterJSON)

-	}

+	options.Filters.updateURLValues(query)

 	resp, err := cli.get(ctx, "/configs", query, nil)

 	defer ensureReaderClosed(resp)

@@ -10,7 +10,6 @@ import (

 	"testing"

 	cerrdefs "github.com/containerd/errdefs"

-	"github.com/moby/moby/api/types/filters"

 	"github.com/moby/moby/api/types/swarm"

 	"gotest.tools/v3/assert"

 	is "gotest.tools/v3/assert/cmp"

@@ -41,10 +40,9 @@ func TestConfigList(t *testing.T) {

 		},

 		{

 			options: ConfigListOptions{

-				Filters: filters.NewArgs(

-					filters.Arg("label", "label1"),

-					filters.Arg("label", "label2"),

-				),

+				Filters: make(Filters).

+					Add("label", "label1").

+					Add("label", "label2"),

 			},

 			expectedQueryParams: map[string]string{

 				"filters": `{"label":{"label1":true,"label2":true}}`,

@@ -7,7 +7,6 @@ import (

 	"strconv"

 	"github.com/moby/moby/api/types/container"

-	"github.com/moby/moby/api/types/filters"

 )

 // ContainerListOptions holds parameters to list containers with.

@@ -18,7 +17,7 @@ type ContainerListOptions struct {

 	Since   string

 	Before  string

 	Limit   int

-	Filters filters.Args

+	Filters Filters

 }

 // ContainerList returns the list of containers in the docker host.

@@ -45,13 +44,7 @@ func (cli *Client) ContainerList(ctx context.Context, options ContainerListOptio

 		query.Set("size", "1")

 	}

-	if options.Filters.Len() > 0 {

-		filterJSON, err := filters.ToJSON(options.Filters)

-		if err != nil {

-			return nil, err

-		}

-		query.Set("filters", filterJSON)

-	}

+	options.Filters.updateURLValues(query)

 	resp, err := cli.get(ctx, "/containers/json", query, nil)

 	defer ensureReaderClosed(resp)

@@ -11,7 +11,6 @@ import (

 	cerrdefs "github.com/containerd/errdefs"

 	"github.com/moby/moby/api/types/container"

-	"github.com/moby/moby/api/types/filters"

 	"gotest.tools/v3/assert"

 	is "gotest.tools/v3/assert/cmp"

 )

@@ -86,11 +85,10 @@ func TestContainerList(t *testing.T) {

 		Size:  true,

 		All:   true,

 		Since: "container",

-		Filters: filters.NewArgs(

-			filters.Arg("label", "label1"),

-			filters.Arg("label", "label2"),

-			filters.Arg("before", "container"),

-		),

+		Filters: make(Filters).

+			Add("label", "label1").

+			Add("label", "label2").

+			Add("before", "container"),

 	})

 	assert.NilError(t, err)

 	assert.Check(t, is.Len(containers, 2))

@@ -4,17 +4,15 @@ import (

 	"context"

 	"encoding/json"

 	"fmt"

+	"net/url"

 	"github.com/moby/moby/api/types/container"

-	"github.com/moby/moby/api/types/filters"

 )

 // ContainersPrune requests the daemon to delete unused data

-func (cli *Client) ContainersPrune(ctx context.Context, pruneFilters filters.Args) (container.PruneReport, error) {

-	query, err := getFiltersQuery(pruneFilters)

-	if err != nil {

-		return container.PruneReport{}, err

-	}

+func (cli *Client) ContainersPrune(ctx context.Context, pruneFilters Filters) (container.PruneReport, error) {

+	query := url.Values{}

+	pruneFilters.updateURLValues(query)

 	resp, err := cli.post(ctx, "/containers/prune", query, nil, nil)

 	defer ensureReaderClosed(resp)

@@ -10,7 +10,6 @@ import (

 	cerrdefs "github.com/containerd/errdefs"

 	"github.com/moby/moby/api/types/container"

-	"github.com/moby/moby/api/types/filters"

 	"gotest.tools/v3/assert"

 	is "gotest.tools/v3/assert/cmp"

 )

@@ -19,7 +18,7 @@ func TestContainersPruneError(t *testing.T) {

 	client, err := NewClientWithOpts(WithMockClient(errorMock(http.StatusInternalServerError, "Server error")))

 	assert.NilError(t, err)

-	_, err = client.ContainersPrune(context.Background(), filters.Args{})

+	_, err = client.ContainersPrune(context.Background(), Filters{})

 	assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal))

 }

@@ -27,11 +26,11 @@ func TestContainersPrune(t *testing.T) {

 	const expectedURL = "/containers/prune"

 	listCases := []struct {

-		filters             filters.Args

+		filters             Filters

 		expectedQueryParams map[string]string

 	}{

 		{

-			filters: filters.Args{},

+			filters: Filters{},

 			expectedQueryParams: map[string]string{

 				"until":   "",

 				"filter":  "",

@@ -39,7 +38,7 @@ func TestContainersPrune(t *testing.T) {

 			},

 		},

 		{

-			filters: filters.NewArgs(filters.Arg("dangling", "true")),

+			filters: make(Filters).Add("dangling", "true"),

 			expectedQueryParams: map[string]string{

 				"until":   "",

 				"filter":  "",

@@ -47,10 +46,9 @@ func TestContainersPrune(t *testing.T) {

 			},

 		},

 		{

-			filters: filters.NewArgs(

-				filters.Arg("dangling", "true"),

-				filters.Arg("until", "2016-12-15T14:00"),

-			),

+			filters: make(Filters).

+				Add("dangling", "true").

+				Add("until", "2016-12-15T14:00"),

 			expectedQueryParams: map[string]string{

 				"until":   "",

 				"filter":  "",

@@ -58,7 +56,7 @@ func TestContainersPrune(t *testing.T) {

 			},

 		},

 		{

-			filters: filters.NewArgs(filters.Arg("dangling", "false")),

+			filters: make(Filters).Add("dangling", "false"),

 			expectedQueryParams: map[string]string{

 				"until":   "",

 				"filter":  "",

@@ -66,11 +64,10 @@ func TestContainersPrune(t *testing.T) {

 			},

 		},

 		{

-			filters: filters.NewArgs(

-				filters.Arg("dangling", "true"),

-				filters.Arg("label", "label1=foo"),

-				filters.Arg("label", "label2!=bar"),

-			),

+			filters: make(Filters).

+				Add("dangling", "true").

+				Add("label", "label1=foo").

+				Add("label", "label2!=bar"),

 			expectedQueryParams: map[string]string{

 				"until":   "",

 				"filter":  "",

new file mode 100644

@@ -0,0 +1,46 @@

+package client

+

+import (

+	"encoding/json"

+	"net/url"

+)

+

+// Filters describes a predicate for an API request.

+//

+// Each entry in the map is a filter term.

+// Each term is evaluated against the set of values.

+// A filter term is satisfied if any one of the values in the set is a match.

+// An item matches the filters when all terms are satisfied.

+//

+// Like all other map types in Go, the zero value is empty and read-only.

+type Filters map[string]map[string]bool

+

+// Add appends values to the value-set of term.

+//

+// The receiver f is returned for chaining.

+//

+//	f := make(Filters).Add("name", "foo", "bar").Add("status", "exited")

+func (f Filters) Add(term string, values ...string) Filters {

+	if _, ok := f[term]; !ok {

+		f[term] = make(map[string]bool)

+	}

+	for _, v := range values {

+		f[term][v] = true

+	}

+	return f

+}

+

+// updateURLValues sets the "filters" key in values to the marshalled value of

+// f, replacing any existing values. When f is empty, any existing "filters" key

+// is removed.

+func (f Filters) updateURLValues(values url.Values) {

+	if len(f) > 0 {

+		b, err := json.Marshal(f)

+		if err != nil {

+			panic(err) // Marshaling builtin types should never fail

+		}

+		values.Set("filters", string(b))

+	} else {

+		values.Del("filters")

+	}

+}

new file mode 100644

@@ -0,0 +1,48 @@

+package client

+

+import (

+	"net/url"

+	"testing"

+

+	"gotest.tools/v3/assert"

+	is "gotest.tools/v3/assert/cmp"

+)

+

+func TestFilters(t *testing.T) {

+	f := make(Filters).Add("foo", "bar", "baz", "bar").

+		Add("quux", "xyzzy").

+		Add("quux", "plugh")

+	f["lol"] = map[string]bool{"abc": true}

+	f.Add("lol", "def")

+	assert.Check(t, is.DeepEqual(f, Filters{

+		"foo":  {"bar": true, "baz": true},

+		"quux": {"xyzzy": true, "plugh": true},

+		"lol":  {"abc": true, "def": true},

+	}))

+}

+

+func TestFilters_UpdateURLValues(t *testing.T) {

+	v := url.Values{}

+	Filters(nil).updateURLValues(v)

+	assert.Check(t, is.DeepEqual(v, url.Values{}))

+

+	v = url.Values{"filters": []string{"bogus"}}

+	Filters(nil).updateURLValues(v)

+	assert.Check(t, is.DeepEqual(v, url.Values{}))

+

+	v = url.Values{}

+	Filters{}.updateURLValues(v)

+	assert.Check(t, is.DeepEqual(v, url.Values{}))

+

+	v = url.Values{"filters": []string{"bogus"}}

+	Filters{}.updateURLValues(v)

+	assert.Check(t, is.DeepEqual(v, url.Values{}))

+

+	v = url.Values{}

+	Filters{"foo": map[string]bool{"bar": true}}.updateURLValues(v)

+	assert.Check(t, is.DeepEqual(v, url.Values{"filters": []string{`{"foo":{"bar":true}}`}}))

+

+	v = url.Values{"filters": []string{"bogus"}}

+	Filters{"foo": map[string]bool{"bar": true}}.updateURLValues(v)

+	assert.Check(t, is.DeepEqual(v, url.Values{"filters": []string{`{"foo":{"bar":true}}`}}))

+}

@@ -5,7 +5,6 @@ import (

 	"encoding/json"

 	"net/url"

-	"github.com/moby/moby/api/types/filters"

 	"github.com/moby/moby/api/types/image"

 	"github.com/moby/moby/api/types/versions"

 )

@@ -30,13 +29,7 @@ func (cli *Client) ImageList(ctx context.Context, options ImageListOptions) ([]i

 	query := url.Values{}

-	if options.Filters.Len() > 0 {

-		filterJSON, err := filters.ToJSON(options.Filters)

-		if err != nil {

-			return images, err

-		}

-		query.Set("filters", filterJSON)

-	}

+	options.Filters.updateURLValues(query)

 	if options.All {

 		query.Set("all", "1")

 	}

@@ -1,7 +1,5 @@

 package client

-import "github.com/moby/moby/api/types/filters"

-

 // ImageListOptions holds parameters to list images with.

 type ImageListOptions struct {

 	// All controls whether all images in the graph are filtered, or just

@@ -9,7 +7,7 @@ type ImageListOptions struct {

 	All bool

 	// Filters is a JSON-encoded set of filter arguments.

-	Filters filters.Args

+	Filters Filters

 	// SharedSize indicates whether the shared size of images should be computed.

 	SharedSize bool

@@ -12,7 +12,6 @@ import (

 	"testing"

 	cerrdefs "github.com/containerd/errdefs"

-	"github.com/moby/moby/api/types/filters"

 	"github.com/moby/moby/api/types/image"

 	"gotest.tools/v3/assert"

 	is "gotest.tools/v3/assert/cmp"

@@ -55,11 +54,10 @@ func TestImageList(t *testing.T) {

 		},

 		{

 			options: ImageListOptions{

-				Filters: filters.NewArgs(

-					filters.Arg("label", "label1"),

-					filters.Arg("label", "label2"),

-					filters.Arg("dangling", "true"),

-				),

+				Filters: make(Filters).

+					Add("label", "label1").

+					Add("label", "label2").

+					Add("dangling", "true"),

 			},

 			expectedQueryParams: map[string]string{

 				"all":     "",

@@ -69,7 +67,7 @@ func TestImageList(t *testing.T) {

 		},

 		{

 			options: ImageListOptions{

-				Filters: filters.NewArgs(filters.Arg("dangling", "false")),

+				Filters: make(Filters).Add("dangling", "false"),

 			},

 			expectedQueryParams: map[string]string{

 				"all":     "",

@@ -4,17 +4,15 @@ import (

 	"context"

 	"encoding/json"

 	"fmt"

+	"net/url"

-	"github.com/moby/moby/api/types/filters"

 	"github.com/moby/moby/api/types/image"

 )

 // ImagesPrune requests the daemon to delete unused data

-func (cli *Client) ImagesPrune(ctx context.Context, pruneFilters filters.Args) (image.PruneReport, error) {

-	query, err := getFiltersQuery(pruneFilters)

-	if err != nil {

-		return image.PruneReport{}, err

-	}

+func (cli *Client) ImagesPrune(ctx context.Context, pruneFilters Filters) (image.PruneReport, error) {

+	query := url.Values{}

+	pruneFilters.updateURLValues(query)

 	resp, err := cli.post(ctx, "/images/prune", query, nil, nil)

 	defer ensureReaderClosed(resp)

@@ -11,7 +11,6 @@ import (

 	cerrdefs "github.com/containerd/errdefs"

 	"github.com/moby/moby/api/types/image"

-	"github.com/moby/moby/api/types/filters"

 	"gotest.tools/v3/assert"

 	is "gotest.tools/v3/assert/cmp"

 )

@@ -20,7 +19,7 @@ func TestImagesPruneError(t *testing.T) {

 	client, err := NewClientWithOpts(WithMockClient(errorMock(http.StatusInternalServerError, "Server error")))

 	assert.NilError(t, err)

-	_, err = client.ImagesPrune(context.Background(), filters.NewArgs())

+	_, err = client.ImagesPrune(context.Background(), nil)

 	assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal))

 }

@@ -28,11 +27,11 @@ func TestImagesPrune(t *testing.T) {

 	const expectedURL = "/images/prune"

 	listCases := []struct {

-		filters             filters.Args

+		filters             Filters

 		expectedQueryParams map[string]string

 	}{

 		{

-			filters: filters.Args{},

+			filters: Filters{},

 			expectedQueryParams: map[string]string{

 				"until":   "",

 				"filter":  "",

@@ -40,7 +39,7 @@ func TestImagesPrune(t *testing.T) {

 			},

 		},

 		{

-			filters: filters.NewArgs(filters.Arg("dangling", "true")),

+			filters: make(Filters).Add("dangling", "true"),

 			expectedQueryParams: map[string]string{

 				"until":   "",

 				"filter":  "",

@@ -48,7 +47,7 @@ func TestImagesPrune(t *testing.T) {

 			},

 		},

 		{

-			filters: filters.NewArgs(filters.Arg("dangling", "false")),

+			filters: make(Filters).Add("dangling", "false"),

 			expectedQueryParams: map[string]string{

 				"until":   "",

 				"filter":  "",

@@ -56,11 +55,9 @@ func TestImagesPrune(t *testing.T) {

 			},

 		},

 		{

-			filters: filters.NewArgs(

-				filters.Arg("dangling", "true"),

-				filters.Arg("label", "label1=foo"),

-				filters.Arg("label", "label2!=bar"),

-			),

+			filters: make(Filters).

+				Add("dangling", "true").

+				Add("label", "label1=foo", "label2!=bar"),

 			expectedQueryParams: map[string]string{

 				"until":   "",

 				"filter":  "",

@@ -8,7 +8,6 @@ import (

 	"strconv"

 	cerrdefs "github.com/containerd/errdefs"

-	"github.com/moby/moby/api/types/filters"

 	"github.com/moby/moby/api/types/registry"

 )

@@ -22,13 +21,7 @@ func (cli *Client) ImageSearch(ctx context.Context, term string, options ImageSe

 		query.Set("limit", strconv.Itoa(options.Limit))

 	}

-	if options.Filters.Len() > 0 {

-		filterJSON, err := filters.ToJSON(options.Filters)

-		if err != nil {

-			return results, err

-		}

-		query.Set("filters", filterJSON)

-	}

+	options.Filters.updateURLValues(query)

 	resp, err := cli.tryImageSearch(ctx, query, options.RegistryAuth)

 	defer ensureReaderClosed(resp)

@@ -2,8 +2,6 @@ package client

 import (

 	"context"

-

-	"github.com/moby/moby/api/types/filters"

 )

 // ImageSearchOptions holds parameters to search images with.

@@ -17,6 +15,6 @@ type ImageSearchOptions struct {

 	//

 	// For details, refer to [github.com/moby/moby/api/types/registry.RequestAuthConfig].

 	PrivilegeFunc func(context.Context) (string, error)

-	Filters       filters.Args

+	Filters       Filters

 	Limit         int

 }

@@ -11,7 +11,6 @@ import (

 	"testing"

 	cerrdefs "github.com/containerd/errdefs"

-	"github.com/moby/moby/api/types/filters"

 	"github.com/moby/moby/api/types/registry"

 	"gotest.tools/v3/assert"

 	is "gotest.tools/v3/assert/cmp"

@@ -133,10 +132,7 @@ func TestImageSearchWithoutErrors(t *testing.T) {

 	}))

 	assert.NilError(t, err)

 	results, err := client.ImageSearch(context.Background(), "some-image", ImageSearchOptions{

-		Filters: filters.NewArgs(

-			filters.Arg("is-automated", "true"),

-			filters.Arg("stars", "3"),

-		),

+		Filters: make(Filters).Add("is-automated", "true").Add("stars", "3"),

 	})

 	assert.NilError(t, err)

 	assert.Check(t, is.Len(results, 1))

@@ -5,20 +5,13 @@ import (

 	"encoding/json"

 	"net/url"

-	"github.com/moby/moby/api/types/filters"

 	"github.com/moby/moby/api/types/network"

 )

 // NetworkList returns the list of networks configured in the docker host.

 func (cli *Client) NetworkList(ctx context.Context, options NetworkListOptions) ([]network.Summary, error) {

 	query := url.Values{}

-	if options.Filters.Len() > 0 {

-		filterJSON, err := filters.ToJSON(options.Filters)

-		if err != nil {

-			return nil, err

-		}

-		query.Set("filters", filterJSON)

-	}

+	options.Filters.updateURLValues(query)

 	var networkResources []network.Summary

 	resp, err := cli.get(ctx, "/networks", query, nil)

 	defer ensureReaderClosed(resp)

@@ -1,8 +1,6 @@

 package client

-import "github.com/moby/moby/api/types/filters"

-

 // NetworkListOptions holds parameters to filter the list of networks with.

 type NetworkListOptions struct {

-	Filters filters.Args

+	Filters Filters

 }

@@ -10,7 +10,6 @@ import (

 	"testing"

 	cerrdefs "github.com/containerd/errdefs"

-	"github.com/moby/moby/api/types/filters"

 	"github.com/moby/moby/api/types/network"

 	"gotest.tools/v3/assert"

 	is "gotest.tools/v3/assert/cmp"

@@ -37,22 +36,21 @@ func TestNetworkList(t *testing.T) {

 		},

 		{

 			options: NetworkListOptions{

-				Filters: filters.NewArgs(filters.Arg("dangling", "false")),

+				Filters: make(Filters).Add("dangling", "false"),

 			},

 			expectedFilters: `{"dangling":{"false":true}}`,

 		},

 		{

 			options: NetworkListOptions{

-				Filters: filters.NewArgs(filters.Arg("dangling", "true")),

+				Filters: make(Filters).Add("dangling", "true"),

 			},

 			expectedFilters: `{"dangling":{"true":true}}`,

 		},

 		{

 			options: NetworkListOptions{

-				Filters: filters.NewArgs(

-					filters.Arg("label", "label1"),

-					filters.Arg("label", "label2"),

-				),

+				Filters: make(Filters).

+					Add("label", "label1").