update pgo test to support --all flag, update other --all flags to use a bool instead of a string, update cli docs, update bash completion script (#792)

Author: Jeff McCormick

apiserver.go

@@ -108,7 +108,7 @@ func main() {
 	//here
 	r.HandleFunc("/clustersdelete", clusterservice.DeleteClusterHandler).Methods("POST")
 	r.HandleFunc("/clustersupdate/{name}", clusterservice.UpdateClusterHandler).Methods("GET")
-	r.HandleFunc("/clusters/test/{name}", clusterservice.TestClusterHandler)
+	r.HandleFunc("/testclusters", clusterservice.TestClusterHandler).Methods("POST")
 	r.HandleFunc("/clusters/scale/{name}", clusterservice.ScaleClusterHandler)
 	r.HandleFunc("/scale/{name}", clusterservice.ScaleQueryHandler).Methods("GET")
 	r.HandleFunc("/scaledown/{name}", clusterservice.ScaleDownHandler).Methods("GET")

apiserver/clusterservice/clusterimpl.go

@@ -109,14 +109,14 @@ func DeleteCluster(name, selector string, deleteData, deleteBackups bool, ns str
 }
 
 // ShowCluster ...
-func ShowCluster(name, selector, ccpimagetag, ns, allflag string) msgs.ShowClusterResponse {
+func ShowCluster(name, selector, ccpimagetag, ns string, allflag bool) msgs.ShowClusterResponse {
 	var err error
 
 	response := msgs.ShowClusterResponse{}
 	response.Status = msgs.Status{Code: msgs.Ok, Msg: ""}
 	response.Results = make([]msgs.ShowClusterDetail, 0)
 
-	if selector == "" && allflag == "true" {
+	if selector == "" && allflag {
 		log.Debugf("allflags set to true")
 	} else {
 		if selector == "" {
@@ -273,16 +273,16 @@ func getServices(cluster *crv1.Pgcluster, ns string) ([]msgs.ShowClusterService,
 	return output, err
 }
 
-func TestCluster(name, selector, ns string) msgs.ClusterTestResponse {
+func TestCluster(name, selector, ns string, allFlag bool) msgs.ClusterTestResponse {
 	var err error
 
 	response := msgs.ClusterTestResponse{}
 	response.Results = make([]msgs.ClusterTestResult, 0)
 	response.Status = msgs.Status{Code: msgs.Ok, Msg: ""}
 
 	log.Debugf("selector is %s", selector)
-	if selector == "" && name == "all" {
-		log.Debug("selector is empty and name is all")
+	if selector == "" && allFlag {
+		log.Debug("selector is empty and --all is specified")
 	} else {
 		if selector == "" {
 			selector = "name=" + name

apiserver/clusterservice/clusterservice.go

@@ -96,7 +96,7 @@ func ShowClusterHandler(w http.ResponseWriter, r *http.Request) {
 	ccpimagetag := request.Ccpimagetag
 	clientVersion := request.ClientVersion
 	namespace := request.Namespace
-	allflag := request.Allflag
+	allflag := request.AllFlag
 
 	log.Debugf("ShowClusterHandler: parameters name [%s] selector [%s] ccpimagetag [%s] version [%s] namespace [%s] allflag [%s]", clustername, selector, ccpimagetag, clientVersion, namespace, allflag)
 
@@ -193,15 +193,20 @@ func DeleteClusterHandler(w http.ResponseWriter, r *http.Request) {
 // TestClusterHandler ...
 // pgo test mycluster
 func TestClusterHandler(w http.ResponseWriter, r *http.Request) {
+
+	var request msgs.ClusterTestRequest
+	_ = json.NewDecoder(r.Body).Decode(&request)
+
+	log.Debugf("clusterservice.TestClusterHandler %v\n", request)
+
 	var ns string
-	vars := mux.Vars(r)
-	clustername := vars["name"]
+	clustername := request.Clustername
 
-	selector := r.URL.Query().Get("selector")
-	namespace := r.URL.Query().Get("namespace")
-	clientVersion := r.URL.Query().Get("version")
+	selector := request.Selector
+	namespace := request.Namespace
+	clientVersion := request.ClientVersion
 
-	log.Debugf("TestClusterHandler parameters name [%s] version [%s] namespace [%s] selector [%s]", clustername, clientVersion, namespace, selector)
+	log.Debugf("TestClusterHandler parameters %v", request)
 
 	username, err := apiserver.Authn(apiserver.TEST_CLUSTER_PERM, w, r)
 	if err != nil {
@@ -228,7 +233,7 @@ func TestClusterHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	resp = TestCluster(clustername, selector, ns)
+	resp = TestCluster(clustername, selector, ns, request.AllFlag)
 	json.NewEncoder(w).Encode(resp)
 }
 

apiserver/policyservice/policyimpl.go

@@ -74,10 +74,10 @@ func CreatePolicy(RESTClient *rest.RESTClient, policyName, policyURL, policyFile
 }
 
 // ShowPolicy ...
-func ShowPolicy(RESTClient *rest.RESTClient, name, allflags, ns string) crv1.PgpolicyList {
+func ShowPolicy(RESTClient *rest.RESTClient, name string, allflags bool, ns string) crv1.PgpolicyList {
 	policyList := crv1.PgpolicyList{}
 
-	if allflags == "true" {
+	if allflags {
 		//get a list of all policies
 		err := kubeapi.Getpgpolicies(RESTClient,
 			&policyList,

apiserver/policyservice/policyservice.go

@@ -172,7 +172,7 @@ func ShowPolicyHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	resp.PolicyList = ShowPolicy(apiserver.RESTClient, policyname, request.Allflag, ns)
+	resp.PolicyList = ShowPolicy(apiserver.RESTClient, policyname, request.AllFlag, ns)
 
 	json.NewEncoder(w).Encode(resp)
 

apiserver/pvcservice/pvcimpl.go

@@ -59,7 +59,7 @@ type containerResourcesTemplateFields struct {
 }
 
 // ShowPVC ...
-func ShowPVC(allflag, nodeLabel, pvcName, PVCRoot, ns string) ([]string, error) {
+func ShowPVC(allflag bool, nodeLabel, pvcName, PVCRoot, ns string) ([]string, error) {
 	pvcList := make([]string, 1)
 
 	if nodeLabel != "" {
@@ -69,7 +69,7 @@ func ShowPVC(allflag, nodeLabel, pvcName, PVCRoot, ns string) ([]string, error)
 		}
 	}
 
-	if allflag == "true" {
+	if allflag {
 		selector := config.LABEL_PGREMOVE + "=true"
 
 		pvcs, err := kubeapi.GetPVCs(apiserver.Clientset, selector, ns)

apiserver/pvcservice/pvcservice.go

@@ -73,7 +73,7 @@ func ShowPVCHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	resp.Results, err = ShowPVC(request.Allflag, nodeLabel, pvcname, pvcroot, ns)
+	resp.Results, err = ShowPVC(request.AllFlag, nodeLabel, pvcname, pvcroot, ns)
 	if err != nil {
 		resp.Status.Code = msgs.Error
 		resp.Status.Msg = err.Error()

apiservermsgs/clustermsgs.go

@@ -26,7 +26,7 @@ type ShowClusterRequest struct {
 	Ccpimagetag   string
 	ClientVersion string
 	Namespace     string
-	Allflag       string
+	AllFlag       bool
 }
 
 // CreateClusterRequest ...
@@ -132,7 +132,7 @@ type DeleteClusterRequest struct {
 	Selector      string
 	ClientVersion string
 	Namespace     string
-	Allflag       bool
+	AllFlag       bool
 	DeleteBackups bool
 	DeleteData    bool
 }
@@ -149,6 +149,15 @@ type UpdateClusterResponse struct {
 	Status
 }
 
+// ClusterTestRequest ...
+type ClusterTestRequest struct {
+	Clustername   string
+	Selector      string
+	ClientVersion string
+	Namespace     string
+	AllFlag       bool
+}
+
 // ClusterTestDetail ...
 type ClusterTestDetail struct {
 	PsqlString string

apiservermsgs/policymsgs.go

@@ -23,7 +23,7 @@ import (
 type ShowPolicyRequest struct {
 	Selector      string
 	Namespace     string
-	Allflag       string
+	AllFlag       bool
 	ClientVersion string
 	Policyname    string
 }

apiservermsgs/pvcmsgs.go

@@ -25,7 +25,7 @@ type ShowPVCRequest struct {
 	Selector      string
 	ClientVersion string
 	Namespace     string
-	Allflag       string
+	AllFlag       bool
 }
 
 // ShowPVCResponse ...