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

* add list organizations command Signed-off-by: Maximilian <burr.maximilian97@gmail.com> * chore(docs): Auto-update docs and licenses Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian <burr.maximilian97@gmail.com> * feat(test): removed old code Signed-off-by: Maximilian <burr.maximilian97@gmail.com> * feat(test): add coverage report Signed-off-by: Maximilian <burr.maximilian97@gmail.com> * add missing err checks for stdout closing 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> Co-authored-by: DerBurri <7892993+DerBurri@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>

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

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

OliverTrautvetter

Nice feature, some comments for it 👍

OliverTrautvetter · 2026-06-03T09:32:07Z

+		return orgId
+	}
+	return ""
 }


Why? It is like
if true return true
Maybe log something before return "" that CS_ORG_ID is not set

OliverTrautvetter · 2026-06-03T09:37:46Z

+	if orgId == "" {
+		return "", nil
 	}


why is it no longer an error?

OliverTrautvetter · 2026-06-03T09:42:18Z

+		cmd: &cobra.Command{
+			Use:   "add",
+			Short: "Add team member",
+			Long:  `Add team member to a team`,
+		},


please add some Example: formatExamples

OliverTrautvetter · 2026-06-03T09:42:33Z

+	t := CreateTeamCmd{
+		cmd: &cobra.Command{
+			Use:   "create",
+			Short: "Create team",
+			Long:  `Create a team in Codesphere or an Organization`,
+		},


please add some Example: formatExamples

OliverTrautvetter · 2026-06-03T09:42:43Z

+	t := RemoveTeamCmd{
+		cmd: &cobra.Command{
+			Use:   "remove",
+			Short: "Remove team",
+			Long:  `Remove a team from Codesphere or an Organization`,
+		},


please add some Example: formatExamples

OliverTrautvetter · 2026-06-03T10:14:00Z

+		ClientFactory: NewClient,
+	}
+	t.cmd.RunE = t.RunE
+	t.cmd.Flags().StringVarP(&t.Opts.Name, "name", "n", "", "Team name")


name flag should be MarkFlagRequired too

OliverTrautvetter · 2026-06-03T10:15:56Z

+		ClientFactory: NewClient,
+	}
+	t.cmd.RunE = t.RunE
+	t.cmd.Flags().StringVarP(&t.Opts.name, "name", "n", "", "Team name")


name is not used?

OliverTrautvetter · 2026-06-03T10:20:19Z

+
+	teamId, err := c.Opts.GetTeamId()
+	if err != nil {
+		return errors.New("team ID not set, use -T or CS_TEAM_ID to set it")


-t not -T, right?

OliverTrautvetter · 2026-06-03T10:22:00Z

+		},
+		ClientFactory: NewClient,
+	}
+	res.cmd.Flags().IntVarP(&res.Opts.UserId, "user", "u", 0, "Team member user ID")


MarkFlagRequired

OliverTrautvetter · 2026-06-03T10:23:29Z

+}
+
+func (c *RemoveTeamMemberCmd) RemoveTeamMember(client Client, teamId int, userId int) error {
+	if userId == 0 {


can userId be -1? Maybe we should check if <= 0 -> error

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

DerBurri and others added 14 commits June 3, 2026 10:20

add list organizations command

f47c61b

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

feat(test): removed old code

9c8b8fe

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

add missing err checks for stdout closing

c2605ec

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

chore(docs): Auto-update docs and licenses

ee5b057

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

18fbe23

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

feat(cli):

25538c5

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

chore(docs): Auto-update docs and licenses

c60dc46

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

chore(lint): removed unused orgId field in createTeamOpts

d6093d3

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

add logic seperation for teams and org teams

5978c1d

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

add unit tests for team creation

b2dac57

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

updated openapi client

3976207

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

add team management features

a513836

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

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 added 2 commits June 3, 2026 10:23

Merge branch 'main' into add-organization-api

91ec2a2

refactor: update organization ID handling in team commands

a58b8eb

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

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

chore(docs): Auto-update docs and licenses

00c60bf

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

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(cli) Add All missing features of the Organizations API#263

feat(cli) Add All missing features of the Organizations API#263
DerBurri wants to merge 17 commits into
mainfrom
add-organization-api

DerBurri commented May 13, 2026 •

edited

Loading

Uh oh!

OliverTrautvetter left a comment

Uh oh!

OliverTrautvetter Jun 3, 2026

Uh oh!

OliverTrautvetter Jun 3, 2026

Uh oh!

OliverTrautvetter Jun 3, 2026

Uh oh!

OliverTrautvetter Jun 3, 2026

Uh oh!

OliverTrautvetter Jun 3, 2026

Uh oh!

OliverTrautvetter Jun 3, 2026

Uh oh!

OliverTrautvetter Jun 3, 2026

Uh oh!

OliverTrautvetter Jun 3, 2026

Uh oh!

OliverTrautvetter Jun 3, 2026

Uh oh!

OliverTrautvetter Jun 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

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!

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!

2 participants

DerBurri commented May 13, 2026 •

edited

Loading