Fix linter issues

mxpv · mxpv · commit c59d1cd5b069 · 2020-10-07T15:42:01.000-07:00
Signed-off-by: Maksym Pavlenko &lt;pavlenko.maksym@gmail.com&gt;
diff --git a/remotes/docker/auth/fetch.go b/remotes/docker/auth/fetch.go
@@ -106,10 +106,8 @@ func FetchTokenWithOAuth(ctx context.Context, client *http.Client, headers http.
 		return nil, err
 	}
 	req.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=utf-8")
-	if headers != nil {
-		for k, v := range headers {
-			req.Header[k] = append(req.Header[k], v...)
-		}
+	for k, v := range headers {
+		req.Header[k] = append(req.Header[k], v...)
 	}
 
 	resp, err := ctxhttp.Do(ctx, client, req)
@@ -152,10 +150,8 @@ func FetchToken(ctx context.Context, client *http.Client, headers http.Header, t
 		return nil, err
 	}
 
-	if headers != nil {
-		for k, v := range headers {
-			req.Header[k] = append(req.Header[k], v...)
-		}
+	for k, v := range headers {
+		req.Header[k] = append(req.Header[k], v...)
 	}
 
 	reqParams := req.URL.Query()
diff --git a/runtime/v2/example/example.go b/runtime/v2/example/example.go
@@ -31,8 +31,6 @@ import (
 var (
 	// check to make sure the *service implements the GRPC API
 	_ = (taskAPI.TaskService)(&service{})
-	// common response type
-	empty = &ptypes.Empty{}
 )
 
 // New returns a new shim service
@@ -121,7 +119,7 @@ func (s *service) Connect(ctx context.Context, r *taskAPI.ConnectRequest) (*task
 // Shutdown is called after the underlying resources of the shim are cleaned up and the service can be stopped
 func (s *service) Shutdown(ctx context.Context, r *taskAPI.ShutdownRequest) (*ptypes.Empty, error) {
 	os.Exit(0)
-	return empty, nil
+	return &ptypes.Empty{}, nil
 }
 
 // Stats returns container level system stats for a container and its processes

Original file line number	Diff line number	Diff line change
`@@ -106,10 +106,8 @@ func FetchTokenWithOAuth(ctx context.Context, client *http.Client, headers http.`
`106`	`106`	`return nil, err`
`107`	`107`	`}`
`108`	`108`	`req.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=utf-8")`
`109`		`- if headers != nil {`
`110`		`- for k, v := range headers {`
`111`		`- req.Header[k] = append(req.Header[k], v...)`
`112`		`- }`
	`109`	`+ for k, v := range headers {`
	`110`	`+ req.Header[k] = append(req.Header[k], v...)`
`113`	`111`	`}`
`114`	`112`
`115`	`113`	`resp, err := ctxhttp.Do(ctx, client, req)`
`@@ -152,10 +150,8 @@ func FetchToken(ctx context.Context, client *http.Client, headers http.Header, t`
`152`	`150`	`return nil, err`
`153`	`151`	`}`
`154`	`152`
`155`		`- if headers != nil {`
`156`		`- for k, v := range headers {`
`157`		`- req.Header[k] = append(req.Header[k], v...)`
`158`		`- }`
	`153`	`+ for k, v := range headers {`
	`154`	`+ req.Header[k] = append(req.Header[k], v...)`
`159`	`155`	`}`
`160`	`156`
`161`	`157`	`reqParams := req.URL.Query()`