[IDENTITY-6268] Re-add scim-enabled flag to org CLI commands - #3479
[IDENTITY-6268] Re-add scim-enabled flag to org CLI commands#3479Amelia Dong (ameliadong97) wants to merge 2 commits into
Conversation
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.
|
🎉 All Contributor License Agreements have been signed. Ready to merge. |
There was a problem hiding this comment.
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-enabledtoconfluent organization update, mirroring the existingjit-enabledpattern. - Surfaces
SCIM Enabledinorganization describe/list/updatehuman + JSON outputs. - Pins
github.com/confluentinc/ccloud-sdk-go-v2/orgto 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.
|
Local test: |
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.
|




Release Notes
New Features
scim-enabledflag toconfluent organization update(confluent organization describe/listnow also surfaceSCIM Enabled).What
Applies to: Confluent Cloud only
#3236 originally added this and was merged, then reverted in #3372.
This PR:
ccloud-sdk-go-v2/orgback to v0.13.0 (the last version with SCIM support) viago.mod/go.sum.scim-enabledflag against the current generatedorganizationcommand structure (post [APIE-1094] Migrate the confluent organization commands excluding the integration test #3431 migration), mirroring the existingjit-enabledpattern.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-enabledand the newSCIM Enabledcolumn, 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, includingorganization update --help)References