[AM-4684] Add Flink model roles to CLI list/describe commands (#2769)

confluentinc · May 28, 2024 · c8b7c5c · c8b7c5c
1 parent 2ab27c0
commit c8b7c5c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/internal/iam/command_rbac.go b/internal/iam/command_rbac.go
@@ -19,6 +19,7 @@ var (
 	identityNamespace       = optional.NewString("identity")
 	flinkNamespace          = optional.NewString("flink")
 	workloadNamespace       = optional.NewString("workload")
+	flinkModelNamespace     = optional.NewString("flinkmodel")
 )
 
 func newRbacCommand(cfg *config.Config, prerunner pcmd.PreRunner) *cobra.Command {

diff --git a/internal/iam/command_rbac_role_describe.go b/internal/iam/command_rbac_role_describe.go
@@ -64,6 +64,10 @@ func (c *roleCommand) ccloudDescribe(cmd *cobra.Command, role string) error {
 		namespacesList = append(namespacesList, flinkNamespace.Value(), workloadNamespace.Value())
 	}
 
+	if featureflags.Manager.BoolVariation("flink.model.rbac.namespace.cli.enable", c.Context, ldClient, true, false) {
+		namespacesList = append(namespacesList, flinkModelNamespace.Value())
+	}
+
 	namespaces := optional.NewString(strings.Join(namespacesList, ","))
 
 	opts := &mdsv2alpha1.RoleDetailOpts{Namespace: namespaces}

diff --git a/internal/iam/command_rbac_role_list.go b/internal/iam/command_rbac_role_list.go
@@ -66,6 +66,14 @@ func (c *roleCommand) ccloudList(cmd *cobra.Command) error {
 		roles = append(roles, workloadRoles...)
 	}
 
+	if featureflags.Manager.BoolVariation("flink.model.rbac.namespace.cli.enable", c.Context, ldClient, true, false) {
+		flinkModelRoles, err := c.namespaceRoles(flinkModelNamespace)
+		if err != nil {
+			return err
+		}
+		roles = append(roles, flinkModelRoles...)
+	}
+
 	if output.GetFormat(cmd).IsSerialized() {
 		return output.SerializedOutput(cmd, roles)
 	}