summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorSebastiaan van Stijn <github@gone.nl>2019-10-12 16:52:08 +0200
committerSebastiaan van Stijn <github@gone.nl>2019-10-18 00:45:33 +0200
commit5f47cef514acba3d0fa0856064057d4c7f218c31 (patch)
tree3c9c3159041bf36fb1e433888cef59ed68ee2358 /client
parentec1fd4b1b0401fad3d03654c16057712aff34e29 (diff)
downloaddocker-5f47cef514acba3d0fa0856064057d4c7f218c31.tar.gz
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>
Diffstat (limited to 'client')
-rw-r--r--client/container_list.go2
-rw-r--r--client/events.go2
-rw-r--r--client/hijack.go2
-rw-r--r--client/image_list.go2
-rw-r--r--client/network_list.go2
-rw-r--r--client/plugin_list.go2
-rw-r--r--client/volume_list.go2
7 files changed, 7 insertions, 7 deletions
diff --git a/client/container_list.go b/client/container_list.go
index c099d80e2a..a973de597f 100644
--- a/client/container_list.go
+++ b/client/container_list.go
@@ -35,7 +35,7 @@ func (cli *Client) ContainerList(ctx context.Context, options types.ContainerLis
}
if options.Filters.Len() > 0 {
- //lint:ignore SA1019 for old code
+ //nolint:staticcheck // ignore SA1019 for old code
filterJSON, err := filters.ToParamWithVersion(cli.version, options.Filters)
if err != nil {
diff --git a/client/events.go b/client/events.go
index f347cadf14..f0dc9d9e12 100644
--- a/client/events.go
+++ b/client/events.go
@@ -90,7 +90,7 @@ func buildEventsQueryParams(cliVersion string, options types.EventsOptions) (url
}
if options.Filters.Len() > 0 {
- //lint:ignore SA1019 for old code
+ //nolint:staticcheck // ignore SA1019 for old code
filterJSON, err := filters.ToParamWithVersion(cliVersion, options.Filters)
if err != nil {
return nil, err
diff --git a/client/hijack.go b/client/hijack.go
index 6f8205501f..e1dc49ef0f 100644
--- a/client/hijack.go
+++ b/client/hijack.go
@@ -88,7 +88,7 @@ func (cli *Client) setupHijackConn(ctx context.Context, req *http.Request, proto
// Server hijacks the connection, error 'connection closed' expected
resp, err := clientconn.Do(req)
- //lint:ignore SA1019 for connecting to old (pre go1.8) daemons
+ //nolint:staticcheck // ignore SA1019 for connecting to old (pre go1.8) daemons
if err != httputil.ErrPersistEOF {
if err != nil {
return nil, err
diff --git a/client/image_list.go b/client/image_list.go
index a5bc4b095f..a4d7505094 100644
--- a/client/image_list.go
+++ b/client/image_list.go
@@ -24,7 +24,7 @@ func (cli *Client) ImageList(ctx context.Context, options types.ImageListOptions
}
}
if optionFilters.Len() > 0 {
- //lint:ignore SA1019 for old code
+ //nolint:staticcheck // ignore SA1019 for old code
filterJSON, err := filters.ToParamWithVersion(cli.version, optionFilters)
if err != nil {
return images, err
diff --git a/client/network_list.go b/client/network_list.go
index 8ca7eb6128..ed2acb5571 100644
--- a/client/network_list.go
+++ b/client/network_list.go
@@ -13,7 +13,7 @@ import (
func (cli *Client) NetworkList(ctx context.Context, options types.NetworkListOptions) ([]types.NetworkResource, error) {
query := url.Values{}
if options.Filters.Len() > 0 {
- //lint:ignore SA1019 for old code
+ //nolint:staticcheck // ignore SA1019 for old code
filterJSON, err := filters.ToParamWithVersion(cli.version, options.Filters)
if err != nil {
return nil, err
diff --git a/client/plugin_list.go b/client/plugin_list.go
index a51c930e6d..cf1935e2f5 100644
--- a/client/plugin_list.go
+++ b/client/plugin_list.go
@@ -15,7 +15,7 @@ func (cli *Client) PluginList(ctx context.Context, filter filters.Args) (types.P
query := url.Values{}
if filter.Len() > 0 {
- //lint:ignore SA1019 for old code
+ //nolint:staticcheck // ignore SA1019 for old code
filterJSON, err := filters.ToParamWithVersion(cli.version, filter)
if err != nil {
return plugins, err
diff --git a/client/volume_list.go b/client/volume_list.go
index d68fc2b986..942498dde2 100644
--- a/client/volume_list.go
+++ b/client/volume_list.go
@@ -15,7 +15,7 @@ func (cli *Client) VolumeList(ctx context.Context, filter filters.Args) (volumet
query := url.Values{}
if filter.Len() > 0 {
- //lint:ignore SA1019 for old code
+ //nolint:staticcheck // ignore SA1019 for old code
filterJSON, err := filters.ToParamWithVersion(cli.version, filter)
if err != nil {
return volumes, err