[CLI-3745] Use default max ecku to scale limits when not set in CMK response (#3237)

Author: marantunez

internal/kafka/utils.go

@@ -85,8 +85,13 @@ func getCmkClusterIngressAndEgressMbps(currentMaxEcku int32, limits *kafkausagel
 	ingress, egress := limits.GetIngress(), limits.GetEgress()
 
 	// Scale limits by cluster's max eCKU when limits are set per eCKU
-	if limits.GetMaxEcku() != nil && currentMaxEcku > 0 {
-		return ingress * currentMaxEcku, egress * currentMaxEcku
+	if limits.GetMaxEcku() != nil {
+		if currentMaxEcku > 0 {
+			return ingress * currentMaxEcku, egress * currentMaxEcku
+		} else if limits.GetMaxEcku().Value > 0 {
+			// Use default max ecku when currentMaxEcku is not set
+			return ingress * limits.GetMaxEcku().Value, egress * limits.GetMaxEcku().Value
+		}
 	}
 
 	return ingress, egress

test/fixtures/output/kafka/cluster/describe-basic-with-default-v2-limits.golden

@@ -0,0 +1,16 @@
++----------------------+----------------------------+
+| Current              | true                       |
+| ID                   | lkc-with-default-v2-limits |
+| Name                 | kafka-cluster              |
+| Type                 | BASIC                      |
+| Ingress Limit (MB/s) | 250                        |
+| Egress Limit (MB/s)  | 750                        |
+| Storage              | 5000 GB                    |
+| Cloud                | aws                        |
+| Region               | us-west-2                  |
+| Availability         | single-zone                |
+| Status               | UP                         |
+| Endpoint             | SASL_SSL://kafka-endpoint  |
+| REST Endpoint        | http://127.0.0.1:1025      |
+| Topic Count          | 2                          |
++----------------------+----------------------------+

test/kafka_test.go

@@ -103,6 +103,7 @@ func (s *CLITestSuite) TestKafka() {
 
 		{args: "kafka cluster describe lkc-describe-with-ecku-limits", fixture: "kafka/cluster/describe-basic-with-ecku-limits.golden"},
 		{args: "kafka cluster describe lkc-with-usage-limits-error", fixture: "kafka/cluster/describe-with-usage-limits-error.golden"},
+		{args: "kafka cluster describe lkc-with-default-v2-limits", fixture: "kafka/cluster/describe-basic-with-default-v2-limits.golden"},
 
 		{args: "kafka acl list --cluster lkc-acls", fixture: "kafka/acl/list-cloud.golden"},
 		{args: "kafka acl list --cluster lkc-acls --all", fixture: "kafka/acl/list-cloud-all.golden"},

test/test-server/kafka_usage_limits_handler.go

@@ -47,7 +47,7 @@ func handleUsageLimits(t *testing.T) http.HandlerFunc {
 		// Check for lkc_id query parameter to determine which limits to return
 		lkcId := r.URL.Query().Get("lkc_id")
 		switch lkcId {
-		case "lkc-with-ecku-limits", "lkc-describe-with-ecku-limits":
+		case "lkc-with-ecku-limits", "lkc-describe-with-ecku-limits", "lkc-with-default-v2-limits":
 			handleGetUsageLimitsEckuLimits(t)(w, r)
 		case "lkc-with-usage-limits-error":
 			handleGetUsageLimitsWithError(t)(w, r)