1. docker
  2. Commit 5f47cef514acba3d0fa0856064057d4c7f218c31
Browse code

fix nolint comments for SA1019: filters.ToParamWithVersion is deprecated

The old nolint comment didn't seem to work anymore;

```
client/container_list.go:39:22: SA1019: filters.ToParamWithVersion is deprecated: do not use in any new code; use ToJSON instead (staticcheck)
client/events.go:94:22: SA1019: filters.ToParamWithVersion is deprecated: do not use in any new code; use ToJSON instead (staticcheck)
client/image_list.go:28:22: SA1019: filters.ToParamWithVersion is deprecated: do not use in any new code; use ToJSON instead (staticcheck)
```

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

Sebastiaan van Stijn authored on 2019/10/12 23:52:08
Showing 7 changed files
client/container_list.go
History View file @ 5f47cef
... ... 
@@ -35,7 +35,7 @@ func (cli *Client) ContainerList(ctx context.Context, options types.ContainerLis
35 35 
 	}
36 36
37 37 
 	if options.Filters.Len() > 0 {
38 
-		//lint:ignore SA1019 for old code
38 
+		//nolint:staticcheck // ignore SA1019 for old code
39 39 
 		filterJSON, err := filters.ToParamWithVersion(cli.version, options.Filters)
40 40
41 41 
 		if err != nil {
client/events.go
History View file @ 5f47cef
... ... 
@@ -90,7 +90,7 @@ func buildEventsQueryParams(cliVersion string, options types.EventsOptions) (url
90 90 
 	}
91 91
92 92 
 	if options.Filters.Len() > 0 {
93 
-		//lint:ignore SA1019 for old code
93 
+		//nolint:staticcheck // ignore SA1019 for old code
94 94 
 		filterJSON, err := filters.ToParamWithVersion(cliVersion, options.Filters)
95 95 
 		if err != nil {
96 96 
 			return nil, err
client/hijack.go
History View file @ 5f47cef
... ... 
@@ -88,7 +88,7 @@ func (cli *Client) setupHijackConn(ctx context.Context, req *http.Request, proto
88 88 
 	// Server hijacks the connection, error 'connection closed' expected
89 89 
 	resp, err := clientconn.Do(req)
90 90
91 
-	//lint:ignore SA1019 for connecting to old (pre go1.8) daemons
91 
+	//nolint:staticcheck // ignore SA1019 for connecting to old (pre go1.8) daemons
92 92 
 	if err != httputil.ErrPersistEOF {
93 93 
 		if err != nil {
94 94 
 			return nil, err
client/image_list.go
History View file @ 5f47cef
... ... 
@@ -24,7 +24,7 @@ func (cli *Client) ImageList(ctx context.Context, options types.ImageListOptions
24 24 
 		}
25 25 
 	}
26 26 
 	if optionFilters.Len() > 0 {
27 
-		//lint:ignore SA1019 for old code
27 
+		//nolint:staticcheck // ignore SA1019 for old code
28 28 
 		filterJSON, err := filters.ToParamWithVersion(cli.version, optionFilters)
29 29 
 		if err != nil {
30 30 
 			return images, err
client/network_list.go
History View file @ 5f47cef
... ... 
@@ -13,7 +13,7 @@ import (
13 13 
 func (cli *Client) NetworkList(ctx context.Context, options types.NetworkListOptions) ([]types.NetworkResource, error) {
14 14 
 	query := url.Values{}
15 15 
 	if options.Filters.Len() > 0 {
16 
-		//lint:ignore SA1019 for old code
16 
+		//nolint:staticcheck // ignore SA1019 for old code
17 17 
 		filterJSON, err := filters.ToParamWithVersion(cli.version, options.Filters)
18 18 
 		if err != nil {
19 19 
 			return nil, err
client/plugin_list.go
History View file @ 5f47cef
... ... 
@@ -15,7 +15,7 @@ func (cli *Client) PluginList(ctx context.Context, filter filters.Args) (types.P
15 15 
 	query := url.Values{}
16 16
17 17 
 	if filter.Len() > 0 {
18 
-		//lint:ignore SA1019 for old code
18 
+		//nolint:staticcheck // ignore SA1019 for old code
19 19 
 		filterJSON, err := filters.ToParamWithVersion(cli.version, filter)
20 20 
 		if err != nil {
21 21 
 			return plugins, err
client/volume_list.go
History View file @ 5f47cef
... ... 
@@ -15,7 +15,7 @@ func (cli *Client) VolumeList(ctx context.Context, filter filters.Args) (volumet
15 15 
 	query := url.Values{}
16 16
17 17 
 	if filter.Len() > 0 {
18 
-		//lint:ignore SA1019 for old code
18 
+		//nolint:staticcheck // ignore SA1019 for old code
19 19 
 		filterJSON, err := filters.ToParamWithVersion(cli.version, filter)
20 20 
 		if err != nil {
21 21 
 			return volumes, err