CIAM-2206: CLI List roles command should return Ksql and SR roles with Stage 3 flag

internal/cmd/iam/command_rbac.go

@@ -1,12 +1,21 @@
 package iam
 
 import (
+	"github.com/antihax/optional"
+	"github.com/confluentinc/mds-sdk-go/mdsv2alpha1"
 	"github.com/spf13/cobra"
 
 	pcmd "github.com/confluentinc/cli/internal/pkg/cmd"
 	v1 "github.com/confluentinc/cli/internal/pkg/config/v1"
 )
 
+var (
+	publicNamespace         = optional.NewString("public")
+	dataGovernanceNamespace = optional.NewString("datagovernance")
+	dataplaneNamespace      = optional.NewString("dataplane")
+	ksqlNamespace           = optional.NewString("ksql")
+)
+
 func newRBACCommand(cfg *v1.Config, prerunner pcmd.PreRunner) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "rbac",
@@ -19,3 +28,9 @@ func newRBACCommand(cfg *v1.Config, prerunner pcmd.PreRunner) *cobra.Command {
 
 	return cmd
 }
+
+func (c *roleCommand) namespaceRoles(namespace optional.String) ([]mdsv2alpha1.Role, error) {
+	opts := &mdsv2alpha1.RolesOpts{Namespace: namespace}
+	roles, _, err := c.MDSv2Client.RBACRoleDefinitionsApi.Roles(c.createContext(), opts)
+	return roles, err
+}

internal/cmd/iam/command_rbac_role_binding.go

@@ -7,7 +7,6 @@ import (
 	"os"
 	"strings"
 
-	"github.com/antihax/optional"
 	orgv1 "github.com/confluentinc/cc-structs/kafka/org/v1"
 	mds "github.com/confluentinc/mds-sdk-go/mdsv1"
 	"github.com/confluentinc/mds-sdk-go/mdsv2alpha1"
@@ -46,8 +45,6 @@ var (
 	environmentScopedRoles = map[string]bool{
 		"EnvironmentAdmin": true,
 	}
-
-	dataplaneNamespace = optional.NewString("dataplane")
 )
 
 type roleBindingOptions struct {

internal/cmd/iam/command_rbac_role_list.go

@@ -1,6 +1,10 @@
 package iam
 
 import (
+	"os"
+	"strings"
+
+	"github.com/antihax/optional"
 	"github.com/confluentinc/go-printer"
 	"github.com/confluentinc/mds-sdk-go/mdsv2alpha1"
 	"github.com/spf13/cobra"
@@ -35,14 +39,27 @@ func (c *roleCommand) list(cmd *cobra.Command, _ []string) error {
 }
 
 func (c *roleCommand) ccloudList(cmd *cobra.Command) error {
-	publicRoles, _, err := c.MDSv2Client.RBACRoleDefinitionsApi.Roles(c.createContext(), nil)
+	var roles []mdsv2alpha1.Role
+
+	// add public and dataplane roles
+	publicAndDataplaneNamespace := []string{publicNamespace.Value(), dataplaneNamespace.Value()}
+	publicAndDataplaneNamespaceOpt := optional.NewString(strings.Join(publicAndDataplaneNamespace, ","))
+	publicAndDataplaneRoles, err := c.namespaceRoles(publicAndDataplaneNamespaceOpt)
 	if err != nil {
 		return err
 	}
+	roles = append(roles, publicAndDataplaneRoles...)
 
-	opts := &mdsv2alpha1.RolesOpts{Namespace: dataplaneNamespace}
-	dataplaneRoles, _, _ := c.MDSv2Client.RBACRoleDefinitionsApi.Roles(c.createContext(), opts)
-	roles := append(publicRoles, dataplaneRoles...)
+	// add ksql and datagovernance roles
+	if os.Getenv("XX_DATAPLANE_3_ENABLE") != "" {
+		ksqlAndDataGovernanceNamespace := []string{ksqlNamespace.Value(), dataGovernanceNamespace.Value()}
+		ksqlAndDataGovernanceNamespaceOpt := optional.NewString(strings.Join(ksqlAndDataGovernanceNamespace, ","))
+		ksqlAndDataGovernanceRoles, err := c.namespaceRoles(ksqlAndDataGovernanceNamespaceOpt)
+		if err != nil {
+			return err
+		}
+		roles = append(roles, ksqlAndDataGovernanceRoles...)
+	}
 
 	format, err := cmd.Flags().GetString(output.FlagName)
 	if err != nil {