Skip to content

Commit 6695e64

Browse files
committed
update golden files
1 parent 4c7add9 commit 6695e64

File tree

3 files changed

+39
-0
lines changed

3 files changed

+39
-0
lines changed

cli/testdata/coder_server_--help.golden

+13
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,11 @@ OIDC OPTIONS:
433433
groups. This filter is applied after the group mapping and before the
434434
regex filter.
435435

436+
--oidc-organization-assign-default bool, $CODER_OIDC_ORGANIZATION_ASSIGN_DEFAULT (default: true)
437+
If set to true, users will always be added to the default
438+
organization. If organization sync is enabled, then the default org is
439+
always added to the user's set of expectedorganizations.
440+
436441
--oidc-auth-url-params struct[map[string]string], $CODER_OIDC_AUTH_URL_PARAMS (default: {"access_type": "offline"})
437442
OIDC auth URL parameters to pass to the upstream provider.
438443

@@ -479,6 +484,14 @@ OIDC OPTIONS:
479484
--oidc-name-field string, $CODER_OIDC_NAME_FIELD (default: name)
480485
OIDC claim field to use as the name.
481486

487+
--oidc-organization-field string, $CODER_OIDC_ORGANIZATION_FIELD
488+
This field must be set if using the organization sync feature. Set to
489+
the claim to be used for organizations.
490+
491+
--oidc-organization-mapping struct[map[string][]uuid.UUID], $CODER_OIDC_ORGANIZATION_MAPPING (default: {})
492+
A map of OIDC claims and the organizations in Coder it should map to.
493+
This is required because organization IDs must be used within Coder.
494+
482495
--oidc-group-regex-filter regexp, $CODER_OIDC_GROUP_REGEX_FILTER (default: .*)
483496
If provided any group name not matching the regex is ignored. This
484497
allows for filtering out groups that are not needed. This filter is

cli/testdata/server-config.yaml.golden

+13
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,19 @@ oidc:
319319
# Ignore the userinfo endpoint and only use the ID token for user information.
320320
# (default: false, type: bool)
321321
ignoreUserInfo: false
322+
# This field must be set if using the organization sync feature. Set to the claim
323+
# to be used for organizations.
324+
# (default: <unset>, type: string)
325+
organizationField: ""
326+
# If set to true, users will always be added to the default organization. If
327+
# organization sync is enabled, then the default org is always added to the user's
328+
# set of expectedorganizations.
329+
# (default: true, type: bool)
330+
organizationAssignDefault: true
331+
# A map of OIDC claims and the organizations in Coder it should map to. This is
332+
# required because organization IDs must be used within Coder.
333+
# (default: {}, type: struct[map[string][]uuid.UUID])
334+
organizationMapping: {}
322335
# This field must be set if using the group sync feature and the scope name is not
323336
# 'groups'. Set to the claim to be used for groups.
324337
# (default: <unset>, type: string)

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

+13
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,11 @@ OIDC OPTIONS:
434434
groups. This filter is applied after the group mapping and before the
435435
regex filter.
436436

437+
--oidc-organization-assign-default bool, $CODER_OIDC_ORGANIZATION_ASSIGN_DEFAULT (default: true)
438+
If set to true, users will always be added to the default
439+
organization. If organization sync is enabled, then the default org is
440+
always added to the user's set of expectedorganizations.
441+
437442
--oidc-auth-url-params struct[map[string]string], $CODER_OIDC_AUTH_URL_PARAMS (default: {"access_type": "offline"})
438443
OIDC auth URL parameters to pass to the upstream provider.
439444

@@ -480,6 +485,14 @@ OIDC OPTIONS:
480485
--oidc-name-field string, $CODER_OIDC_NAME_FIELD (default: name)
481486
OIDC claim field to use as the name.
482487

488+
--oidc-organization-field string, $CODER_OIDC_ORGANIZATION_FIELD
489+
This field must be set if using the organization sync feature. Set to
490+
the claim to be used for organizations.
491+
492+
--oidc-organization-mapping struct[map[string][]uuid.UUID], $CODER_OIDC_ORGANIZATION_MAPPING (default: {})
493+
A map of OIDC claims and the organizations in Coder it should map to.
494+
This is required because organization IDs must be used within Coder.
495+
483496
--oidc-group-regex-filter regexp, $CODER_OIDC_GROUP_REGEX_FILTER (default: .*)
484497
If provided any group name not matching the regex is ignored. This
485498
allows for filtering out groups that are not needed. This filter is

0 commit comments

Comments
 (0)