Add KAFKA_DISCOVERY operation group (#3139)

lucy-fan · web-flow · commit 47ee6114721f · 2025-07-29T16:35:41.000-07:00
diff --git a/go.mod b/go.mod
@@ -282,4 +282,4 @@ require (
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
-)
+)
diff --git a/go.sum b/go.sum
@@ -188,8 +188,6 @@ github.com/compose-spec/compose-go/v2 v2.1.3 h1:bD67uqLuL/XgkAK6ir3xZvNLFPxPScEi
 github.com/compose-spec/compose-go/v2 v2.1.3/go.mod h1:lFN0DrMxIncJGYAXTfWuajfwj5haBJqrBkarHcnjJKc=
 github.com/confluentinc/ccloud-sdk-go-v1-public v0.0.0-20250521223017-0e8f6f971b52 h1:19qEGhkbZa5fopKCe0VPIV+Sasby4Pv10z9ZaktwWso=
 github.com/confluentinc/ccloud-sdk-go-v1-public v0.0.0-20250521223017-0e8f6f971b52/go.mod h1:62EMf+5uFEt1BJ2q8WMrUoI9VUSxAbDnmZCGRt/MbA0=
-github.com/confluentinc/ccloud-sdk-go-v2-internal/connect-custom-plugin v0.0.9 h1:YgiAPGIR1xVk+KcnAymH5/Mppln25HPtabV+FDFVRPc=
-github.com/confluentinc/ccloud-sdk-go-v2-internal/connect-custom-plugin v0.0.9/go.mod h1:JF4KDwy/DpyTe3GXaceY8TFRR2Kj8J3+PF5hWdP+iak=
 github.com/confluentinc/ccloud-sdk-go-v2/ai v0.1.0 h1:zSF4OQUJXWH2JeAo9rsq13ibk+JFdzITGR8S7cFMpzw=
 github.com/confluentinc/ccloud-sdk-go-v2/ai v0.1.0/go.mod h1:DoxqzzF3JzvJr3fWkvCiOHFlE0GoYpozWxFZ1Ud9ntA=
 github.com/confluentinc/ccloud-sdk-go-v2/apikeys v0.4.0 h1:8fWyLwMuy8ec0MVF5Avd54UvbIxhDFhZzanHBVwgxdw=
@@ -214,8 +212,6 @@ github.com/confluentinc/ccloud-sdk-go-v2/cmk v0.25.0 h1:EdZzQZ4SI5q+f0DQPjH3lWpy
 github.com/confluentinc/ccloud-sdk-go-v2/cmk v0.25.0/go.mod h1:FSSO9mkNPJKMa7Ky66IlXEG7o5H6cpyuKKClvRf9y+0=
 github.com/confluentinc/ccloud-sdk-go-v2/connect v0.7.0 h1:ISrVOX9qJ2Sxiu/fGBqqHeaA0SRJQujc8yP7qAZRL3Y=
 github.com/confluentinc/ccloud-sdk-go-v2/connect v0.7.0/go.mod h1:zHG/3DzsnoHC81B1AY9K/8bMX3mxbIp5/nHHdypa//w=
-github.com/confluentinc/ccloud-sdk-go-v2/connect-custom-plugin v0.0.6 h1:DYQyS4lnYVtuTMVoF+g/ogWcgCiTbsKxhQv0c5KLRJc=
-github.com/confluentinc/ccloud-sdk-go-v2/connect-custom-plugin v0.0.6/go.mod h1:odu6w/vnVrZo00N4yHq5buzWOme1vT1WqksQ3y69sQU=
 github.com/confluentinc/ccloud-sdk-go-v2/connect-custom-plugin v0.0.9 h1:o1zKZlKbnN9uv+Y8TxwesBRryUl3lEU6lnfndEJigxQ=
 github.com/confluentinc/ccloud-sdk-go-v2/connect-custom-plugin v0.0.9/go.mod h1:TtTcSfm+/JvnfqEKglOZ32LIcsRbdtrQdI+TtcP7fiU=
 github.com/confluentinc/ccloud-sdk-go-v2/flink v0.9.0 h1:QqtIFEB5E3CIyGMJd7NQBEtc/k3K11PX7f4Fj7sPFdo=
diff --git a/internal/iam/command_ipfilter_create.go b/internal/iam/command_ipfilter_create.go
@@ -37,7 +37,7 @@ func (c *ipFilterCommand) newCreateCommand(cfg *config.Config) *cobra.Command {
 	cmd.Flags().String("environment", "", "Identifier of the environment for which this filter applies. Without this flag, applies only to the organization.")
 	opGroups := []string{"MANAGEMENT", "SCHEMA", "FLINK"}
 	if isKafkaEnabled {
-		opGroups = append(opGroups, "KAFKA_MANAGEMENT", "KAFKA_DATA")
+		opGroups = append(opGroups, "KAFKA_MANAGEMENT", "KAFKA_DATA", "KAFKA_DISCOVERY")
 	}
 	cmd.Flags().StringSlice("operations", nil, fmt.Sprintf("A comma-separated list of operation groups: %s.", utils.ArrayToCommaDelimitedString(opGroups, "or")))
 	cmd.Flags().Bool("no-public-networks", false, "Use in place of ip-groups to reference the no public networks IP Group.")
diff --git a/internal/iam/command_ipfilter_update.go b/internal/iam/command_ipfilter_update.go
@@ -28,7 +28,7 @@ func (c *ipFilterCommand) newUpdateCommand(cfg *config.Config) *cobra.Command {
 	isKafkaEnabled := cfg.IsTest || (cfg.Context() != nil && featureflags.Manager.BoolVariation("auth.ip_filter.kafka.cli.enabled", cfg.Context(), featureflags.GetCcloudLaunchDarklyClient(cfg.Context().PlatformName), true, false))
 	operationGroups := []string{"SCHEMA", "FLINK"}
 	if isKafkaEnabled {
-		operationGroups = append(operationGroups, "KAFKA_MANAGEMENT", "KAFKA_DATA")
+		operationGroups = append(operationGroups, "KAFKA_MANAGEMENT", "KAFKA_DATA", "KAFKA_DISCOVERY")
 	}
 	cmd.Example = examples.BuildExampleString(
 		examples.Example{
diff --git a/test/fixtures/output/iam/ip-filter/create-help.golden b/test/fixtures/output/iam/ip-filter/create-help.golden
@@ -12,7 +12,7 @@ Flags:
       --resource-group string   Name of resource group: "management" or "multiple". (default "multiple")
       --ip-groups strings       A comma-separated list of IP group IDs.
       --environment string      Identifier of the environment for which this filter applies. Without this flag, applies only to the organization.
-      --operations strings      A comma-separated list of operation groups: "MANAGEMENT", "SCHEMA", "FLINK", "KAFKA_MANAGEMENT", or "KAFKA_DATA".
+      --operations strings      A comma-separated list of operation groups: "MANAGEMENT", "SCHEMA", "FLINK", "KAFKA_MANAGEMENT", "KAFKA_DATA", or "KAFKA_DISCOVERY".
       --no-public-networks      Use in place of ip-groups to reference the no public networks IP Group.
       --context string          CLI context name.
   -o, --output string           Specify the output format as "human", "json", or "yaml". (default "human")
diff --git a/test/fixtures/output/iam/ip-filter/update-add-kafka-operation-group.golden b/test/fixtures/output/iam/ip-filter/update-add-kafka-operation-group.golden
@@ -3,7 +3,8 @@
 | Name             | demo-ip-filter                            |
 | Resource Group   | multiple                                  |
 | IP Groups        | ipg-12345, ipg-abcde                      |
-| Operation Groups | KAFKA_DATA, KAFKA_MANAGEMENT,             |
-|                  | MANAGEMENT, SCHEMA                        |
+| Operation Groups | KAFKA_DATA, KAFKA_DISCOVERY,              |
+|                  | KAFKA_MANAGEMENT, MANAGEMENT,             |
+|                  | SCHEMA                                    |
 | Resource Scope   | crn://confluent.cloud/organization=org123 |
 +------------------+-------------------------------------------+
diff --git a/test/fixtures/output/iam/ip-filter/update-help.golden b/test/fixtures/output/iam/ip-filter/update-help.golden
@@ -6,7 +6,7 @@ Usage:
 Examples:
 Update the name and add an IP group and operation group to IP filter "ipf-abcde":
 
-  $ confluent iam ip-filter update ipf-abcde --name "New Filter Name" --add-ip-groups ipg-12345 --add-operation-groups SCHEMA,FLINK,KAFKA_MANAGEMENT,KAFKA_DATA
+  $ confluent iam ip-filter update ipf-abcde --name "New Filter Name" --add-ip-groups ipg-12345 --add-operation-groups SCHEMA,FLINK,KAFKA_MANAGEMENT,KAFKA_DATA,KAFKA_DISCOVERY
 
 Flags:
       --name string                       Updated name of the IP filter.
diff --git a/test/iam_test.go b/test/iam_test.go
@@ -420,8 +420,8 @@ func (s *CLITestSuite) TestIamIpFilter() {
 		{args: "iam ip-filter update ipf-34dq4 --remove-operation-groups SCHEMA", fixture: "iam/ip-filter/update-remove-operation-group.golden"},
 		{args: "iam ip-filter update ipf-34dq4 --resource-group multiple --add-operation-groups FLINK", fixture: "iam/ip-filter/update-add-flink-operation-group.golden"},
 		{args: "iam ip-filter update ipf-34dq6 --remove-operation-groups SCHEMA,FLINK", fixture: "iam/ip-filter/update-remove-sr-and-flink-operation-group.golden"},
-		{args: "iam ip-filter update ipf-34dq4 --resource-group multiple --add-operation-groups KAFKA_MANAGEMENT,KAFKA_DATA", fixture: "iam/ip-filter/update-add-kafka-operation-group.golden"},
-		{args: "iam ip-filter update ipf-34dq7 --remove-operation-groups KAFKA_MANAGEMENT,KAFKA_DATA", fixture: "iam/ip-filter/update-remove-kafka-operation-group.golden"},
+		{args: "iam ip-filter update ipf-34dq4 --resource-group multiple --add-operation-groups KAFKA_MANAGEMENT,KAFKA_DATA,KAFKA_DISCOVERY", fixture: "iam/ip-filter/update-add-kafka-operation-group.golden"},
+		{args: "iam ip-filter update ipf-34dq7 --remove-operation-groups KAFKA_MANAGEMENT,KAFKA_DATA,KAFKA_DISCOVERY", fixture: "iam/ip-filter/update-remove-kafka-operation-group.golden"},
 	}
 
 	for _, test := range tests {
diff --git a/test/test-server/iam_handlers.go b/test/test-server/iam_handlers.go
@@ -679,7 +679,7 @@ func handleIamIpFilter(t *testing.T) http.HandlerFunc {
 			} else if filterId == "ipf-34dq6" {
 				operationGroups = []string{"MANAGEMENT", "SCHEMA", "FLINK"}
 			} else if filterId == "ipf-34dq7" {
-				operationGroups = []string{"KAFKA_MANAGEMENT", "KAFKA_DATA"}
+				operationGroups = []string{"KAFKA_MANAGEMENT", "KAFKA_DATA", "KAFKA_DISCOVERY"}
 			} else {
 				operationGroups = []string{"MANAGEMENT"}
 			}

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func (c ipFilterCommand) newCreateCommand(cfg config.Config) *cobra.Command {`
`37`	`37`	`cmd.Flags().String("environment", "", "Identifier of the environment for which this filter applies. Without this flag, applies only to the organization.")`
`38`	`38`	`opGroups := []string{"MANAGEMENT", "SCHEMA", "FLINK"}`
`39`	`39`	`if isKafkaEnabled {`
`40`		`- opGroups = append(opGroups, "KAFKA_MANAGEMENT", "KAFKA_DATA")`
	`40`	`+ opGroups = append(opGroups, "KAFKA_MANAGEMENT", "KAFKA_DATA", "KAFKA_DISCOVERY")`
`41`	`41`	`}`
`42`	`42`	`cmd.Flags().StringSlice("operations", nil, fmt.Sprintf("A comma-separated list of operation groups: %s.", utils.ArrayToCommaDelimitedString(opGroups, "or")))`
`43`	`43`	`cmd.Flags().Bool("no-public-networks", false, "Use in place of ip-groups to reference the no public networks IP Group.")`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func (c ipFilterCommand) newUpdateCommand(cfg config.Config) *cobra.Command {`
`28`	`28`	`isKafkaEnabled := cfg.IsTest \|\| (cfg.Context() != nil && featureflags.Manager.BoolVariation("auth.ip_filter.kafka.cli.enabled", cfg.Context(), featureflags.GetCcloudLaunchDarklyClient(cfg.Context().PlatformName), true, false))`
`29`	`29`	`operationGroups := []string{"SCHEMA", "FLINK"}`
`30`	`30`	`if isKafkaEnabled {`
`31`		`- operationGroups = append(operationGroups, "KAFKA_MANAGEMENT", "KAFKA_DATA")`
	`31`	`+ operationGroups = append(operationGroups, "KAFKA_MANAGEMENT", "KAFKA_DATA", "KAFKA_DISCOVERY")`
`32`	`32`	`}`
`33`	`33`	`cmd.Example = examples.BuildExampleString(`
`34`	`34`	`examples.Example{`
Original file line number	Diff line number	Diff line change
`@@ -679,7 +679,7 @@ func handleIamIpFilter(t *testing.T) http.HandlerFunc {`
`679`	`679`	`} else if filterId == "ipf-34dq6" {`
`680`	`680`	`operationGroups = []string{"MANAGEMENT", "SCHEMA", "FLINK"}`
`681`	`681`	`} else if filterId == "ipf-34dq7" {`
`682`		`- operationGroups = []string{"KAFKA_MANAGEMENT", "KAFKA_DATA"}`
	`682`	`+ operationGroups = []string{"KAFKA_MANAGEMENT", "KAFKA_DATA", "KAFKA_DISCOVERY"}`
`683`	`683`	`} else {`
`684`	`684`	`operationGroups = []string{"MANAGEMENT"}`
`685`	`685`	`}`