Replace uses of filters.ToParam(), FromParam() with filters.ToJSON(), FromJSON()

thaJeztah · thaJeztah · commit a4efe66cf2a7 · 2017-09-26T13:59:45.000+02:00
`filters.ToParam()` and `filters.FromParam()` were deprecated in favor of `filters.ToJSON()` and `filters.FromJSON()` in 0651183, but still used in various locations. This patch replaces uses of `filters.ToParam()` and `filters.FromParam()` with `filters.ToJSON()` and `filters.FromJSON()`. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/api/server/router/container/container_routes.go b/api/server/router/container/container_routes.go
@@ -28,7 +28,7 @@ func (s *containerRouter) getContainersJSON(ctx context.Context, w http.Response
 	if err := httputils.ParseForm(r); err != nil {
 		return err
 	}
-	filter, err := filters.FromParam(r.Form.Get("filters"))
+	filter, err := filters.FromJSON(r.Form.Get("filters"))
 	if err != nil {
 		return err
 	}
@@ -588,7 +588,7 @@ func (s *containerRouter) postContainersPrune(ctx context.Context, w http.Respon
 		return err
 	}
 
-	pruneFilters, err := filters.FromParam(r.Form.Get("filters"))
+	pruneFilters, err := filters.FromJSON(r.Form.Get("filters"))
 	if err != nil {
 		return validationError{err}
 	}
diff --git a/api/server/router/image/image_routes.go b/api/server/router/image/image_routes.go
@@ -302,7 +302,7 @@ func (s *imageRouter) getImagesJSON(ctx context.Context, w http.ResponseWriter,
 		return err
 	}
 
-	imageFilters, err := filters.FromParam(r.Form.Get("filters"))
+	imageFilters, err := filters.FromJSON(r.Form.Get("filters"))
 	if err != nil {
 		return err
 	}
@@ -385,7 +385,7 @@ func (s *imageRouter) postImagesPrune(ctx context.Context, w http.ResponseWriter
 		return err
 	}
 
-	pruneFilters, err := filters.FromParam(r.Form.Get("filters"))
+	pruneFilters, err := filters.FromJSON(r.Form.Get("filters"))
 	if err != nil {
 		return err
 	}
diff --git a/api/server/router/network/network_routes.go b/api/server/router/network/network_routes.go
@@ -37,7 +37,7 @@ func (n *networkRouter) getNetworksList(ctx context.Context, w http.ResponseWrit
 	}
 
 	filter := r.Form.Get("filters")
-	netFilters, err := filters.FromParam(filter)
+	netFilters, err := filters.FromJSON(filter)
 	if err != nil {
 		return err
 	}
@@ -489,7 +489,7 @@ func (n *networkRouter) postNetworksPrune(ctx context.Context, w http.ResponseWr
 		return err
 	}
 
-	pruneFilters, err := filters.FromParam(r.Form.Get("filters"))
+	pruneFilters, err := filters.FromJSON(r.Form.Get("filters"))
 	if err != nil {
 		return err
 	}
diff --git a/api/server/router/plugin/plugin_routes.go b/api/server/router/plugin/plugin_routes.go
@@ -290,7 +290,7 @@ func (pr *pluginRouter) listPlugins(ctx context.Context, w http.ResponseWriter,
 		return err
 	}
 
-	pluginFilters, err := filters.FromParam(r.Form.Get("filters"))
+	pluginFilters, err := filters.FromJSON(r.Form.Get("filters"))
 	if err != nil {
 		return err
 	}
diff --git a/api/server/router/swarm/cluster_routes.go b/api/server/router/swarm/cluster_routes.go
@@ -151,7 +151,7 @@ func (sr *swarmRouter) getServices(ctx context.Context, w http.ResponseWriter, r
 	if err := httputils.ParseForm(r); err != nil {
 		return err
 	}
-	filter, err := filters.FromParam(r.Form.Get("filters"))
+	filter, err := filters.FromJSON(r.Form.Get("filters"))
 	if err != nil {
 		return invalidRequestError{err}
 	}
@@ -277,7 +277,7 @@ func (sr *swarmRouter) getNodes(ctx context.Context, w http.ResponseWriter, r *h
 	if err := httputils.ParseForm(r); err != nil {
 		return err
 	}
-	filter, err := filters.FromParam(r.Form.Get("filters"))
+	filter, err := filters.FromJSON(r.Form.Get("filters"))
 	if err != nil {
 		return err
 	}
@@ -339,7 +339,7 @@ func (sr *swarmRouter) getTasks(ctx context.Context, w http.ResponseWriter, r *h
 	if err := httputils.ParseForm(r); err != nil {
 		return err
 	}
-	filter, err := filters.FromParam(r.Form.Get("filters"))
+	filter, err := filters.FromJSON(r.Form.Get("filters"))
 	if err != nil {
 		return err
 	}
@@ -367,7 +367,7 @@ func (sr *swarmRouter) getSecrets(ctx context.Context, w http.ResponseWriter, r
 	if err := httputils.ParseForm(r); err != nil {
 		return err
 	}
-	filters, err := filters.FromParam(r.Form.Get("filters"))
+	filters, err := filters.FromJSON(r.Form.Get("filters"))
 	if err != nil {
 		return err
 	}
@@ -434,7 +434,7 @@ func (sr *swarmRouter) getConfigs(ctx context.Context, w http.ResponseWriter, r
 	if err := httputils.ParseForm(r); err != nil {
 		return err
 	}
-	filters, err := filters.FromParam(r.Form.Get("filters"))
+	filters, err := filters.FromJSON(r.Form.Get("filters"))
 	if err != nil {
 		return err
 	}
diff --git a/api/server/router/system/system_routes.go b/api/server/router/system/system_routes.go
@@ -127,7 +127,7 @@ func (s *systemRouter) getEvents(ctx context.Context, w http.ResponseWriter, r *
 		}
 	}
 
-	ef, err := filters.FromParam(r.Form.Get("filters"))
+	ef, err := filters.FromJSON(r.Form.Get("filters"))
 	if err != nil {
 		return err
 	}
diff --git a/api/server/router/volume/volume_routes.go b/api/server/router/volume/volume_routes.go
@@ -72,7 +72,7 @@ func (v *volumeRouter) postVolumesPrune(ctx context.Context, w http.ResponseWrit
 		return err
 	}
 
-	pruneFilters, err := filters.FromParam(r.Form.Get("filters"))
+	pruneFilters, err := filters.FromJSON(r.Form.Get("filters"))
 	if err != nil {
 		return err
 	}
diff --git a/api/types/filters/parse_test.go b/api/types/filters/parse_test.go
@@ -42,14 +42,14 @@ func TestParseArgsEdgeCase(t *testing.T) {
 	}
 }
 
-func TestToParam(t *testing.T) {
+func TestToJSON(t *testing.T) {
 	fields := map[string]map[string]bool{
 		"created":    {"today": true},
 		"image.name": {"ubuntu*": true, "*untu": true},
 	}
 	a := Args{fields: fields}
 
-	_, err := ToParam(a)
+	_, err := ToJSON(a)
 	if err != nil {
 		t.Errorf("failed to marshal the filters: %s", err)
 	}
@@ -80,7 +80,7 @@ func TestToParamWithVersion(t *testing.T) {
 	}
 }
 
-func TestFromParam(t *testing.T) {
+func TestFromJSON(t *testing.T) {
 	invalids := []string{
 		"anything",
 		"['a','list']",
@@ -103,14 +103,14 @@ func TestFromParam(t *testing.T) {
 	}
 
 	for _, invalid := range invalids {
-		if _, err := FromParam(invalid); err == nil {
+		if _, err := FromJSON(invalid); err == nil {
 			t.Fatalf("Expected an error with %v, got nothing", invalid)
 		}
 	}
 
 	for expectedArgs, matchers := range valid {
 		for _, json := range matchers {
-			args, err := FromParam(json)
+			args, err := FromJSON(json)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -136,11 +136,11 @@ func TestFromParam(t *testing.T) {
 
 func TestEmpty(t *testing.T) {
 	a := Args{}
-	v, err := ToParam(a)
+	v, err := ToJSON(a)
 	if err != nil {
 		t.Errorf("failed to marshal the filters: %s", err)
 	}
-	v1, err := FromParam(v)
+	v1, err := FromJSON(v)
 	if err != nil {
 		t.Errorf("%s", err)
 	}
diff --git a/client/config_list.go b/client/config_list.go
@@ -18,7 +18,7 @@ func (cli *Client) ConfigList(ctx context.Context, options types.ConfigListOptio
 	query := url.Values{}
 
 	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParam(options.Filters)
+		filterJSON, err := filters.ToJSON(options.Filters)
 		if err != nil {
 			return nil, err
 		}
diff --git a/client/image_search.go b/client/image_search.go
@@ -21,7 +21,7 @@ func (cli *Client) ImageSearch(ctx context.Context, term string, options types.I
 	query.Set("limit", fmt.Sprintf("%d", options.Limit))
 
 	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParam(options.Filters)
+		filterJSON, err := filters.ToJSON(options.Filters)
 		if err != nil {
 			return results, err
 		}
diff --git a/client/node_list.go b/client/node_list.go
@@ -15,7 +15,7 @@ func (cli *Client) NodeList(ctx context.Context, options types.NodeListOptions)
 	query := url.Values{}
 
 	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParam(options.Filters)
+		filterJSON, err := filters.ToJSON(options.Filters)
 
 		if err != nil {
 			return nil, err
diff --git a/client/secret_list.go b/client/secret_list.go
@@ -18,7 +18,7 @@ func (cli *Client) SecretList(ctx context.Context, options types.SecretListOptio
 	query := url.Values{}
 
 	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParam(options.Filters)
+		filterJSON, err := filters.ToJSON(options.Filters)
 		if err != nil {
 			return nil, err
 		}
diff --git a/client/service_list.go b/client/service_list.go
@@ -15,7 +15,7 @@ func (cli *Client) ServiceList(ctx context.Context, options types.ServiceListOpt
 	query := url.Values{}
 
 	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParam(options.Filters)
+		filterJSON, err := filters.ToJSON(options.Filters)
 		if err != nil {
 			return nil, err
 		}
diff --git a/client/task_list.go b/client/task_list.go
@@ -15,7 +15,7 @@ func (cli *Client) TaskList(ctx context.Context, options types.TaskListOptions)
 	query := url.Values{}
 
 	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParam(options.Filters)
+		filterJSON, err := filters.ToJSON(options.Filters)
 		if err != nil {
 			return nil, err
 		}
diff --git a/client/utils.go b/client/utils.go
@@ -24,7 +24,7 @@ func getDockerOS(serverHeader string) string {
 func getFiltersQuery(f filters.Args) (url.Values, error) {
 	query := url.Values{}
 	if f.Len() > 0 {
-		filterJSON, err := filters.ToParam(f)
+		filterJSON, err := filters.ToJSON(f)
 		if err != nil {
 			return query, err
 		}
diff --git a/daemon/cluster/tasks.go b/daemon/cluster/tasks.go
@@ -15,7 +15,7 @@ func (c *Cluster) GetTasks(options apitypes.TaskListOptions) ([]types.Task, erro
 
 	if err := c.lockedManagerAction(func(ctx context.Context, state nodeState) error {
 		filterTransform := func(filter filters.Args) error {
-			if filter.Include("service") {
+			if filter.Contains("service") {
 				serviceFilters := filter.Get("service")
 				for _, serviceFilter := range serviceFilters {
 					service, err := getService(ctx, state.controlClient, serviceFilter, false)
@@ -26,7 +26,7 @@ func (c *Cluster) GetTasks(options apitypes.TaskListOptions) ([]types.Task, erro
 					filter.Add("service", service.ID)
 				}
 			}
-			if filter.Include("node") {
+			if filter.Contains("node") {
 				nodeFilters := filter.Get("node")
 				for _, nodeFilter := range nodeFilters {
 					node, err := getNode(ctx, state.controlClient, nodeFilter)
@@ -37,7 +37,7 @@ func (c *Cluster) GetTasks(options apitypes.TaskListOptions) ([]types.Task, erro
 					filter.Add("node", node.ID)
 				}
 			}
-			if !filter.Include("runtime") {
+			if !filter.Contains("runtime") {
 				// default to only showing container tasks
 				filter.Add("runtime", "container")
 				filter.Add("runtime", "")
diff --git a/daemon/list.go b/daemon/list.go
@@ -585,7 +585,7 @@ func (daemon *Daemon) Volumes(filter string) ([]*types.Volume, []string, error)
 	var (
 		volumesOut []*types.Volume
 	)
-	volFilters, err := filters.FromParam(filter)
+	volFilters, err := filters.FromJSON(filter)
 	if err != nil {
 		return nil, nil, err
 	}
diff --git a/daemon/search.go b/daemon/search.go
@@ -23,7 +23,7 @@ func (daemon *Daemon) SearchRegistryForImages(ctx context.Context, filtersArgs s
 	authConfig *types.AuthConfig,
 	headers map[string][]string) (*registrytypes.SearchResults, error) {
 
-	searchFilters, err := filters.FromParam(filtersArgs)
+	searchFilters, err := filters.FromJSON(filtersArgs)
 	if err != nil {
 		return nil, err
 	}
diff --git a/integration-cli/docker_api_network_test.go b/integration-cli/docker_api_network_test.go
@@ -282,7 +282,7 @@ func getNetworkIDByName(c *check.C, name string) string {
 		filterArgs = filters.NewArgs()
 	)
 	filterArgs.Add("name", name)
-	filterJSON, err := filters.ToParam(filterArgs)
+	filterJSON, err := filters.ToJSON(filterArgs)
 	c.Assert(err, checker.IsNil)
 	v.Set("filters", filterJSON)
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func (s *containerRouter) getContainersJSON(ctx context.Context, w http.Response`
`28`	`28`	`if err := httputils.ParseForm(r); err != nil {`
`29`	`29`	`return err`
`30`	`30`	`}`
`31`		`- filter, err := filters.FromParam(r.Form.Get("filters"))`
	`31`	`+ filter, err := filters.FromJSON(r.Form.Get("filters"))`
`32`	`32`	`if err != nil {`
`33`	`33`	`return err`
`34`	`34`	`}`
`@@ -588,7 +588,7 @@ func (s *containerRouter) postContainersPrune(ctx context.Context, w http.Respon`
`588`	`588`	`return err`
`589`	`589`	`}`
`590`	`590`
`591`		`- pruneFilters, err := filters.FromParam(r.Form.Get("filters"))`
	`591`	`+ pruneFilters, err := filters.FromJSON(r.Form.Get("filters"))`
`592`	`592`	`if err != nil {`
`593`	`593`	`return validationError{err}`
`594`	`594`	`}`
Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ func (s *imageRouter) getImagesJSON(ctx context.Context, w http.ResponseWriter,`
`302`	`302`	`return err`
`303`	`303`	`}`
`304`	`304`
`305`		`- imageFilters, err := filters.FromParam(r.Form.Get("filters"))`
	`305`	`+ imageFilters, err := filters.FromJSON(r.Form.Get("filters"))`
`306`	`306`	`if err != nil {`
`307`	`307`	`return err`
`308`	`308`	`}`
`@@ -385,7 +385,7 @@ func (s *imageRouter) postImagesPrune(ctx context.Context, w http.ResponseWriter`
`385`	`385`	`return err`
`386`	`386`	`}`
`387`	`387`
`388`		`- pruneFilters, err := filters.FromParam(r.Form.Get("filters"))`
	`388`	`+ pruneFilters, err := filters.FromJSON(r.Form.Get("filters"))`
`389`	`389`	`if err != nil {`
`390`	`390`	`return err`
`391`	`391`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func (n *networkRouter) getNetworksList(ctx context.Context, w http.ResponseWrit`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`filter := r.Form.Get("filters")`
`40`		`- netFilters, err := filters.FromParam(filter)`
	`40`	`+ netFilters, err := filters.FromJSON(filter)`
`41`	`41`	`if err != nil {`
`42`	`42`	`return err`
`43`	`43`	`}`
`@@ -489,7 +489,7 @@ func (n *networkRouter) postNetworksPrune(ctx context.Context, w http.ResponseWr`
`489`	`489`	`return err`
`490`	`490`	`}`
`491`	`491`
`492`		`- pruneFilters, err := filters.FromParam(r.Form.Get("filters"))`
	`492`	`+ pruneFilters, err := filters.FromJSON(r.Form.Get("filters"))`
`493`	`493`	`if err != nil {`
`494`	`494`	`return err`
`495`	`495`	`}`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ func (pr *pluginRouter) listPlugins(ctx context.Context, w http.ResponseWriter,`
`290`	`290`	`return err`
`291`	`291`	`}`
`292`	`292`
`293`		`- pluginFilters, err := filters.FromParam(r.Form.Get("filters"))`
	`293`	`+ pluginFilters, err := filters.FromJSON(r.Form.Get("filters"))`
`294`	`294`	`if err != nil {`
`295`	`295`	`return err`
`296`	`296`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ func (sr *swarmRouter) getServices(ctx context.Context, w http.ResponseWriter, r`
`151`	`151`	`if err := httputils.ParseForm(r); err != nil {`
`152`	`152`	`return err`
`153`	`153`	`}`
`154`		`- filter, err := filters.FromParam(r.Form.Get("filters"))`
	`154`	`+ filter, err := filters.FromJSON(r.Form.Get("filters"))`
`155`	`155`	`if err != nil {`
`156`	`156`	`return invalidRequestError{err}`
`157`	`157`	`}`
`@@ -277,7 +277,7 @@ func (sr swarmRouter) getNodes(ctx context.Context, w http.ResponseWriter, r h`
`277`	`277`	`if err := httputils.ParseForm(r); err != nil {`
`278`	`278`	`return err`
`279`	`279`	`}`
`280`		`- filter, err := filters.FromParam(r.Form.Get("filters"))`
	`280`	`+ filter, err := filters.FromJSON(r.Form.Get("filters"))`
`281`	`281`	`if err != nil {`
`282`	`282`	`return err`
`283`	`283`	`}`
`@@ -339,7 +339,7 @@ func (sr swarmRouter) getTasks(ctx context.Context, w http.ResponseWriter, r h`
`339`	`339`	`if err := httputils.ParseForm(r); err != nil {`
`340`	`340`	`return err`
`341`	`341`	`}`
`342`		`- filter, err := filters.FromParam(r.Form.Get("filters"))`
	`342`	`+ filter, err := filters.FromJSON(r.Form.Get("filters"))`
`343`	`343`	`if err != nil {`
`344`	`344`	`return err`
`345`	`345`	`}`
`@@ -367,7 +367,7 @@ func (sr *swarmRouter) getSecrets(ctx context.Context, w http.ResponseWriter, r`
`367`	`367`	`if err := httputils.ParseForm(r); err != nil {`
`368`	`368`	`return err`
`369`	`369`	`}`
`370`		`- filters, err := filters.FromParam(r.Form.Get("filters"))`
	`370`	`+ filters, err := filters.FromJSON(r.Form.Get("filters"))`
`371`	`371`	`if err != nil {`
`372`	`372`	`return err`
`373`	`373`	`}`
`@@ -434,7 +434,7 @@ func (sr *swarmRouter) getConfigs(ctx context.Context, w http.ResponseWriter, r`
`434`	`434`	`if err := httputils.ParseForm(r); err != nil {`
`435`	`435`	`return err`
`436`	`436`	`}`
`437`		`- filters, err := filters.FromParam(r.Form.Get("filters"))`
	`437`	`+ filters, err := filters.FromJSON(r.Form.Get("filters"))`
`438`	`438`	`if err != nil {`
`439`	`439`	`return err`
`440`	`440`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ func (s systemRouter) getEvents(ctx context.Context, w http.ResponseWriter, r `
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`
`130`		`- ef, err := filters.FromParam(r.Form.Get("filters"))`
	`130`	`+ ef, err := filters.FromJSON(r.Form.Get("filters"))`
`131`	`131`	`if err != nil {`
`132`	`132`	`return err`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ func (v *volumeRouter) postVolumesPrune(ctx context.Context, w http.ResponseWrit`
`72`	`72`	`return err`
`73`	`73`	`}`
`74`	`74`
`75`		`- pruneFilters, err := filters.FromParam(r.Form.Get("filters"))`
	`75`	`+ pruneFilters, err := filters.FromJSON(r.Form.Get("filters"))`
`76`	`76`	`if err != nil {`
`77`	`77`	`return err`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,14 +42,14 @@ func TestParseArgsEdgeCase(t *testing.T) {`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`-func TestToParam(t *testing.T) {`
	`45`	`+func TestToJSON(t *testing.T) {`
`46`	`46`	`fields := map[string]map[string]bool{`
`47`	`47`	`"created": {"today": true},`
`48`	`48`	`"image.name": {"ubuntu": true, "untu": true},`
`49`	`49`	`}`
`50`	`50`	`a := Args{fields: fields}`
`51`	`51`
`52`		`- _, err := ToParam(a)`
	`52`	`+ _, err := ToJSON(a)`
`53`	`53`	`if err != nil {`
`54`	`54`	`t.Errorf("failed to marshal the filters: %s", err)`
`55`	`55`	`}`
`@@ -80,7 +80,7 @@ func TestToParamWithVersion(t *testing.T) {`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
`83`		`-func TestFromParam(t *testing.T) {`
	`83`	`+func TestFromJSON(t *testing.T) {`
`84`	`84`	`invalids := []string{`
`85`	`85`	`"anything",`
`86`	`86`	`"['a','list']",`
`@@ -103,14 +103,14 @@ func TestFromParam(t *testing.T) {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`for _, invalid := range invalids {`
`106`		`- if _, err := FromParam(invalid); err == nil {`
	`106`	`+ if _, err := FromJSON(invalid); err == nil {`
`107`	`107`	`t.Fatalf("Expected an error with %v, got nothing", invalid)`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`for expectedArgs, matchers := range valid {`
`112`	`112`	`for _, json := range matchers {`
`113`		`- args, err := FromParam(json)`
	`113`	`+ args, err := FromJSON(json)`
`114`	`114`	`if err != nil {`
`115`	`115`	`t.Fatal(err)`
`116`	`116`	`}`
`@@ -136,11 +136,11 @@ func TestFromParam(t *testing.T) {`
`136`	`136`
`137`	`137`	`func TestEmpty(t *testing.T) {`
`138`	`138`	`a := Args{}`
`139`		`- v, err := ToParam(a)`
	`139`	`+ v, err := ToJSON(a)`
`140`	`140`	`if err != nil {`
`141`	`141`	`t.Errorf("failed to marshal the filters: %s", err)`
`142`	`142`	`}`
`143`		`- v1, err := FromParam(v)`
	`143`	`+ v1, err := FromJSON(v)`
`144`	`144`	`if err != nil {`
`145`	`145`	`t.Errorf("%s", err)`
`146`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ func (cli *Client) ConfigList(ctx context.Context, options types.ConfigListOptio`
`18`	`18`	`query := url.Values{}`
`19`	`19`
`20`	`20`	`if options.Filters.Len() > 0 {`
`21`		`- filterJSON, err := filters.ToParam(options.Filters)`
	`21`	`+ filterJSON, err := filters.ToJSON(options.Filters)`
`22`	`22`	`if err != nil {`
`23`	`23`	`return nil, err`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ func (cli *Client) ImageSearch(ctx context.Context, term string, options types.I`
`21`	`21`	`query.Set("limit", fmt.Sprintf("%d", options.Limit))`
`22`	`22`
`23`	`23`	`if options.Filters.Len() > 0 {`
`24`		`- filterJSON, err := filters.ToParam(options.Filters)`
	`24`	`+ filterJSON, err := filters.ToJSON(options.Filters)`
`25`	`25`	`if err != nil {`
`26`	`26`	`return results, err`
`27`	`27`	`}`