diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-26 11:23:46 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-26 13:57:27 -0400 |
| commit | fc197fb4f5c0e0d90da39fe672bce7d145272415 (patch) | |
| tree | 56913b09296f1116d7d22d1bb938eba55d14c700 /vendor/github.com/fsouza/go-dockerclient/client.go | |
| parent | fa6ba9b00fb5f77ead67b624be510ec50b2f4f5e (diff) | |
| download | podman-fc197fb4f5c0e0d90da39fe672bce7d145272415.tar.gz podman-fc197fb4f5c0e0d90da39fe672bce7d145272415.tar.bz2 podman-fc197fb4f5c0e0d90da39fe672bce7d145272415.zip | |
[NO TESTS NEEDED] Vendor in containers/buildah v1.20.0
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/github.com/fsouza/go-dockerclient/client.go')
| -rw-r--r-- | vendor/github.com/fsouza/go-dockerclient/client.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vendor/github.com/fsouza/go-dockerclient/client.go b/vendor/github.com/fsouza/go-dockerclient/client.go index a1bccd68f..d0814a5c0 100644 --- a/vendor/github.com/fsouza/go-dockerclient/client.go +++ b/vendor/github.com/fsouza/go-dockerclient/client.go @@ -777,10 +777,9 @@ func (c *Client) hijack(method, path string, hijackOptions hijackOptions) (Close errs := make(chan error, 1) quit := make(chan struct{}) go func() { - //nolint:staticcheck + //lint:ignore SA1019 the alternative doesn't quite work, so keep using the deprecated thing. clientconn := httputil.NewClientConn(dial, nil) defer clientconn.Close() - //nolint:bodyclose clientconn.Do(req) if hijackOptions.success != nil { hijackOptions.success <- struct{}{} @@ -959,7 +958,6 @@ func queryString(opts interface{}) string { } func addQueryStringValue(items url.Values, key string, v reflect.Value) bool { - //nolint:exhaustive switch v.Kind() { case reflect.Bool: if v.Bool() { @@ -1059,7 +1057,8 @@ func parseEndpoint(endpoint string, tls bool) (*url.URL, error) { case "http", "https", "tcp": _, port, err := net.SplitHostPort(u.Host) if err != nil { - if e, ok := err.(*net.AddrError); ok { + var e *net.AddrError + if errors.As(err, &e) { if e.Err == "missing port in address" { return u, nil } |