[CLI-2354] Add `confluent organization use` command for org switching by ap00rv · Pull Request #3277 · confluentinc/cli

Apoorv Munshi (ap00rv) · 2026-03-10T20:58:47Z

Release Notes

Breaking Changes

PLACEHOLDER

New Features

switch orgs after login using confluent org use command. This automatically clears the env and clusters from current context.

Bug Fixes

PLACEHOLDER

Checklist

What

Problem :
Confluent CLI did not have feature to switch orgs after logging in. To switch orgs, one had to re-login using the --organization flag

A new org use command allows users in multiple organizations to switch between them without re-logging in (Confluent cloud only). The command refreshes the org-scoped JWT using the existing user-scoped refresh token, clears environment and Kafka cluster state, and performs full rollback on failure.

Blast Radius

References

Test & Review

confluent-cla-assistant · 2026-03-10T20:58:58Z

🎉 All Contributor License Agreements have been signed. Ready to merge.
_{Please push an empty commit if you would like to re-run the checks to verify CLA status for all contributors.}

Copilot

Pull request overview

Adds support for switching Confluent Cloud organizations within an existing login session by introducing confluent organization use <id>. This fits into the CLI’s organization management commands and relies on refreshing an org-scoped JWT using the existing refresh token while clearing org-scoped local state.

Changes:

Added organization use <id> command with autocomplete suggestions and not-found handling.
Introduced Context.SwitchOrganization() to refresh tokens and clear environment/Kafka cluster selections with rollback on refresh failure.
Added unit + integration coverage and updated golden fixtures/help output for the new command.

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
`internal/organization/command.go`	Registers the new `use` subcommand under `organization`.
`internal/organization/command_use.go`	Implements `organization use` execution and shell completion suggestions.
`pkg/config/context.go`	Adds `SwitchOrganization()` for token refresh + clearing org-scoped state.
`pkg/config/context_test.go`	Adds unit tests for switching orgs, clearing state, and rollback behavior.
`test/organization_test.go`	Adds CLI integration tests for `organization use` and not-found behavior.
`test/fixtures/output/organization/use.golden`	Golden output for successful org switch message.
`test/fixtures/output/organization/use-not-found.golden`	Golden output for org not found / forbidden error path.
`test/fixtures/output/organization/use-help.golden`	Golden help output for the new subcommand (covered via recursive help tests).
`test/fixtures/output/organization/help.golden`	Updates `organization` command help to include the new `use` command.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-10T21:07:07Z

pkg/config/context.go

+	previousOrgId := c.LastOrgId
+	previousAuthToken := c.State.AuthToken
+	previousRefreshToken := c.State.AuthRefreshToken
+
+	// Set the target org before refreshing so RefreshSession picks it up
+	// via GetCurrentOrganization().
+	c.LastOrgId = orgId
+
+	if err := c.RefreshSession(client); err != nil {
+		c.LastOrgId = previousOrgId
+		c.State.AuthToken = previousAuthToken
+		c.State.AuthRefreshToken = previousRefreshToken
+		return err
+	}
+
+	// Clear all environment-scoped state: environments and Kafka clusters
+	// belong to a specific org, so stale IDs from the previous org must not
+	// leak into the new context.
+	c.CurrentEnvironment = ""
+	c.Environments = map[string]*EnvironmentContext{}
+	if c.KafkaClusterContext != nil {
+		c.KafkaClusterContext.ActiveKafkaCluster = ""
+		c.KafkaClusterContext.ActiveKafkaClusterEndpoint = ""
+		c.KafkaClusterContext.KafkaClusterConfigs = map[string]*KafkaClusterConfig{}
+		c.KafkaClusterContext.KafkaEnvContexts = map[string]*KafkaEnvContext{}
+	}


SwitchOrganization updates Context.LastOrgId but does not update/clear c.State.Auth.Organization (or related org-scoped auth metadata). After a successful switch, GetCurrentOrganization() and GetOrganization() can diverge, and org suspension checks (Config.isOrgSuspended / isLoginBlockedByOrgSuspension) may still evaluate using the previous org’s suspension status. Consider updating the in-memory AuthConfig to reflect the new org (or clearing it and forcing a refresh) and include it in the rollback path if RefreshSession fails.

Copilot · 2026-03-10T21:07:07Z

pkg/config/context_test.go

+
+	require.Equal(t, newOrgId, ctx.LastOrgId)
+	require.Equal(t, newToken, ctx.State.AuthToken)
+	require.Equal(t, newRefreshToken, ctx.State.AuthRefreshToken)


The new SwitchOrganization unit tests assert token/org ID changes and that environment/Kafka maps are cleared, but they don’t verify that org-scoped auth metadata is updated (e.g., ctx.State.Auth.Organization.ResourceId) or cleared. Adding assertions for this would prevent regressions where the context switches org IDs but still reports/uses the previous organization in suspension checks or other metadata paths.

Suggested change

require.Equal(t, newRefreshToken, ctx.State.AuthRefreshToken)

require.Equal(t, newRefreshToken, ctx.State.AuthRefreshToken)

// Ensure org-scoped auth metadata is updated to reflect the new organization.

require.NotNil(t, ctx.State.Auth)

require.NotNil(t, ctx.State.Auth.Organization)

require.Equal(t, newOrgId, ctx.State.Auth.Organization.ResourceId)

Allow users in multiple organizations to switch between them without re-logging in. The command refreshes the org-scoped JWT using the existing user-scoped refresh token, clears environment and Kafka cluster state, and performs full rollback on failure. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Replace GetOrgOrganization (GET by ID) with ListOrgOrganizations (list) for validation in the use command, since the org-scoped JWT only allows reading the current org. Add integration test for already-active org path to increase coverage. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

sonarqube-confluent · 2026-03-14T00:24:29Z

Quality Gate failed

Failed conditions
78.8% Coverage on New Code (required ≥ 80%)

See analysis details on SonarQube

Copilot AI review requested due to automatic review settings March 10, 2026 20:58

Copilot started reviewing on behalf of Apoorv Munshi (ap00rv) March 10, 2026 20:59 View session

Copilot AI reviewed Mar 10, 2026

View reviewed changes

Apoorv Munshi (ap00rv) and others added 2 commits March 13, 2026 16:22

airlock-confluentinc bot force-pushed the apoorvmunshi/organization-use-command branch from 2a4f2c9 to b182a62 Compare March 13, 2026 23:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CLI-2354] Add `confluent organization use` command for org switching#3277

[CLI-2354] Add `confluent organization use` command for org switching#3277
Apoorv Munshi (ap00rv) wants to merge 2 commits intomainfrom
apoorvmunshi/organization-use-command

Apoorv Munshi (ap00rv) commented Mar 10, 2026 •

edited

Loading

Uh oh!

confluent-cla-assistant bot commented Mar 10, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Mar 10, 2026

Uh oh!

Copilot AI Mar 10, 2026

Uh oh!

sonarqube-confluent bot commented Mar 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

-	require.Equal(t, newRefreshToken, ctx.State.AuthRefreshToken)
+	require.Equal(t, newRefreshToken, ctx.State.AuthRefreshToken)
+	// Ensure org-scoped auth metadata is updated to reflect the new organization.
+	require.NotNil(t, ctx.State.Auth)
+	require.NotNil(t, ctx.State.Auth.Organization)
+	require.Equal(t, newOrgId, ctx.State.Auth.Organization.ResourceId)

Conversation

Apoorv Munshi (ap00rv) commented Mar 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Release Notes

Checklist

What

Blast Radius

References

Test & Review

Uh oh!

confluent-cla-assistant bot commented Mar 10, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

sonarqube-confluent bot commented Mar 14, 2026

Quality Gate failed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Apoorv Munshi (ap00rv) commented Mar 10, 2026 •

edited

Loading