feat(api): Add organization filtering to ListTeams

chore(mock): Update MockClient.ListTeams signature
test(cli): Update ListTeams mock expectation in list_workspaces_test
feat(api): Add ConvertOrgTeamToTeam helper for organization teams
refactor(cli): Simplify ListTeamsCmd.RunE to use new ListTeams signature
feat(cli): Update Client interface for ListTeams to include orgId
feat(cli): Add --org flag and GlobalOptions.OrgId for organization context
feat(pkg): Add GetOrgId to Environment for CS_ORG_ID
feat(cli): Implement 'cs list org' command to list organizations

Author: DerBurri

api/client.go

@@ -145,8 +145,3 @@ func (c *Client) ListBaseimages() ([]Baseimage, error) {
 	baseimages, r, err := c.api.MetadataAPI.MetadataGetWorkspaceBaseImages(c.ctx).Execute()
 	return baseimages, errors.FormatAPIError(r, err)
 }
-
-func (c *Client) ListOrganizations() ([]Organization, error) {
-	organizations, r, err := c.api.OrganizationsAPI.OrganizationsListOrganizations(c.ctx).Execute()
-	return organizations, errors.FormatAPIError(r, err)
-}

api/organization.go

@@ -0,0 +1,10 @@
+package api
+
+import (
+	cserrors "github.com/codesphere-cloud/cs-go/api/errors"
+)
+
+func (c *Client) ListOrganizations() ([]Organization, error) {
+	organizations, r, err := c.api.OrganizationsAPI.OrganizationsListOrganizations(c.ctx).Execute()
+	return organizations, cserrors.FormatAPIError(r, err)
+}

api/team.go

@@ -16,7 +16,7 @@ import (
 // Returns [NotFound] if no plan with the given Id could be found
 // Returns [Duplicated] if no plan with the given Id could be found
 func (client *Client) TeamIdByName(name string) (Team, error) {
-	teams, err := client.ListTeams()
+	teams, err := client.ListTeams("")
 	if err != nil {
 		return Team{}, err
 	}
@@ -39,7 +39,20 @@ func (client *Client) TeamIdByName(name string) (Team, error) {
 	return matchingTeams[0], nil
 }
 
-func (c *Client) ListTeams() ([]Team, error) {
+func (c *Client) ListTeams(orgId string) ([]Team, error) {
+	if orgId != "" {
+		teams, r, err := c.api.OrganizationsAPI.OrganizationsListOrgTeams(c.ctx, orgId).Execute()
+		if err != nil {
+			return nil, cserrors.FormatAPIError(r, err)
+		}
+
+		res := make([]Team, len(teams))
+		for i, t := range teams {
+			res[i] = ConvertOrgTeamToTeam(t, orgId)
+		}
+		return res, nil
+	}
+
 	teams, r, err := c.api.TeamsAPI.TeamsListTeams(c.ctx).Execute()
 	return teams, cserrors.FormatAPIError(r, err)
 }

api/types.go

@@ -39,6 +39,20 @@ func ConvertToTeam(t *openapi.TeamsGetTeam200Response) *Team {
 	}
 }
 
+func ConvertOrgTeamToTeam(t openapi.OrganizationsListOrgTeams200ResponseInner, orgId string) Team {
+	return Team{
+		Id:                  t.Id,
+		DefaultDataCenterId: t.DefaultDataCenterId,
+		Name:                t.Name,
+		Description:         *openapi.NewNullableString(t.Description),
+		AvatarId:            *openapi.NewNullableString(t.AvatarId),
+		AvatarUrl:           *openapi.NewNullableString(t.AvatarUrl),
+		IsFirst:             t.IsFirst,
+		OrganizationId:      &orgId,
+		Role:                0, // Default to admin role if not specified by org API
+	}
+}
+
 type Time interface {
 	Sleep(time.Duration)
 	Now() time.Time

cli/cmd/client.go

@@ -16,7 +16,7 @@ import (
 )
 
 type Client interface {
-	ListTeams() ([]api.Team, error)
+	ListTeams(orgId string) ([]api.Team, error)
 	ListWorkspaces(teamId int) ([]api.Workspace, error)
 	ListBaseimages() ([]api.Baseimage, error)
 	ListOrganizations() ([]api.Organization, error)

cli/cmd/list_organizations_test.go

@@ -33,7 +33,7 @@ var _ = Describe("Organization", func() {
 			Opts: &cmd.ListOptions{
 				GlobalOptions: &cmd.GlobalOptions{
 					Env:   mockEnv,
-					OrgId: -1, // force using the env mock to get a org ID
+					OrgId: "", // force using the env mock to get a org ID
 				},
 			},
 			ClientFactory: cmd.NewClient, // Default to real client, will be overridden in specific tests
@@ -164,8 +164,6 @@ var _ = Describe("Organization", func() {
 			Expect(err).NotTo(HaveOccurred())
 			Expect(orgs).To(Equal(expectedOrgs))
 
-
-
 			// Restore Stdout
 			err = w.Close()
 			var buf bytes.Buffer

cli/cmd/list_teams.go

@@ -40,11 +40,10 @@ func (l *ListTeamsCmd) RunE(_ *cobra.Command, args []string) (err error) {
 		return fmt.Errorf("failed to create Codesphere client: %w", err)
 	}
 
-	teams, err := client.ListTeams()
+	teams, err := client.ListTeams(l.opts.OrgId)
 	if err != nil {
 		return fmt.Errorf("failed to list teams: %w", err)
 	}
-
 	switch l.opts.OutputFormat {
 	case OutputFormatJSON:
 		return io.PrintJSON(teams)

cli/cmd/list_workspaces.go

@@ -96,7 +96,7 @@ func (l *ListWorkspacesCmd) getTeamIds(client Client) (teams []int, err error) {
 		return
 	}
 	var allTeams []api.Team
-	allTeams, err = client.ListTeams()
+	allTeams, err = client.ListTeams(l.Opts.OrgId)
 	if err != nil {
 		return
 	}

cli/cmd/list_workspaces_test.go

@@ -53,7 +53,7 @@ var _ = Describe("Workspace", func() {
 
 	Context("when team ID is not set", func() {
 		It("lists workspaces of all teams when no team ID is set", func() {
-			mockClient.EXPECT().ListTeams().Return([]api.Team{{Id: 0}, {Id: 1}}, nil)
+			mockClient.EXPECT().ListTeams("").Return([]api.Team{{Id: 0}, {Id: 1}}, nil)
 
 			expectedWorkspaces := []api.Workspace{
 				{Id: 0, Name: "fakeForTeam0"},