add --all support to pgo delete policy and pgo show policy commands, change GET to POST in API

Author: jmccormick2001

apiserver.go

@@ -90,7 +90,7 @@ func main() {
 	r.HandleFunc("/policies", policyservice.CreatePolicyHandler)
 	r.HandleFunc("/showpolicies", policyservice.ShowPolicyHandler).Methods("POST")
 	//here
-	r.HandleFunc("/policiesdelete/{name}", policyservice.DeletePolicyHandler).Methods("GET")
+	r.HandleFunc("/policiesdelete", policyservice.DeletePolicyHandler).Methods("POST")
 	r.HandleFunc("/workflow/{id}", workflowservice.ShowWorkflowHandler).Methods("GET")
 	r.HandleFunc("/showpvc", pvcservice.ShowPVCHandler).Methods("POST")
 	r.HandleFunc("/policies/apply", policyservice.ApplyPolicyHandler).Methods("POST")

apiserver/policyservice/policyservice.go

@@ -19,7 +19,6 @@ import (
 	"encoding/json"
 	apiserver "github.com/crunchydata/postgres-operator/apiserver"
 	msgs "github.com/crunchydata/postgres-operator/apiservermsgs"
-	"github.com/gorilla/mux"
 	log "github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/util/validation"
 	"net/http"
@@ -85,11 +84,13 @@ func CreatePolicyHandler(w http.ResponseWriter, r *http.Request) {
 // returns a DeletePolicyResponse
 func DeletePolicyHandler(w http.ResponseWriter, r *http.Request) {
 	var ns string
-	vars := mux.Vars(r)
 
-	policyname := vars["name"]
-	clientVersion := r.URL.Query().Get("version")
-	namespace := r.URL.Query().Get("namespace")
+	var request msgs.DeletePolicyRequest
+	_ = json.NewDecoder(r.Body).Decode(&request)
+
+	policyname := request.PolicyName
+	clientVersion := request.ClientVersion
+	namespace := request.Namespace
 
 	log.Debugf("DeletePolicyHandler parameters version [%s] name [%s] namespace [%s]", clientVersion, policyname, namespace)
 

apiservermsgs/policymsgs.go

@@ -68,6 +68,15 @@ type ShowPolicyResponse struct {
 	Status
 }
 
+// DeletePolicyRequest ...
+type DeletePolicyRequest struct {
+	Selector      string
+	Namespace     string
+	AllFlag       bool
+	ClientVersion string
+	PolicyName    string
+}
+
 // DeletePolicyResponse ...
 type DeletePolicyResponse struct {
 	Results []string

pgo/api/policy.go

@@ -104,21 +104,22 @@ func CreatePolicy(httpclient *http.Client, SessionCredentials *msgs.BasicAuthCre
 	return resp, err
 }
 
-func DeletePolicy(httpclient *http.Client, arg string, SessionCredentials *msgs.BasicAuthCredentials, ns string) (msgs.DeletePolicyResponse, error) {
+func DeletePolicy(httpclient *http.Client, request *msgs.DeletePolicyRequest, SessionCredentials *msgs.BasicAuthCredentials) (msgs.DeletePolicyResponse, error) {
 
 	var response msgs.DeletePolicyResponse
 
-	url := SessionCredentials.APIServerURL + "/policiesdelete/" + arg + "?version=" + msgs.PGO_VERSION + "&namespace=" + ns
+	url := SessionCredentials.APIServerURL + "/policiesdelete"
 
 	log.Debugf("delete policy called [%s]", url)
 
-	action := "GET"
-
-	req, err := http.NewRequest(action, url, nil)
+	action := "POST"
+	jsonValue, _ := json.Marshal(request)
+	req, err := http.NewRequest(action, url, bytes.NewBuffer(jsonValue))
 	if err != nil {
+		response.Status.Code = msgs.Error
 		return response, err
 	}
-
+	req.Header.Set("Content-Type", "application/json")
 	req.SetBasicAuth(SessionCredentials.Username, SessionCredentials.Password)
 
 	resp, err := httpclient.Do(req)

pgo/cmd/delete.go

@@ -107,6 +107,7 @@ func init() {
 	deletePgbouncerCmd.Flags().StringVarP(&Selector, "selector", "s", "", "The selector to use for cluster filtering.")
 	deletePgpoolCmd.Flags().StringVarP(&Selector, "selector", "s", "", "The selector to use for cluster filtering.")
 	deletePolicyCmd.Flags().BoolVar(&NoPrompt, "no-prompt", false, "No command line confirmation.")
+	deletePolicyCmd.Flags().BoolVar(&AllFlag, "all", false, "all resources.")
 	deleteScheduleCmd.Flags().StringVarP(&Selector, "selector", "s", "", "The selector to use for cluster filtering.")
 	deleteScheduleCmd.Flags().StringVarP(&ScheduleName, "schedule-name", "", "", "The name of the schedule to delete.")
 	deleteScheduleCmd.Flags().BoolVar(&NoPrompt, "no-prompt", false, "No command line confirmation.")
@@ -197,8 +198,8 @@ var deletePolicyCmd = &cobra.Command{
 		if Namespace == "" {
 			Namespace = PGONamespace
 		}
-		if len(args) == 0 {
-			fmt.Println("Error: A policy name is required for this command.")
+		if len(args) == 0 && !AllFlag {
+			fmt.Println("Error: A policy name or --all is required for this command.")
 		} else {
 			if util.AskForConfirmation(NoPrompt, "") {
 				deletePolicy(args, Namespace)

pgo/cmd/policy.go

@@ -208,10 +208,21 @@ func deletePolicy(args []string, ns string) {
 
 	log.Debugf("deletePolicy called %v", args)
 
+	r := msgs.DeletePolicyRequest{}
+	r.Selector = Selector
+	r.AllFlag = AllFlag
+	r.ClientVersion = msgs.PGO_VERSION
+	r.Namespace = ns
+	if AllFlag {
+		args = make([]string, 1)
+		args[0] = "all"
+	}
+
 	for _, arg := range args {
+		r.PolicyName = arg
 		log.Debugf("deleting policy %s", arg)
 
-		response, err := api.DeletePolicy(httpclient, arg, &SessionCredentials, ns)
+		response, err := api.DeletePolicy(httpclient, &r, &SessionCredentials)
 		if err != nil {
 			fmt.Println("Error: " + err.Error())
 		}