change delete cluster API to use POST, also support --all flag for pgo delete cluster

Author: jmccormick2001

apiserver.go

@@ -106,7 +106,7 @@ func main() {
 	r.HandleFunc("/clusters", clusterservice.CreateClusterHandler).Methods("POST")
 	r.HandleFunc("/showclusters", clusterservice.ShowClusterHandler).Methods("POST")
 	//here
-	r.HandleFunc("/clustersdelete/{name}", clusterservice.DeleteClusterHandler).Methods("GET")
+	r.HandleFunc("/clustersdelete", clusterservice.DeleteClusterHandler).Methods("POST")
 	r.HandleFunc("/clustersupdate/{name}", clusterservice.UpdateClusterHandler).Methods("GET")
 	r.HandleFunc("/clusters/test/{name}", clusterservice.TestClusterHandler)
 	r.HandleFunc("/clusters/scale/{name}", clusterservice.ScaleClusterHandler)

apiserver/clusterservice/clusterservice.go

@@ -18,7 +18,7 @@ limitations under the License.
 import (
 	"encoding/json"
 	"net/http"
-	"strconv"
+	//	"strconv"
 
 	"github.com/crunchydata/postgres-operator/apiserver"
 	msgs "github.com/crunchydata/postgres-operator/apiservermsgs"
@@ -141,28 +141,22 @@ func ShowClusterHandler(w http.ResponseWriter, r *http.Request) {
 // parameters postgresversion
 // returns a ShowClusterResponse
 func DeleteClusterHandler(w http.ResponseWriter, r *http.Request) {
+	var request msgs.DeleteClusterRequest
+	_ = json.NewDecoder(r.Body).Decode(&request)
+
 	var ns string
-	vars := mux.Vars(r)
-	log.Debugf("clusterservice.DeleteClusterHandler %v\n", vars)
+	log.Debugf("clusterservice.DeleteClusterHandler %v\n", request)
 
-	clustername := vars["name"]
+	clustername := request.Clustername
 
-	selector := r.URL.Query().Get("selector")
-	clientVersion := r.URL.Query().Get("version")
-	namespace := r.URL.Query().Get("namespace")
+	selector := request.Selector
+	clientVersion := request.ClientVersion
+	namespace := request.Namespace
 
-	deleteData := false
-	deleteDataStr := r.URL.Query().Get("delete-data")
-	if deleteDataStr != "" {
-		deleteData, _ = strconv.ParseBool(deleteDataStr)
-	}
-	deleteBackups := false
-	deleteBackupsStr := r.URL.Query().Get("delete-backups")
-	if deleteBackupsStr != "" {
-		deleteBackups, _ = strconv.ParseBool(deleteBackupsStr)
-	}
+	deleteData := request.DeleteData
+	deleteBackups := request.DeleteBackups
 
-	log.Debugf("DeleteClusterHandler: parameters namespace [%s] selector [%s] delete-data [%s] delete-backups [%s]", namespace, selector, clientVersion, deleteDataStr, deleteBackupsStr)
+	log.Debugf("DeleteClusterHandler: parameters namespace [%s] selector [%s] delete-data [%t] delete-backups [%t]", namespace, selector, clientVersion, deleteData, deleteBackups)
 
 	username, err := apiserver.Authn(apiserver.DELETE_CLUSTER_PERM, w, r)
 	if err != nil {

apiservermsgs/clustermsgs.go

@@ -126,6 +126,17 @@ type ShowClusterResponse struct {
 	Status
 }
 
+// DeleteClusterRequest ...
+type DeleteClusterRequest struct {
+	Clustername   string
+	Selector      string
+	ClientVersion string
+	Namespace     string
+	Allflag       bool
+	DeleteBackups bool
+	DeleteData    bool
+}
+
 // DeleteClusterResponse ...
 type DeleteClusterResponse struct {
 	Results []string

pgo/api/cluster.go

@@ -28,7 +28,7 @@ import (
 
 const (
 	createClusterURL = "%s/clusters"
-	deleteClusterURL = "%s/clustersdelete/%s?selector=%s&delete-data=%t&delete-backups=%t&version=%s&namespace=%s"
+	deleteClusterURL = "%s/clustersdelete"
 	updateClusterURL = "%s/clustersupdate/%s?selector=%s&autofail=%s&version=%s&namespace=%s"
 	showClusterURL   = "%s/showclusters"
 )
@@ -72,20 +72,23 @@ func ShowCluster(httpclient *http.Client, SessionCredentials *msgs.BasicAuthCred
 
 }
 
-func DeleteCluster(httpclient *http.Client, arg, selector string, SessionCredentials *msgs.BasicAuthCredentials, deleteData, deleteBackups bool, ns string) (msgs.DeleteClusterResponse, error) {
+func DeleteCluster(httpclient *http.Client, request *msgs.DeleteClusterRequest, SessionCredentials *msgs.BasicAuthCredentials) (msgs.DeleteClusterResponse, error) {
 
 	var response msgs.DeleteClusterResponse
 
-	url := fmt.Sprintf(deleteClusterURL, SessionCredentials.APIServerURL, arg, selector, deleteData, deleteBackups, msgs.PGO_VERSION, ns)
+	jsonValue, _ := json.Marshal(request)
+	url := fmt.Sprintf(deleteClusterURL, SessionCredentials.APIServerURL)
 
 	log.Debugf("delete cluster called %s", url)
 
-	action := "GET"
-	req, err := http.NewRequest(action, url, nil)
+	action := "POST"
+	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/cluster.go

@@ -31,13 +31,21 @@ import (
 func deleteCluster(args []string, ns string) {
 	log.Debugf("deleteCluster called %v", args)
 
-	if len(args) == 0 && Selector != "" {
+	if AllFlag {
 		args = make([]string, 1)
 		args[0] = "all"
 	}
 
+	r := msgs.DeleteClusterRequest{}
+	r.Selector = Selector
+	r.ClientVersion = msgs.PGO_VERSION
+	r.Namespace = ns
+	r.DeleteBackups = DeleteBackups
+	r.DeleteData = DeleteData
+
 	for _, arg := range args {
-		response, err := api.DeleteCluster(httpclient, arg, Selector, &SessionCredentials, DeleteData, DeleteBackups, ns)
+		r.Clustername = arg
+		response, err := api.DeleteCluster(httpclient, &r, &SessionCredentials)
 
 		if err != nil {
 			fmt.Println("Error: " + err.Error())

pgo/cmd/delete.go

@@ -102,6 +102,7 @@ func init() {
 	deleteLabelCmd.Flags().StringVarP(&Selector, "selector", "s", "", "The selector to use for cluster filtering.")
 	deleteLabelCmd.Flags().StringVarP(&LabelCmdLabel, "label", "", "", "The label to delete for any selected or specified clusters.")
 	deleteClusterCmd.Flags().BoolVarP(&DeleteData, "delete-data", "d", false, "Causes the data for this cluster to be removed permanently.")
+	deleteClusterCmd.Flags().BoolVar(&AllFlag, "all", false, "all resources.")
 	deleteClusterCmd.Flags().BoolVarP(&DeleteBackups, "delete-backups", "b", false, "Causes the backups for this cluster to be removed permanently.")
 	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.")
@@ -168,14 +169,14 @@ var deleteClusterCmd = &cobra.Command{
 	Short: "Delete a PostgreSQL cluster",
 	Long: `Delete a PostgreSQL cluster. For example:
 
-    pgo delete cluster all
+    pgo delete cluster --all
     pgo delete cluster mycluster`,
 	Run: func(cmd *cobra.Command, args []string) {
 		if Namespace == "" {
 			Namespace = PGONamespace
 		}
-		if len(args) == 0 && Selector == "" {
-			fmt.Println("Error: A cluster name or selector is required for this command.")
+		if len(args) == 0 && Selector == "" && !AllFlag {
+			fmt.Println("Error: A cluster name,  selector, or --all is required for this command.")
 		} else {
 			if util.AskForConfirmation(NoPrompt, "") {
 				deleteCluster(args, Namespace)