Merge remote-tracking branch 'origin/main' into client-team-domain

Author: schrodit

cmd/list-teams.go

@@ -0,0 +1,61 @@
+/*
+Copyright © 2025 Codesphere Inc. <support@codesphere.com>
+*/
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/codesphere-cloud/cs-go/pkg/out"
+	"github.com/jedib0t/go-pretty/v6/table"
+
+	"github.com/spf13/cobra"
+)
+
+type ListTeamsCmd struct {
+	cmd  *cobra.Command
+	opts GlobalOptions
+}
+
+func addListTeamsCmd(p *cobra.Command, opts GlobalOptions) {
+	l := ListTeamsCmd{
+		cmd: &cobra.Command{
+			Use:   "teams",
+			Short: "list teams",
+			Long:  `list teams available in Codesphere`,
+			Example: `
+List all teams:
+
+$ cs list teams
+			`,
+		},
+		opts: opts,
+	}
+	l.cmd.RunE = l.RunE
+	p.AddCommand(l.cmd)
+}
+
+func (l *ListTeamsCmd) RunE(_ *cobra.Command, args []string) (err error) {
+	client, err := NewClient(l.opts)
+	if err != nil {
+		return fmt.Errorf("failed to create Codesphere client: %e", err)
+	}
+
+	teams, err := client.ListTeams()
+	if err != nil {
+		return fmt.Errorf("failed to list teams: %e", err)
+	}
+
+	t := out.GetTableWriter()
+	t.AppendHeader(table.Row{"P", "ID", "Name", "Role", "Default DC"})
+	for _, team := range teams {
+		first := ""
+		if team.IsFirst != nil && *team.IsFirst {
+			first = "*"
+		}
+		t.AppendRow(table.Row{first, team.Id, team.Name, GetRoleName(int(team.Role)), team.DefaultDataCenterId})
+	}
+	t.Render()
+
+	return nil
+}

cmd/list-workspaces.go

@@ -4,9 +4,9 @@ Copyright © 2025 Codesphere Inc. <support@codesphere.com>
 package cmd
 
 import (
-	"errors"
 	"fmt"
 
+	"github.com/codesphere-cloud/cs-go/pkg/api"
 	"github.com/codesphere-cloud/cs-go/pkg/out"
 	"github.com/jedib0t/go-pretty/v6/table"
 
@@ -47,26 +47,50 @@ func (l *ListWorkspacesCmd) parseLogCmdFlags() {
 }
 
 func (l *ListWorkspacesCmd) RunE(_ *cobra.Command, args []string) (err error) {
-	if l.opts.TeamId == nil || *l.opts.TeamId < 0 {
-		return errors.New("team ID not set or invalid, please use --team-id to set one")
-	}
-
 	client, err := NewClient(l.opts.GlobalOptions)
 	if err != nil {
 		return fmt.Errorf("failed to create Codesphere client: %e", err)
 	}
 
-	workspaces, err := client.ListWorkspaces(*l.opts.TeamId)
+	teams, err := l.getTeamIds(client)
 	if err != nil {
-		return fmt.Errorf("failed to list workspaces: %e", err)
+		return fmt.Errorf("failed to get teams: %e", err)
+	}
+	workspaces := []api.Workspace{}
+	for _, team := range teams {
+		teamWorkspaces, err := client.ListWorkspaces(team)
+		if err != nil {
+			return fmt.Errorf("failed to list workspaces: %e", err)
+		}
+		workspaces = append(workspaces, teamWorkspaces...)
 	}
 
 	t := out.GetTableWriter()
-	t.AppendHeader(table.Row{"ID", "Name", "Repository"})
+	t.AppendHeader(table.Row{"Team ID", "ID", "Name", "Repository"})
 	for _, w := range workspaces {
-		t.AppendRow(table.Row{w.Id, w.Name, *w.GitUrl.Get()})
+		gitUrl := ""
+		if w.GitUrl.Get() != nil {
+			gitUrl = *w.GitUrl.Get()
+		}
+		t.AppendRow(table.Row{w.TeamId, w.Id, w.Name, gitUrl})
 	}
 	t.Render()
 
 	return nil
 }
+
+func (l *ListWorkspacesCmd) getTeamIds(client *api.Client) (teams []int, err error) {
+	if l.opts.TeamId != nil && *l.opts.TeamId >= 0 {
+		teams = append(teams, *l.opts.TeamId)
+		return
+	}
+	var allTeams []api.Team
+	allTeams, err = client.ListTeams()
+	if err != nil {
+		return
+	}
+	for _, t := range allTeams {
+		teams = append(teams, int(t.Id))
+	}
+	return
+}

cmd/list.go

@@ -24,11 +24,7 @@ func addListCmd(rootCmd *cobra.Command, opts GlobalOptions) {
 			`,
 		},
 	}
-	l.parseLogCmdFlags()
 	rootCmd.AddCommand(l.cmd)
 	addListWorkspacesCmd(l.cmd, opts)
-}
-
-func (l *ListCmd) parseLogCmdFlags() {
-
+	addListTeamsCmd(l.cmd, opts)
 }

cmd/util.go

@@ -104,3 +104,10 @@ func NewClient(opts GlobalOptions) (*api.Client, error) {
 	})
 	return client, nil
 }
+
+func GetRoleName(role int) string {
+	if role == 1 {
+		return "Member"
+	}
+	return "Admin"
+}