Skip to content

[IDENTITY-6268] Re-add scim-enabled flag to org CLI commands - #3479

Open
Amelia Dong (ameliadong97) wants to merge 2 commits into
mainfrom
adong/restore-scim-enabled
Open

[IDENTITY-6268] Re-add scim-enabled flag to org CLI commands#3479
Amelia Dong (ameliadong97) wants to merge 2 commits into
mainfrom
adong/restore-scim-enabled

Conversation

@ameliadong97

@ameliadong97 Amelia Dong (ameliadong97) commented Aug 27, 2026

Copy link
Copy Markdown
Member

Release Notes

New Features

  • Re-added the scim-enabled flag to confluent organization update (confluent organization describe/list now also surface SCIM Enabled).

What

Applies to: Confluent Cloud only

#3236 originally added this and was merged, then reverted in #3372.

This PR:

A PR reverting ccloud-sdk-go-v2#368 is filed separately to restore SCIM support upstream; once merged and released, this can go back to tracking the latest org SDK version.

Blast Radius

Low impact — this only affects customers using confluent organization update --scim-enabled and the new SCIM Enabled column, and reintroduces already-reviewed behavior from #3236.

Test & Review

  • go build ./...
  • go test ./internal/organization/...
  • go test ./test/... -run 'TestCLI/TestOrganization$'
  • go test ./test/... -run 'TestCLI/TestHelp$' (full command-tree help goldens, including organization update --help)

References

PR #3236 added this and was merged, then reverted in #3372 because
main's ccloud-sdk-go-v2/org dependency had moved to v0.14.0, which
dropped ScimEnabled/ScimGroupEnabled and the SCIM token API entirely
(confluentinc/ccloud-sdk-go-v2#368). This pins org back to v0.13.0,
the last version with SCIM support, and re-applies the flag against
the current generated organization command structure. A PR reverting
ccloud-sdk-go-v2#368 is filed separately to restore SCIM upstream.
@ameliadong97
Amelia Dong (ameliadong97) requested a review from a team as a code owner August 27, 2026 18:44
Copilot AI lite review requested due to automatic review settings August 27, 2026 18:44
@confluent-cla-assistant

Copy link
Copy Markdown

🎉 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 AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR reintroduces SCIM support in the confluent organization command group by pinning ccloud-sdk-go-v2/org back to v0.13.0 (where ScimEnabled exists) and wiring --scim-enabled + SCIM Enabled output into the generated organization commands and integration-test fixtures.

Changes:

  • Re-adds --scim-enabled to confluent organization update, mirroring the existing jit-enabled pattern.
  • Surfaces SCIM Enabled in organization describe/list/update human + JSON outputs.
  • Pins github.com/confluentinc/ccloud-sdk-go-v2/org to v0.13.0 and updates mocks/goldens accordingly.

Reviewed changes

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

Show a summary per file
File Description
internal/organization/command.go Adds ScimEnabled to the organization output model and print path.
internal/organization/command_list.go Includes scim_enabled in list output rows.
internal/organization/command_update.go Adds --scim-enabled flag and PATCH request population when the flag is set.
test/test-server/org_handlers.go Updates mock org responses to include ScimEnabled values.
test/fixtures/output/organization/describe.golden Updates human describe output to include SCIM Enabled.
test/fixtures/output/organization/describe-json.golden Updates JSON describe output to include scim_enabled.
test/fixtures/output/organization/list.golden Updates human list output to include SCIM Enabled column.
test/fixtures/output/organization/list-json.golden Updates JSON list output to include scim_enabled.
test/fixtures/output/organization/update.golden Updates human update output to include SCIM Enabled.
test/fixtures/output/organization/update-json.golden Updates JSON update output to include scim_enabled.
test/fixtures/output/organization/update-help.golden Updates help output to include the --scim-enabled flag.
go.mod Pins ccloud-sdk-go-v2/org dependency to v0.13.0.
go.sum Updates sums for the pinned org module version.
cmd/lint/main.go Adds scim to the CLI spellcheck vocabulary.
Files not reviewed (3)
  • internal/organization/command.go: Generated file
  • internal/organization/command_list.go: Generated file
  • internal/organization/command_update.go: Generated file

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread test/test-server/org_handlers.go
Comment thread internal/organization/command_update.go
@ameliadong97

Amelia Dong (ameliadong97) commented Aug 27, 2026

Copy link
Copy Markdown
Member Author

Local test:

> confluent organization describe
+--------------+--------------------------------------+
| Current      | true                                 |
| ID           | 9a8d9d15-2f12-4e87-86b8-36b44988cc9a |
| Name         | Confluent | test                     |
| JIT Enabled  | true                                 |
| SCIM Enabled | true                                 |
+--------------+--------------------------------------+

> confluent organization update --scim-enabled=false
Updated organization "9a8d9d15-2f12-4e87-86b8-36b44988cc9a".
+--------------+--------------------------------------+
| Current      | true                                 |
| ID           | 9a8d9d15-2f12-4e87-86b8-36b44988cc9a |
| Name         | Confluent | test                     |
| JIT Enabled  | true                                 |
| SCIM Enabled | false                                |
+--------------+--------------------------------------+

> confluent organization update --scim-enabled=true
Updated organization "9a8d9d15-2f12-4e87-86b8-36b44988cc9a".
+--------------+--------------------------------------+
| Current      | true                                 |
| ID           | 9a8d9d15-2f12-4e87-86b8-36b44988cc9a |
| Name         | Confluent | test                     |
| JIT Enabled  | true                                 |
| SCIM Enabled | true                                 |
+--------------+--------------------------------------+

> confluent organization describe -o json
{
  "is_current": true,
  "id": "9a8d9d15-2f12-4e87-86b8-36b44988cc9a",
  "name": "Confluent | test",
  "jit_enabled": true,
  "scim_enabled": true
}

// If add-on is not enabled:
> confluent organization update --scim-enabled=true
Error: SCIM requires the Advanced Security addon

Suggestions:
    List available organizations with `confluent organization list`.

> confluent organization update --help
Update the current organization.

Usage:
  confluent organization update [flags]

Flags:
      --name string      Name of the Confluent Cloud organization.
      --jit-enabled      Toggle Just-In-Time (JIT) user provisioning for SSO-enabled organizations.
      --scim-enabled     Toggle System for Cross-domain Identity Management (SCIM) user provisioning for SSO-enabled organizations.
      --context string   CLI context name.
  -o, --output string    Specify the output format as "human", "json", or "yaml". (default "human")

Global Flags:
  -h, --help            Show help for this command.
      --unsafe-trace    Equivalent to -vvvv, but also log HTTP requests and responses which might contain plaintext secrets.
  -v, --verbose count   Increase verbosity (-v for warn, -vv for info, -vvv for debug, -vvvv for trace).


Now that org/v0.15.0 is tagged (restoring SCIM support removed in
v0.14.0, cleaned up per confluentinc/ccloud-sdk-go-v2#377), move off
the v0.13.0 pin. Requires go 1.26.7, per org v0.15.0's own go.mod.
@sonarqube-confluent

Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants