Make golangci-lint happy

yyuuttaaoo · Jul 9, 2020 · 2a3287b · 2a3287b
1 parent cd4d739
commit 2a3287b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/client.go b/client.go
@@ -541,7 +541,16 @@ func (c *Client) streamURL(method, url string, streamOptions streamOptions) erro
 			return err
 		}
 	}
-	req, err := http.NewRequest(method, url, streamOptions.in)
+
+	// make a sub-context so that our active cancellation does not affect parent
+	ctx := streamOptions.context
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	subCtx, cancelRequest := context.WithCancel(ctx)
+	defer cancelRequest()
+
+	req, err := http.NewRequestWithContext(ctx, method, url, streamOptions.in)
 	if err != nil {
 		return err
 	}
@@ -562,14 +571,6 @@ func (c *Client) streamURL(method, url string, streamOptions streamOptions) erro
 		streamOptions.stderr = ioutil.Discard
 	}
 
-	// make a sub-context so that our active cancellation does not affect parent
-	ctx := streamOptions.context
-	if ctx == nil {
-		ctx = context.Background()
-	}
-	subCtx, cancelRequest := context.WithCancel(ctx)
-	defer cancelRequest()
-
 	if protocol == unixProtocol || protocol == namedPipeProtocol {
 		var dial net.Conn
 		dial, err = c.Dialer.Dial(protocol, address)

diff --git a/event.go b/event.go
@@ -329,14 +329,12 @@ func (c *Client) eventHijack(startTime int64, eventChan chan *APIEvents, errChan
 	if err != nil {
 		return err
 	}
-	//nolint:staticcheck
-	conn := httputil.NewClientConn(dial, nil)
-	req, err := http.NewRequest(http.MethodGet, uri, nil)
+	conn := httputil.NewClientConn(dial, nil)             //nolint:staticcheck
+	req, err := http.NewRequest(http.MethodGet, uri, nil) //nolint:noctx
 	if err != nil {
 		return err
 	}
-	//nolint:bodyclose
-	res, err := conn.Do(req)
+	res, err := conn.Do(req) //nolint:bodyclose
 	if err != nil {
 		return err
 	}