Merge pull request #46 from Shopify/bodyclose-linter

Bodyclose linter

.golangci.yml

@@ -117,6 +117,7 @@ linters:
     - gofmt
     - whitespace
     - unparam
+    - bodyclose
   fast: false
 
 

v2/docker/digest.go

@@ -30,7 +30,6 @@ func GetDigestFromTagged(client *http.Client, image reference.NamedTagged) (dige
 	if err != nil {
 		return blank, err
 	}
-
 	defer resp.Body.Close()
 
 	if resp.StatusCode >= 300 {
@@ -63,13 +62,12 @@ func GetDigestFromCanonical(client *http.Client, image reference.Canonical) (dig
 	if err != nil {
 		return blank, err
 	}
+	defer resp.Body.Close()
 
 	if resp.StatusCode >= 300 {
 		return blank, responseToError(resp)
 	}
 
-	_ = resp.Body.Close()
-
 	imageDigest := digest.Digest(resp.Header.Get("Docker-Content-Digest"))
 	if "" == string(imageDigest) {
 		return blank, errors.New("empty digest returned for image")

v2/docker/schema2/config.go

@@ -42,7 +42,6 @@ func RequestConfig(client *http.Client, ref reference.Canonical, manifest distri
 	if nil != err {
 		return nil, err
 	}
-
 	defer resp.Body.Close()
 
 	if resp.StatusCode < 300 {

v2/grafeas/grafeas_service.go

@@ -142,12 +142,13 @@ func (g *apiServiceImpl) httpCall(urlAddr *url.URL, payload []byte, method strin
 		}
 		return nil, err
 	}
+	defer resp.Body.Close()
+
 	statusCode := resp.StatusCode
 	data, err := ioutil.ReadAll(resp.Body)
 	if statusCode != http.StatusOK || err != nil {
 		return nil, NewAPIError(statusCode, urlAddr.Path, method, data)
 	}
-	resp.Body.Close()
 
 	return data, err
 }