feat(cli) Add All missing features of the Organizations API by DerBurri · Pull Request #263 · codesphere-cloud/cs-go

DerBurri · 2026-05-13T12:09:23Z

This branch implements org-aware team functionality across the CLI and API client, adds unit tests for team flows, and makes client creation injectable to improve testability. It also includes several refactors and dependency updates required to support the new behavior.

Key points

Organization-aware team behavior:
Use GlobalOptions.OrgId and environment GetOrgId() for org-scoped commands.
Add organization filtering to ListTeams and helper conversions for org teams (API + CLI).
Team management commands and tests:
Implement and test AddTeamMember and RemoveTeamMember command logic and validation.
Implement and test team deletion (RemoveTeam) with injectible ClientFactory to mock API calls.
Add/extend unit tests for create/add/remove team flows.
Error handling & observability:
Improve API error logging to include traceId.
Centralize API error formatting via api/errors.FormatAPIError.
Testability & infra:
Make client construction injectable for CLI commands to allow mocks in tests.
Build-and-run integration test workflow updated (artifact + label matrix) — see integration-test.yml.
Chores & deps:
Multiple dependency updates and lint/test chore fixes.
Representative commits

CLI commands: team_create.go, team_add_member.go, team_remove_member.go, team_remove.go
Tests: team_create_test.go, team_add_member_test.go, team_remove_member_test.go, team_remove_test.go
API error handling: errors.go, tests in errors_test.go
CI workflow: integration-test.yml
Client interface and mocks: client.go, mocks.go
Testing / verification

Ran unit tests for the CLI package locally: go test ./cli/cmd — passing.
Integration tests are built and run via the updated GitHub Actions workflow; note that some int tests previously observed backend HTTP 500s during workspace deletion (server-side). If CI shows failures, collect trace IDs and forward to backend logs for investigation.
Migration / usage notes

OliverTrautvetter

Nice feature, some comments for it 👍

OliverTrautvetter

Some more comments to improve it

…#274) Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

…#275) Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

) Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

* feat: add first draft cs mcp server * fix: add cs-mcp to gitignore * fix: fix env var names in readme * update: clean up workspace structs * update: add mcp server to the main cs-go cli * update: remove mcp readme, add long mcp cmd description, remove old build related stuff * update: update file name of the main mcp file * chore(docs): Auto-update docs and licenses Signed-off-by: siherrmann <25087590+siherrmann@users.noreply.github.com> * fix: fix dependency error * fix: fix dependecy issue --------- Signed-off-by: siherrmann <25087590+siherrmann@users.noreply.github.com> Co-authored-by: siherrmann <25087590+siherrmann@users.noreply.github.com> Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

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 Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

added team add and delete opton with org context Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

…cloud/cs-go into add-organization-api Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

* feat: add first draft cs mcp server * fix: add cs-mcp to gitignore * fix: fix env var names in readme * update: clean up workspace structs * update: add mcp server to the main cs-go cli * update: remove mcp readme, add long mcp cmd description, remove old build related stuff * update: update file name of the main mcp file * chore(docs): Auto-update docs and licenses Signed-off-by: siherrmann <25087590+siherrmann@users.noreply.github.com> * fix: fix dependency error * fix: fix dependecy issue --------- Signed-off-by: siherrmann <25087590+siherrmann@users.noreply.github.com> Co-authored-by: siherrmann <25087590+siherrmann@users.noreply.github.com> Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

add wrapper for team conversion to allow non hardcoded value of role in the missing field Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

* chore(ci): Create release on dependency updates * chore(docs): Auto-update docs and licenses Signed-off-by: NautiluX <2600004+NautiluX@users.noreply.github.com> --------- Signed-off-by: NautiluX <2600004+NautiluX@users.noreply.github.com> Co-authored-by: NautiluX <2600004+NautiluX@users.noreply.github.com> Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

…#284) Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com>

OliverTrautvetter

Some more comments, but we are moving into the right direction 😄

OliverTrautvetter · 2026-07-01T12:19:06Z

+func (c *RemoveTeamCmd) RunE(_ *cobra.Command, args []string) error {
+	client, err := c.ClientFactory(*c.Opts.GlobalOptions)
+	if err != nil {
+		return fmt.Errorf("failed to create Codespehre client: %w", err)


Still 4 typos where "Codespehre" should be changed to "Codesphere"

OliverTrautvetter · 2026-07-01T12:19:33Z

 func (client *Client) TeamIdByName(name string) (Team, error) {
-	teams, err := client.ListTeams()
+	teams, err := client.ListTeams("")


The comment here is unresolved, what about this?

OliverTrautvetter · 2026-07-01T12:20:32Z

 // Returns [NotFound] if no plan with the given Id could be found
 // Returns [Duplicated] if no plan with the given Id could be found


"plan" and "no plan" should be "team" and "multiple teams"

OliverTrautvetter · 2026-07-01T12:21:26Z

+		return err
+	}
+
+	fmt.Printf("Team created: %+v in Organization: %+v\n", createdTeam.Id, orgId)


orgId can be ""

if orgId != "" {
fmt.Printf("Team created: %d in Organization: %s\n", ...)
} else {
fmt.Printf("Team created: %d\n", ...)
}

OliverTrautvetter · 2026-07-01T12:22:03Z

 	return cserrors.FormatAPIError(r, err)
 }
+
+func (c *Client) AddTeamMember(teamId int, email string, role int) error {


should this not have a orgId parameter?

OliverTrautvetter · 2026-07-01T12:24:51Z

+func (c *AddTeamMemberCmd) RunE(_ *cobra.Command, args []string) error {
+	client, err := c.ClientFactory(*c.Opts.GlobalOptions)
+	if err != nil {
+		return fmt.Errorf("failed to create Codesphere client: %w", err)
+	}
+
+	teamId, err := c.Opts.GetTeamId()
+	if err != nil {
+		return err
+	}
+
+	err = c.AddTeamMember(client, teamId, c.Opts.Email, c.Opts.Role)
+	return err
+
+}


Should we not get the orgId?

comment says "To add a member to a team within an organization, the CS_ORG_ID environment variable or the -O/--org flag must be set.`),"

but is never used in AddTeamMember function

OliverTrautvetter · 2026-07-01T12:25:56Z

+	t.cmd.RunE = t.RunE
+	t.cmd.Flags().StringVarP(&t.Opts.Email, "email", "e", "", "Team member email")
+	_ = t.cmd.MarkFlagRequired("email")
+	t.cmd.Flags().IntVarP(&t.Opts.Role, "role", "r", int(cs.RoleAdmin), "Team member role 0=admin, 1=member")


I don't think it is good to have 0 as default admin. uninitialized value would give admin rights here, because it is 0

best would be maybe -1 for admin and 1 for member or 1 for member and 2 for admin while 0 is not allowed

OliverTrautvetter · 2026-07-01T12:30:42Z

+	Context("Validation", func() {
+		It("should fail if the mail is empty", func() {
+
+			err := c.AddTeamMember(mockClient, teamId, "", dcId)


wait why is cdId used as role

OliverTrautvetter · 2026-07-01T12:32:33Z

+			Example: io.FormatExampleCommands("team member add", []io.Example{
+				{Cmd: "-t <teamId> -e user@example.com -r 1", Desc: "Add a user to a team as a member"},
+				{Cmd: "-t <teamId> -e admin@example.com -r 0", Desc: "Add a user to a team as an admin"},
+				{Cmd: "-O <org-id> -t  <teamId> -e user@example.com -r 1", Desc: "Add a user to a team within an organization"},


double space bettween -t and

DerBurri force-pushed the add-organization-api branch 2 times, most recently from 2452e6c to 1487f91 Compare May 13, 2026 12:18

DerBurri force-pushed the add-organization-api branch from 044e3a4 to a513836 Compare June 3, 2026 08:20

DerBurri self-assigned this Jun 3, 2026

DerBurri force-pushed the add-organization-api branch from 3ceec3c to a58b8eb Compare June 3, 2026 08:58

DerBurri marked this pull request as ready for review June 3, 2026 09:20

DerBurri requested a review from a team as a code owner June 3, 2026 09:20

DerBurri requested a review from OliverTrautvetter June 3, 2026 09:20

OliverTrautvetter requested changes Jun 3, 2026

View reviewed changes

DerBurri force-pushed the add-organization-api branch from 00c60bf to db693fa Compare June 17, 2026 09:12

DerBurri requested a review from OliverTrautvetter June 17, 2026 12:48

DerBurri force-pushed the add-organization-api branch 2 times, most recently from b8b9251 to 66f578e Compare June 17, 2026 12:57

OliverTrautvetter requested changes Jun 18, 2026

View reviewed changes

DerBurri force-pushed the add-organization-api branch 2 times, most recently from 58da364 to 92ac544 Compare July 1, 2026 10:40

CodesphereBot and others added 14 commits July 1, 2026 12:41

update(deps): update module github.com/jedib0t/go-pretty/v6 to v6.8.0 (…

176776a

…#274) Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

update(deps): update module github.com/jedib0t/go-pretty/v6 to v6.8.1 (…

c95f093

…#275) Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

update(deps): update module github.com/onsi/ginkgo/v2 to v2.30.0 (#276)

e7670d0

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

update(deps): update module github.com/vektra/mockery/v3 to v3.7.1 (#277

a9b52cb

) Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

update(deps): update kubernetes monorepo to v0.36.2 (#278)

da139a5

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

update(deps): update module github.com/onsi/gomega to v1.42.0 (#279)

b1d14ca

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

add list organizations command

dd879ea

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

feat(test): removed old code

16b7fbc

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

add missing err checks for stdout closing

3df40a5

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

chore(docs): Auto-update docs and licenses

c30168d

Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

chore(docs): Auto-update docs and licenses

c98ff51

Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

feat(cli):

e0d53f7

added team add and delete opton with org context Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

DerBurri and others added 22 commits July 1, 2026 12:41

chore(docs): Auto-update docs and licenses

90ef1dc

Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

Merge branch 'add-organization-api' of https://github.com/codesphere-…

1ca9dbf

…cloud/cs-go into add-organization-api Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

fixed linter errors

0955e4a

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

fixed team create exampl

c2a73e5

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

fixed format for team member remove

0228475

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

fixed Codesphere typo

edb09a1

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

fixed typo in test

37fd7a2

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

removed debugging message

393397c

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

updated openapi client, datatype of ids changed from float32 to int

0a0643b

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

chore(docs): Auto-update docs and licenses

206d67d

Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

made team name required

31d9616

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

checked if team is nil for getteam

d37dae0

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

removed orgID from remove team because not necessary for api

09307ef

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

add list team member function

2e1dc2a

add wrapper for team conversion to allow non hardcoded value of role in the missing field Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

chore(docs): Auto-update docs and licenses

321e96d

Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

chore: regenerate mocks to resolve conflicts

8950c3f

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

update(deps): update module github.com/onsi/ginkgo/v2 to v2.32.0 (#280)

053c3d1

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

update(deps): update module github.com/onsi/gomega to v1.42.1 (#281)

f10b8da

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

update(deps): update module github.com/jedib0t/go-pretty/v6 to v6.8.2 (…

63b2e62

…#284) Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

fix: update uuid dependency to correct version

27dbe5a

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

DerBurri force-pushed the add-organization-api branch from 78947e6 to 27dbe5a Compare July 1, 2026 10:52

Merge origin/main into add-organization-api and resolve conflicts

eff4f6b

DerBurri force-pushed the add-organization-api branch from ce8b283 to 8522181 Compare July 1, 2026 11:04

fix: remove explicit embedded struct selector to resolve QF1008

faf3bdf

Signed-off-by: Maximilian <burr.maximilian97@gmail.com>

DerBurri force-pushed the add-organization-api branch from 6f01b45 to faf3bdf Compare July 1, 2026 11:05

DerBurri requested a review from OliverTrautvetter July 1, 2026 11:06

chore(docs): Auto-update docs and licenses

999debb

Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com>

OliverTrautvetter requested changes Jul 1, 2026

View reviewed changes

		// Returns [NotFound] if no plan with the given Id could be found
		// Returns [Duplicated] if no plan with the given Id could be found

Uh oh!

Conversation

DerBurri commented May 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

OliverTrautvetter left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

OliverTrautvetter left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

OliverTrautvetter left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

DerBurri commented May 13, 2026 •

edited

Loading