1. docker
  2. Commit a4efe66cf2a7648dbcf5b9993bf351925b905b5b
Browse code

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

`filters.ToParam()` and `filters.FromParam()` were deprecated in favor of
`filters.ToJSON()` and `filters.FromJSON()` in 065118390a3ecaf0dbd2fa752d54d43f8f1e8ec6,
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>

Sebastiaan van Stijn authored on 2017/09/26 20:59:45
Showing 19 changed files
api/server/router/container/container_routes.go
History View file @ a4efe66
... ... 
@@ -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 
 	}
api/server/router/image/image_routes.go
History View file @ a4efe66
... ... 
@@ -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 
 	}
api/server/router/network/network_routes.go
History View file @ a4efe66
... ... 
@@ -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 
 	}
api/server/router/plugin/plugin_routes.go
History View file @ a4efe66
... ... 
@@ -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 
 	}
api/server/router/swarm/cluster_routes.go
History View file @ a4efe66
... ... 
@@ -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 
 	}
api/server/router/system/system_routes.go
History View file @ a4efe66
... ... 
@@ -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 
 	}
api/server/router/volume/volume_routes.go
History View file @ a4efe66
... ... 
@@ -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 
 	}
api/types/filters/parse_test.go
History View file @ a4efe66
... ... 
@@ -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 
 	}
client/config_list.go
History View file @ a4efe66
... ... 
@@ -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 
 		}
client/image_search.go
History View file @ a4efe66
... ... 
@@ -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 
 		}
client/node_list.go
History View file @ a4efe66
... ... 
@@ -15,7 +15,7 @@ func (cli *Client) NodeList(ctx context.Context, options types.NodeListOptions)
15 15 
 	query := url.Values{}
16 16
17 17 
 	if options.Filters.Len() > 0 {
18 
-		filterJSON, err := filters.ToParam(options.Filters)
18 
+		filterJSON, err := filters.ToJSON(options.Filters)
19 19
20 20 
 		if err != nil {
21 21 
 			return nil, err
client/secret_list.go
History View file @ a4efe66
... ... 
@@ -18,7 +18,7 @@ func (cli *Client) SecretList(ctx context.Context, options types.SecretListOptio
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 
 		}
client/service_list.go
History View file @ a4efe66
... ... 
@@ -15,7 +15,7 @@ func (cli *Client) ServiceList(ctx context.Context, options types.ServiceListOpt
15 15 
 	query := url.Values{}
16 16
17 17 
 	if options.Filters.Len() > 0 {
18 
-		filterJSON, err := filters.ToParam(options.Filters)
18 
+		filterJSON, err := filters.ToJSON(options.Filters)
19 19 
 		if err != nil {
20 20 
 			return nil, err
21 21 
 		}
client/task_list.go
History View file @ a4efe66
... ... 
@@ -15,7 +15,7 @@ func (cli *Client) TaskList(ctx context.Context, options types.TaskListOptions)
15 15 
 	query := url.Values{}
16 16
17 17 
 	if options.Filters.Len() > 0 {
18 
-		filterJSON, err := filters.ToParam(options.Filters)
18 
+		filterJSON, err := filters.ToJSON(options.Filters)
19 19 
 		if err != nil {
20 20 
 			return nil, err
21 21 
 		}
client/utils.go
History View file @ a4efe66
... ... 
@@ -24,7 +24,7 @@ func getDockerOS(serverHeader string) string {
24 24 
 func getFiltersQuery(f filters.Args) (url.Values, error) {
25 25 
 	query := url.Values{}
26 26 
 	if f.Len() > 0 {
27 
-		filterJSON, err := filters.ToParam(f)
27 
+		filterJSON, err := filters.ToJSON(f)
28 28 
 		if err != nil {
29 29 
 			return query, err
30 30 
 		}
daemon/cluster/tasks.go
History View file @ a4efe66
... ... 
@@ -15,7 +15,7 @@ func (c *Cluster) GetTasks(options apitypes.TaskListOptions) ([]types.Task, erro
15 15
16 16 
 	if err := c.lockedManagerAction(func(ctx context.Context, state nodeState) error {
17 17 
 		filterTransform := func(filter filters.Args) error {
18 
-			if filter.Include("service") {
18 
+			if filter.Contains("service") {
19 19 
 				serviceFilters := filter.Get("service")
20 20 
 				for _, serviceFilter := range serviceFilters {
21 21 
 					service, err := getService(ctx, state.controlClient, serviceFilter, false)
... ... 
@@ -26,7 +26,7 @@ func (c *Cluster) GetTasks(options apitypes.TaskListOptions) ([]types.Task, erro
26 26 
 					filter.Add("service", service.ID)
27 27 
 				}
28 28 
 			}
29 
-			if filter.Include("node") {
29 
+			if filter.Contains("node") {
30 30 
 				nodeFilters := filter.Get("node")
31 31 
 				for _, nodeFilter := range nodeFilters {
32 32 
 					node, err := getNode(ctx, state.controlClient, nodeFilter)
... ... 
@@ -37,7 +37,7 @@ func (c *Cluster) GetTasks(options apitypes.TaskListOptions) ([]types.Task, erro
37 37 
 					filter.Add("node", node.ID)
38 38 
 				}
39 39 
 			}
40 
-			if !filter.Include("runtime") {
40 
+			if !filter.Contains("runtime") {
41 41 
 				// default to only showing container tasks
42 42 
 				filter.Add("runtime", "container")
43 43 
 				filter.Add("runtime", "")
daemon/list.go
History View file @ a4efe66
... ... 
@@ -585,7 +585,7 @@ func (daemon *Daemon) Volumes(filter string) ([]*types.Volume, []string, error)
585 585 
 	var (
586 586 
 		volumesOut []*types.Volume
587 587 
 	)
588 
-	volFilters, err := filters.FromParam(filter)
588 
+	volFilters, err := filters.FromJSON(filter)
589 589 
 	if err != nil {
590 590 
 		return nil, nil, err
591 591 
 	}
daemon/search.go
History View file @ a4efe66
... ... 
@@ -23,7 +23,7 @@ func (daemon *Daemon) SearchRegistryForImages(ctx context.Context, filtersArgs s
23 23 
 	authConfig *types.AuthConfig,
24 24 
 	headers map[string][]string) (*registrytypes.SearchResults, error) {
25 25
26 
-	searchFilters, err := filters.FromParam(filtersArgs)
26 
+	searchFilters, err := filters.FromJSON(filtersArgs)
27 27 
 	if err != nil {
28 28 
 		return nil, err
29 29 
 	}
integration-cli/docker_api_network_test.go
History View file @ a4efe66
... ... 
@@ -282,7 +282,7 @@ func getNetworkIDByName(c *check.C, name string) string {
282 282 
 		filterArgs = filters.NewArgs()
283 283 
 	)
284 284 
 	filterArgs.Add("name", name)
285 
-	filterJSON, err := filters.ToParam(filterArgs)
285 
+	filterJSON, err := filters.ToJSON(filterArgs)
286 286 
 	c.Assert(err, checker.IsNil)
287 287 
 	v.Set("filters", filterJSON)
288 288