fix defer stmt ordering

Jeff McCormick · Jeff McCormick · commit 0a5c8ec7d28a · 2018-09-18T15:25:47.000-05:00
diff --git a/pgo/api/backrest.go b/pgo/api/backrest.go
@@ -39,11 +39,11 @@ func ShowBackrest(httpclient *http.Client, arg, selector string, SessionCredenti
 
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		fmt.Println("Error: Do: ", err)
 		return response, err
 	}
+	defer resp.Body.Close()
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
 	if err != nil {
@@ -79,10 +79,10 @@ func CreateBackrestBackup(httpclient *http.Client, SessionCredentials *msgs.Basi
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		return response, err
 	}
+	defer resp.Body.Close()
 
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
diff --git a/pgo/api/backup.go b/pgo/api/backup.go
@@ -40,11 +40,11 @@ func ShowBackup(httpclient *http.Client, arg string, SessionCredentials *msgs.Ba
 
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		fmt.Println("Error: Do: ", err)
 		return response, err
 	}
+	defer resp.Body.Close()
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
 	if err != nil {
@@ -75,11 +75,11 @@ func DeleteBackup(httpclient *http.Client, arg string, SessionCredentials *msgs.
 
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		fmt.Println("Error: Do: ", err)
 		return response, err
 	}
+	defer resp.Body.Close()
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
 	if err != nil {
@@ -114,10 +114,10 @@ func CreateBackup(httpclient *http.Client, SessionCredentials *msgs.BasicAuthCre
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		return response, err
 	}
+	defer resp.Body.Close()
 
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
diff --git a/pgo/api/cluster.go b/pgo/api/cluster.go
@@ -123,11 +123,12 @@ func CreateCluster(httpclient *http.Client, SessionCredentials *msgs.BasicAuthCr
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		return response, err
 	}
 
+	defer resp.Body.Close()
+
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
 	if err != nil {
diff --git a/pgo/api/failover.go b/pgo/api/failover.go
@@ -42,10 +42,10 @@ func CreateFailover(httpclient *http.Client, SessionCredentials *msgs.BasicAuthC
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		return response, err
 	}
+	defer resp.Body.Close()
 
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
diff --git a/pgo/api/ingest.go b/pgo/api/ingest.go
@@ -39,11 +39,11 @@ func ShowIngest(httpclient *http.Client, arg string, SessionCredentials *msgs.Ba
 
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		fmt.Println("Error: Do: ", err)
 		return response, err
 	}
+	defer resp.Body.Close()
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
 	if err != nil {
@@ -76,10 +76,10 @@ func CreateIngest(httpclient *http.Client, SessionCredentials *msgs.BasicAuthCre
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		return response, err
 	}
+	defer resp.Body.Close()
 
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
diff --git a/pgo/api/label.go b/pgo/api/label.go
@@ -40,10 +40,10 @@ func LabelClusters(httpclient *http.Client, SessionCredentials *msgs.BasicAuthCr
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		return response, err
 	}
+	defer resp.Body.Close()
 
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
diff --git a/pgo/api/load.go b/pgo/api/load.go
@@ -40,10 +40,10 @@ func CreateLoad(httpclient *http.Client, SessionCredentials *msgs.BasicAuthCrede
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		return response, err
 	}
+	defer resp.Body.Close()
 
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
diff --git a/pgo/api/pgpool.go b/pgo/api/pgpool.go
@@ -40,10 +40,10 @@ func CreatePgpool(httpclient *http.Client, SessionCredentials *msgs.BasicAuthCre
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		return response, err
 	}
+	defer resp.Body.Close()
 
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
@@ -77,10 +77,10 @@ func DeletePgpool(httpclient *http.Client, SessionCredentials *msgs.BasicAuthCre
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		return response, err
 	}
+	defer resp.Body.Close()
 
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
diff --git a/pgo/api/policy.go b/pgo/api/policy.go
@@ -39,11 +39,11 @@ func ShowPolicy(httpclient *http.Client, arg string, SessionCredentials *msgs.Ba
 
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		fmt.Println("Error: Do: ", err)
 		return response, err
 	}
+	defer resp.Body.Close()
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
 	if err != nil {
@@ -76,10 +76,10 @@ func CreatePolicy(httpclient *http.Client, SessionCredentials *msgs.BasicAuthCre
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		return response, err
 	}
+	defer resp.Body.Close()
 
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
@@ -152,10 +152,10 @@ func ApplyPolicy(httpclient *http.Client, SessionCredentials *msgs.BasicAuthCred
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		return response, err
 	}
+	defer resp.Body.Close()
 
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
diff --git a/pgo/api/pvc.go b/pgo/api/pvc.go
@@ -38,11 +38,11 @@ func ShowPVC(httpclient *http.Client, pvcName, pvcRoot string, SessionCredential
 
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		fmt.Println("Error: Do: ", err)
 		return response, err
 	}
+	defer resp.Body.Close()
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
 	if err != nil {
diff --git a/pgo/api/reload.go b/pgo/api/reload.go
@@ -41,10 +41,10 @@ func Reload(httpclient *http.Client, SessionCredentials *msgs.BasicAuthCredentia
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		return response, err
 	}
+	defer resp.Body.Close()
 
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
diff --git a/pgo/api/restore.go b/pgo/api/restore.go
@@ -41,10 +41,10 @@ func Restore(httpclient *http.Client, SessionCredentials *msgs.BasicAuthCredenti
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		return response, err
 	}
+	defer resp.Body.Close()
 
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
diff --git a/pgo/api/scaledown.go b/pgo/api/scaledown.go
@@ -39,11 +39,11 @@ func ScaleDownCluster(httpclient *http.Client, clusterName, ScaleDownTarget stri
 
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		fmt.Println("Error: Do: ", err)
 		return response, err
 	}
+	defer resp.Body.Close()
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
 	if err != nil {
diff --git a/pgo/api/status.go b/pgo/api/status.go
@@ -37,11 +37,11 @@ func ShowStatus(httpclient *http.Client, SessionCredentials *msgs.BasicAuthCrede
 
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		fmt.Println("Error: Do: ", err)
 		return response, err
 	}
+	defer resp.Body.Close()
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
 	if err != nil {
diff --git a/pgo/api/test.go b/pgo/api/test.go
@@ -38,11 +38,11 @@ func ShowTest(httpclient *http.Client, arg, selector string, SessionCredentials
 
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		fmt.Println("Error: Do: ", err)
 		return response, err
 	}
+	defer resp.Body.Close()
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
 	if err != nil {
diff --git a/pgo/api/upgrade.go b/pgo/api/upgrade.go
@@ -39,11 +39,11 @@ func ShowUpgrade(httpclient *http.Client, arg string, SessionCredentials *msgs.B
 
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		fmt.Println("Error: Do: ", err)
 		return response, err
 	}
+	defer resp.Body.Close()
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
 	if err != nil {
@@ -77,10 +77,10 @@ func CreateUpgrade(httpclient *http.Client, SessionCredentials *msgs.BasicAuthCr
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		return response, err
 	}
+	defer resp.Body.Close()
 
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
diff --git a/pgo/api/user.go b/pgo/api/user.go
@@ -40,11 +40,11 @@ func ShowUser(httpclient *http.Client, arg, selector string, SessionCredentials
 
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		fmt.Println("Error: Do: ", err)
 		return response, err
 	}
+	defer resp.Body.Close()
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
 	if err != nil {
@@ -77,10 +77,10 @@ func CreateUser(httpclient *http.Client, SessionCredentials *msgs.BasicAuthCrede
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		return response, err
 	}
+	defer resp.Body.Close()
 
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
@@ -153,10 +153,10 @@ func UserManager(httpclient *http.Client, SessionCredentials *msgs.BasicAuthCred
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 
 	resp, err := httpclient.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		return response, err
 	}
+	defer resp.Body.Close()
 
 	log.Debugf("%v\n", resp)
 	err = StatusCheck(resp)
