Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cqin-confluent merged 5 commits into from
Dec 8, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a51d76f
Use default max ecku to scale limits when not set in CMK response
marantunez Dec 3, 2025
ae2e7e8
add extra nil check
marantunez Dec 3, 2025
8030b08
Check that default/current max ecku are > 0
marantunez Dec 4, 2025
9adb536
copilot review
marantunez Dec 4, 2025
2b0b80e
missing command test
marantunez Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions internal/kafka/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 16 additions & 0 deletions test/fixtures/output/kafka/cluster/describe-basic-with-default-v2-limits.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 |
+----------------------+----------------------------+
1 change: 1 addition & 0 deletions test/kafka_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
2 changes: 1 addition & 1 deletion test/test-server/kafka_usage_limits_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down