Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Amelia Dong (ameliadong97) wants to merge 2 commits into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04d53c4
[IDENTITY-6268] Re-add scim-enabled flag to org CLI commands
ameliadong97 Aug 27, 2026
0082862
Bump ccloud-sdk-go-v2/org to v0.15.0
ameliadong97 Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cmd/lint/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ var vocabWords = []string{
"savepoints",
"scala",
"schemas",
"scim",
"server",
"signup",
"siv",
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/confluentinc/cli/v4

go 1.26.5
go 1.26.7

require (
github.com/antihax/optional v1.0.0
Expand Down Expand Up @@ -45,7 +45,7 @@ require (
github.com/confluentinc/ccloud-sdk-go-v2/networking-gateway v0.7.0
github.com/confluentinc/ccloud-sdk-go-v2/networking-ip v0.2.0
github.com/confluentinc/ccloud-sdk-go-v2/networking-privatelink v0.3.0
github.com/confluentinc/ccloud-sdk-go-v2/org v0.14.0
github.com/confluentinc/ccloud-sdk-go-v2/org v0.15.0
github.com/confluentinc/ccloud-sdk-go-v2/provider-integration v0.2.0
github.com/confluentinc/ccloud-sdk-go-v2/rtce v0.1.0
github.com/confluentinc/ccloud-sdk-go-v2/service-quota v0.2.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ github.com/confluentinc/ccloud-sdk-go-v2/networking-ip v0.2.0 h1:ZHNF2DeqVlNPuKG
github.com/confluentinc/ccloud-sdk-go-v2/networking-ip v0.2.0/go.mod h1:KTShFBZA7WG8LcxlWjJpoZFdWkJ+uOw3dDuwAHs5eKU=
github.com/confluentinc/ccloud-sdk-go-v2/networking-privatelink v0.3.0 h1:mC0E1nKUt57AxMM4Lpdfd+KA/YZwJVwro9ER+dCUFi8=
github.com/confluentinc/ccloud-sdk-go-v2/networking-privatelink v0.3.0/go.mod h1:GIHF2cYOUKx+6ycYokr4i8E4cuNBC22xqvO/IhqZ31U=
github.com/confluentinc/ccloud-sdk-go-v2/org v0.14.0 h1:n+4lb+CFCExljsp4Goyb4JTDL/UibGUhT0k++5JNhw8=
github.com/confluentinc/ccloud-sdk-go-v2/org v0.14.0/go.mod h1:z+7wtFzDczbMGda7AG7w14BGE3pQSjaFYhNbvkZAlOs=
github.com/confluentinc/ccloud-sdk-go-v2/org v0.15.0 h1:rbtGf2SFWjfXzgi+boRjYbARditK0GIfFPLS1baIy+c=
github.com/confluentinc/ccloud-sdk-go-v2/org v0.15.0/go.mod h1:VhKDWY80oJi+YPMsE0Wq5e5VBt6kRvl//Ez790tuKO0=
github.com/confluentinc/ccloud-sdk-go-v2/provider-integration v0.2.0 h1:UN2a+aqYhk95ro+wVLkeB/8W7n+UV2KsE3jNFbbDCSw=
github.com/confluentinc/ccloud-sdk-go-v2/provider-integration v0.2.0/go.mod h1:TzompS9F0G6awN5xMC+nguNG8ULElN5UqX2XOBOIPuM=
github.com/confluentinc/ccloud-sdk-go-v2/rtce v0.1.0 h1:OBa2vm09bOG1oojOP1vNj8V7+M2AfUkYP1sRQ+xlRm4=
Expand Down
18 changes: 10 additions & 8 deletions internal/organization/command.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions internal/organization/command_list.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions internal/organization/command_update.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion test/fixtures/output/organization/describe-json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"is_current": true,
"id": "abc-123",
"name": "default",
"jit_enabled": true
"jit_enabled": true,
"scim_enabled": true
}
13 changes: 7 additions & 6 deletions test/fixtures/output/organization/describe.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
+-------------+---------+
| Current | true |
| ID | abc-123 |
| Name | default |
| JIT Enabled | true |
+-------------+---------+
+--------------+---------+
| Current | true |
| ID | abc-123 |
| Name | default |
| JIT Enabled | true |
| SCIM Enabled | true |
+--------------+---------+
9 changes: 6 additions & 3 deletions test/fixtures/output/organization/list-json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,21 @@
"is_current": true,
"id": "abc-123",
"name": "org1",
"jit_enabled": true
"jit_enabled": true,
"scim_enabled": true
},
{
"is_current": false,
"id": "abc-456",
"name": "org2",
"jit_enabled": true
"jit_enabled": true,
"scim_enabled": false
},
{
"is_current": false,
"id": "abc-789",
"name": "org3",
"jit_enabled": true
"jit_enabled": true,
"scim_enabled": true
}
]
10 changes: 5 additions & 5 deletions test/fixtures/output/organization/list.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Current | ID | Name | JIT Enabled
----------+---------+------+--------------
* | abc-123 | org1 | true
| abc-456 | org2 | true
| abc-789 | org3 | true
Current | ID | Name | JIT Enabled | SCIM Enabled
----------+---------+------+-------------+---------------
* | abc-123 | org1 | true | true
| abc-456 | org2 | true | false
| abc-789 | org3 | true | true
1 change: 1 addition & 0 deletions test/fixtures/output/organization/update-help.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Usage:
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")

Expand Down
3 changes: 2 additions & 1 deletion test/fixtures/output/organization/update-json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"is_current": true,
"id": "abc-123",
"name": "default-updated",
"jit_enabled": true
"jit_enabled": true,
"scim_enabled": true
}
13 changes: 7 additions & 6 deletions test/fixtures/output/organization/update.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
Updated organization "abc-123".
+-------------+-----------------+
| Current | true |
| ID | abc-123 |
| Name | default-updated |
| JIT Enabled | true |
+-------------+-----------------+
+--------------+-----------------+
| Current | true |
| ID | abc-123 |
| Name | default-updated |
| JIT Enabled | true |
| SCIM Enabled | true |
+--------------+-----------------+
7 changes: 4 additions & 3 deletions test/test-server/org_handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ func handleOrgOrganization(t *testing.T) http.HandlerFunc {
Id: orgv2.PtrString(id),
DisplayName: orgv2.PtrString(displayName),
JitEnabled: orgv2.PtrBool(true),
ScimEnabled: orgv2.PtrBool(true),
}
Comment thread
ameliadong97 marked this conversation as resolved.
err := json.NewEncoder(w).Encode(organization)
require.NoError(t, err)
Expand All @@ -155,9 +156,9 @@ func handleOrgOrganizations(t *testing.T) http.HandlerFunc {
switch r.Method {
case http.MethodGet:
organizationList := &orgv2.OrgV2OrganizationList{Data: []orgv2.OrgV2Organization{
{Id: orgv2.PtrString("abc-123"), DisplayName: orgv2.PtrString("org1"), JitEnabled: orgv2.PtrBool(true)},
{Id: orgv2.PtrString("abc-456"), DisplayName: orgv2.PtrString("org2"), JitEnabled: orgv2.PtrBool(true)},
{Id: orgv2.PtrString("abc-789"), DisplayName: orgv2.PtrString("org3"), JitEnabled: orgv2.PtrBool(true)},
{Id: orgv2.PtrString("abc-123"), DisplayName: orgv2.PtrString("org1"), JitEnabled: orgv2.PtrBool(true), ScimEnabled: orgv2.PtrBool(true)},
{Id: orgv2.PtrString("abc-456"), DisplayName: orgv2.PtrString("org2"), JitEnabled: orgv2.PtrBool(true), ScimEnabled: orgv2.PtrBool(false)},
{Id: orgv2.PtrString("abc-789"), DisplayName: orgv2.PtrString("org3"), JitEnabled: orgv2.PtrBool(true), ScimEnabled: orgv2.PtrBool(true)},
}}
setPageToken(organizationList, &organizationList.Metadata, r.URL)
err := json.NewEncoder(w).Encode(organizationList)
Expand Down