fix backup commands on apiserver to return on auth error correctly

Jeff McCormick · Jeff McCormick · commit d1ad5defa51e · 2018-09-12T17:34:40.000-05:00
diff --git a/apiserver/backrestservice/backrestservice.go b/apiserver/backrestservice/backrestservice.go
@@ -30,14 +30,12 @@ import (
 // pgo backup --selector=name=mycluster
 // pgo backup mycluster
 func CreateBackupHandler(w http.ResponseWriter, r *http.Request) {
-	var err error
-
 	log.Debug("backrestservice.CreateBackupHandler called")
 
 	var request msgs.CreateBackrestBackupRequest
 	_ = json.NewDecoder(r.Body).Decode(&request)
 
-	err = apiserver.Authn(apiserver.CREATE_BACKUP_PERM, w, r)
+	err := apiserver.Authn(apiserver.CREATE_BACKUP_PERM, w, r)
 	if err != nil {
 		return
 	}
@@ -46,10 +44,6 @@ func CreateBackupHandler(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json")
 
 	resp := CreateBackup(&request)
-	if err != nil {
-		resp.Status.Code = msgs.Error
-		resp.Status.Msg = err.Error()
-	}
 
 	json.NewEncoder(w).Encode(resp)
 }
diff --git a/apiserver/backupservice/backupservice.go b/apiserver/backupservice/backupservice.go
@@ -94,26 +94,19 @@ func DeleteBackupHandler(w http.ResponseWriter, r *http.Request) {
 // pgo backup --selector=name=mycluster
 // pgo backup mycluster
 func CreateBackupHandler(w http.ResponseWriter, r *http.Request) {
-	var err error
-
 	log.Debug("backupservice.CreateBackupHandler called")
 
 	var request msgs.CreateBackupRequest
 	_ = json.NewDecoder(r.Body).Decode(&request)
 
-	err = apiserver.Authn(apiserver.CREATE_BACKUP_PERM, w, r)
+	err := apiserver.Authn(apiserver.CREATE_BACKUP_PERM, w, r)
 	if err != nil {
 		return
 	}
-
 	w.WriteHeader(http.StatusOK)
 	w.Header().Set("Content-Type", "application/json")
 
 	resp := CreateBackup(&request)
-	if err != nil {
-		resp.Status.Code = msgs.Error
-		resp.Status.Msg = err.Error()
-	}
 
 	json.NewEncoder(w).Encode(resp)
 }
diff --git a/pgo/api/backrest.go b/pgo/api/backrest.go
@@ -51,8 +51,8 @@ func ShowBackrest(httpclient *http.Client, arg, selector string, SessionCredenti
 	}
 
 	if err := json.NewDecoder(resp.Body).Decode(&response); err != nil {
-		log.Printf("%v\n", resp.Body)
-		log.Println(err)
+		log.Debugf("%v\n", resp.Body)
+		log.Debug(err)
 		return response, err
 	}
 
@@ -92,6 +92,7 @@ func CreateBackrestBackup(httpclient *http.Client, SessionCredentials *msgs.Basi
 
 	if err := json.NewDecoder(resp.Body).Decode(&response); err != nil {
 		log.Printf("%v\n", resp.Body)
+		fmt.Println("Error: ", err)
 		log.Println(err)
 		return response, err
 	}
diff --git a/pgo/cmd/backup.go b/pgo/cmd/backup.go
@@ -161,7 +161,7 @@ func createBackup(args []string) {
 	response, err := api.CreateBackup(httpclient, &SessionCredentials, request)
 
 	if err != nil {
-		fmt.Println("Error: " + response.Status.Msg)
+		fmt.Println("Error: " + err.Error())
 		os.Exit(2)
 	}
 
diff --git a/util/labels.go b/util/labels.go
@@ -69,3 +69,5 @@ const LABEL_BACKUP_TYPE_BACKREST = "pgbackrest"
 const LABEL_DATA_ROOT = "data-root"
 const LABEL_PVC_NAME = "pvc-name"
 const LABEL_VOLUME_NAME = "volume-name"
+
+const LABEL_SESSION_ID = "sessionid"

Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,8 @@ func ShowBackrest(httpclient *http.Client, arg, selector string, SessionCredenti`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`if err := json.NewDecoder(resp.Body).Decode(&response); err != nil {`
`54`		`- log.Printf("%v\n", resp.Body)`
`55`		`- log.Println(err)`
	`54`	`+ log.Debugf("%v\n", resp.Body)`
	`55`	`+ log.Debug(err)`
`56`	`56`	`return response, err`
`57`	`57`	`}`
`58`	`58`
`@@ -92,6 +92,7 @@ func CreateBackrestBackup(httpclient http.Client, SessionCredentials msgs.Basi`
`92`	`92`
`93`	`93`	`if err := json.NewDecoder(resp.Body).Decode(&response); err != nil {`
`94`	`94`	`log.Printf("%v\n", resp.Body)`
	`95`	`+ fmt.Println("Error: ", err)`
`95`	`96`	`log.Println(err)`
`96`	`97`	`return response, err`
`97`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ func createBackup(args []string) {`
`161`	`161`	`response, err := api.CreateBackup(httpclient, &SessionCredentials, request)`
`162`	`162`
`163`	`163`	`if err != nil {`
`164`		`- fmt.Println("Error: " + response.Status.Msg)`
	`164`	`+ fmt.Println("Error: " + err.Error())`
`165`	`165`	`os.Exit(2)`
`166`	`166`	`}`
`167`	`167`