Browse code

API: remove deprecated "filter" parameter for API v1.41 and up

This query-parameter was deprecated in docker 1.13 in commit
820b809e70df8b9c7af00256182c48d935972a5c, and scheduled for
removal in docker 17.12, so we should remove it for the next
API version.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2020/02/11 01:17:07
Showing 2 changed files
... ...
@@ -231,10 +231,12 @@ func (s *imageRouter) getImagesJSON(ctx context.Context, w http.ResponseWriter,
231 231
 		return err
232 232
 	}
233 233
 
234
-	filterParam := r.Form.Get("filter")
235
-	// FIXME(vdemeester) This has been deprecated in 1.13, and is target for removal for v17.12
236
-	if filterParam != "" {
237
-		imageFilters.Add("reference", filterParam)
234
+	version := httputils.VersionFromContext(ctx)
235
+	if versions.LessThan(version, "1.41") {
236
+		filterParam := r.Form.Get("filter")
237
+		if filterParam != "" {
238
+			imageFilters.Add("reference", filterParam)
239
+		}
238 240
 	}
239 241
 
240 242
 	images, err := s.backend.Images(imageFilters, httputils.BoolValue(r, "all"), false)
... ...
@@ -17,6 +17,9 @@ keywords: "API, Docker, rcli, REST, documentation"
17 17
 
18 18
 [Docker Engine API v1.41](https://docs.docker.com/engine/api/v1.41/) documentation
19 19
 
20
+* The `filter` (singular) query parameter, which was deprecated in favor of the
21
+  `filters` option in Docker 1.13, has now been removed from the `GET /images/json`
22
+  endpoint. The parameter remains available when using API version 1.40 or below.
20 23
 * `GET /services` now returns `Capabilities` as part of the `ContainerSpec`.
21 24
 * `GET /services/{id}` now returns `Capabilities` as part of the `ContainerSpec`.
22 25
 * `POST /services/create` now accepts `Capabilities` as part of the `ContainerSpec`.