Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0c51f58

Browse files
committed
fixup! feat(enterprise/scim): add support for multi-organization
1 parent55a3361 commit0c51f58

File tree

10 files changed

+35
-11
lines changed

10 files changed

+35
-11
lines changed

‎cli/testdata/coder_server_--help.golden‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -624,9 +624,8 @@ These options are only available in the Enterprise Edition.
624624
Enables SCIM and sets the authentication header for the built-in SCIM
625625
server. New users are automatically created with OIDC authentication.
626626

627-
--scim-organization string, $CODER_SCIM_ORGANIZATION (default: default)
628-
Enables SCIM and sets the authentication header for the built-in SCIM
629-
server. New users are automatically created with OIDC authentication.
627+
--scim-organization-name string, $CODER_SCIM_ORGANIZATION_NAME (default: default)
628+
Specifies the organization name to create new SCIM users in.
630629

631630
———
632631
Run `coder --help` for a list of global options.

‎cli/testdata/server-config.yaml.golden‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,9 @@ sshKeygenAlgorithm: ed25519
448448
# URL to use for agent troubleshooting when not set in the template.
449449
# (default: https://coder.com/docs/templates/troubleshooting, type: url)
450450
agentFallbackTroubleshootingURL: https://coder.com/docs/templates/troubleshooting
451+
# Specifies the organization name to create new SCIM users in.
452+
# (default: default, type: string)
453+
scimOrganizationName: default
451454
# Disable workspace apps that are not served from subdomains. Path-based apps can
452455
# make requests to the Coder API and pose a security risk when the workspace
453456
# serves malicious JavaScript. This is recommended for security purposes if a

‎coderd/apidoc/docs.go‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎codersdk/deployment.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2164,13 +2164,14 @@ when required by your organization's security policy.`,
21642164
Value:&c.SCIMAPIKey,
21652165
},
21662166
{
2167-
Name:"SCIM Organization",
2168-
Description:"Enables SCIM and setstheauthentication header for the built-in SCIMserver. Newusersare automatically created with OIDC authentication.",
2169-
Flag:"scim-organization",
2170-
Env:"CODER_SCIM_ORGANIZATION",
2171-
Annotations: serpent.Annotations{}.Mark(annotationEnterpriseKey,"true").Mark(annotationSecretKey,"true"),
2167+
Name:"SCIM Organization Name",
2168+
Description:"Specifiestheorganization name to create new SCIM usersin.",
2169+
Flag:"scim-organization-name",
2170+
Env:"CODER_SCIM_ORGANIZATION_NAME",
2171+
Annotations: serpent.Annotations{}.Mark(annotationEnterpriseKey,"true"),
21722172
Value:&c.SCIMOrganization,
21732173
Default:"default",
2174+
YAML:"scimOrganizationName",
21742175
},
21752176
{
21762177
Name:"External Token Encryption Keys",

‎docs/reference/api/general.md‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎docs/reference/api/schemas.md‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎docs/reference/cli/server.md‎

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎enterprise/cli/testdata/coder_server_--help.golden‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -625,9 +625,8 @@ These options are only available in the Enterprise Edition.
625625
Enables SCIM and sets the authentication header for the built-in SCIM
626626
server. New users are automatically created with OIDC authentication.
627627

628-
--scim-organization string, $CODER_SCIM_ORGANIZATION (default: default)
629-
Enables SCIM and sets the authentication header for the built-in SCIM
630-
server. New users are automatically created with OIDC authentication.
628+
--scim-organization-name string, $CODER_SCIM_ORGANIZATION_NAME (default: default)
629+
Specifies the organization name to create new SCIM users in.
631630

632631
———
633632
Run `coder --help` for a list of global options.

‎site/src/api/typesGenerated.ts‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp