Merge pull request #6 from joshwget/fix-go-vet-error

Denise · web-flow · commit d2f165e586e9 · 2017-07-11T11:14:53.000-07:00
Fix go vet error
diff --git a/rancher/rancher.go b/rancher/rancher.go
@@ -922,11 +922,10 @@ func (r *CloudProvider) get(url string) ([]byte, error) {
 	}
 	req.Header.Add("Authorization", basicAuth(r.conf.Global.CattleAccessKey, r.conf.Global.CattleSecretKey))
 	resp, err := http.DefaultClient.Do(req)
-
-	defer resp.Body.Close()
 	if err != nil {
 		return nil, fmt.Errorf("Couldn't get %s: %v", url, err)
 	}
+	defer resp.Body.Close()
 
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -922,11 +922,10 @@ func (r *CloudProvider) get(url string) ([]byte, error) {`
`922`	`922`	`}`
`923`	`923`	`req.Header.Add("Authorization", basicAuth(r.conf.Global.CattleAccessKey, r.conf.Global.CattleSecretKey))`
`924`	`924`	`resp, err := http.DefaultClient.Do(req)`
`925`		`-`
`926`		`- defer resp.Body.Close()`
`927`	`925`	`if err != nil {`
`928`	`926`	`return nil, fmt.Errorf("Couldn't get %s: %v", url, err)`
`929`	`927`	`}`
	`928`	`+ defer resp.Body.Close()`
`930`	`929`
`931`	`930`	`body, err := ioutil.ReadAll(resp.Body)`
`932`	`931`	`if err != nil {`