[CLI-1830] Show better error when shrinking Kafka cluster by more than 1 cku (#1364)

* Modified one of the error handling statements in command_cluster_update.go to not wrap a suggestion as an error

* un-capitalize first word in error message

Co-authored-by: Brian Strauch <bstrauch@confluent.io>

* Added new integration test for shrinking dedicated cluster by more than 1 cku

* Switched if statements to a switch as suggested

* Updated new error messsage

* Forgot to run go fmt

Co-authored-by: Brian Strauch <bstrauch@confluent.io>

Author: sgagniere

internal/cmd/kafka/command_cluster_update.go

@@ -89,7 +89,7 @@ func (c *clusterCommand) update(cmd *cobra.Command, args []string, prompt form.P
 
 	updatedCluster, httpResp, err := c.V2Client.UpdateKafkaCluster(clusterID, update)
 	if err != nil {
-		return errors.Wrap(errors.CatchV2ErrorDetailWithResponse(err, httpResp), errors.KafkaClusterUpdateFailedSuggestions)
+		return errors.NewWrapErrorWithSuggestions(errors.CatchV2ErrorDetailWithResponse(err, httpResp), "failed to update Kafka cluster", errors.KafkaClusterUpdateFailedSuggestions)
 	}
 
 	return c.outputKafkaClusterDescription(cmd, &updatedCluster)

test/fixtures/output/kafka/kafka-cluster-dedicated-shrink-error.golden

@@ -0,0 +1,4 @@
+Error: failed to update Kafka cluster: Bad Request: 400 Bad Request
+
+Suggestions:
+    A cluster can't be updated while still provisioning.  If you just created this cluster, retry in a few minutes.

test/kafka_test.go

@@ -47,6 +47,7 @@ func (s *CLITestSuite) TestKafka() {
 		{args: "kafka cluster update lkc-update --cku 2", fixture: "kafka/kafka-cluster-resize-error.golden", wantErrCode: 1},
 		{args: "kafka cluster update lkc-update-dedicated-shrink --name lkc-update-dedicated-name --cku 1", fixture: "kafka/44.golden"},
 		{args: "kafka cluster update lkc-update-dedicated-shrink --cku 1", fixture: "kafka/45.golden"},
+		{args: "kafka cluster update lkc-update-dedicated-shrink-multi --cku 1", fixture: "kafka/kafka-cluster-dedicated-shrink-error.golden", wantErrCode: 1},
 		{args: "kafka cluster update lkc-update --cku 1", fixture: "kafka/kafka-cluster-resize-error.golden", wantErrCode: 1},
 
 		{args: "kafka cluster delete", fixture: "kafka/3.golden", wantErrCode: 1},

test/test-server/cmk_handlers.go

@@ -145,6 +145,8 @@ func handleCmkCluster(t *testing.T) http.HandlerFunc {
 			handleCmkKafkaDedicatedClusterExpansion(t)(w, r)
 		case "lkc-update-dedicated-shrink":
 			handleCmkKafkaDedicatedClusterShrink(t)(w, r)
+		case "lkc-update-dedicated-shrink-multi":
+			handleCmkKafkaDedicatedClusterShrinkMulti(t)(w, r)
 		case "lkc-unknown":
 			err := writeResourceNotFoundError(w)
 			require.NoError(t, err)
@@ -301,3 +303,21 @@ func handleCmkKafkaDedicatedClusterShrink(t *testing.T) http.HandlerFunc {
 		}
 	}
 }
+
+// Handler for GET/PATCH "/cmk/v2/clusters/lkc-update-dedicated-shrink-multi"
+func handleCmkKafkaDedicatedClusterShrinkMulti(t *testing.T) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		switch r.Method {
+		case http.MethodGet:
+			id := r.URL.Query().Get("id")
+			cluster := getCmkDedicatedDescribeCluster(id, "lkc-update-dedicated-shrink-multi", 3)
+			err := json.NewEncoder(w).Encode(cluster)
+			require.NoError(t, err)
+		case http.MethodPatch:
+			w.WriteHeader(http.StatusBadRequest)
+			_, err := io.WriteString(w, badRequestErrMsg)
+			require.NoError(t, err)
+		}
+	}
+}

test/test-server/utils.go

@@ -20,6 +20,7 @@ var (
 	serviceAccountInvalidErrMsg = `{"errors":[{"status":"403","detail":"service account is not valid"}]}`
 	resourceNotFoundErrMsg      = `{"errors":[{"status":"403","detail":"resource not found"}]}`
 	v1ResourceNotFoundErrMsg    = `{"error":{"code":403,"message":"resource not found","nested_errors":{},"details":[],"stack":null},"cluster":null}`
+	badRequestErrMsg            = `{"errors":[{"status":"400","detail":"Bad Request"}]}`
 )
 
 type ApiKeyList []*schedv1.ApiKey