Commit97fd2a9

committed

some cleanup

1 parent66d5c0c commit97fd2a9Copy full SHA for 97fd2a9

File tree

+22

-5

lines changed

+22

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ import (`
`108`	`108`	`"github.com/coder/coder/v2/tailnet"`
`109`	`109`	`)`
`110`	`110`
`111`		`-funccreateOIDCConfig(ctx context.Context,logger slog.Logger,setentitlements.Set,valscodersdk.DeploymentValues) (*coderd.OIDCConfig,error) {`
	`111`	`+funccreateOIDCConfig(ctx context.Context,logger slog.Logger,valscodersdk.DeploymentValues) (coderd.OIDCConfig,error) {`
`112`	`112`	`ifvals.OIDC.ClientID=="" {`
`113`	`113`	`returnnil,xerrors.Errorf("OIDC client ID must be set!")`
`114`	`114`	`}`
`@@ -669,7 +669,7 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.`
`669`	`669`	`// Missing:`
`670`	`670`	`//- Userinfo`
`671`	`671`	`//- Verify`
`672`		`-oc,err:=createOIDCConfig(ctx,options.Logger,options.Entitlements,vals)`
	`672`	`+oc,err:=createOIDCConfig(ctx,options.Logger,vals)`
`673`	`673`	`iferr!=nil {`
`674`	`674`	`returnxerrors.Errorf("create oidc config: %w",err)`
`675`	`675`	`}`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -275,6 +275,8 @@ func New(options Options) API {`
`275`	`275`	`options.Entitlements=entitlements.New()`
`276`	`276`	`}`
`277`	`277`	`ifoptions.IDPSync==nil {`
	`278`	`+// If this is set in the options, it is probably the enterprise`
	`279`	`+// version of the code.`
`278`	`280`	`options.IDPSync=idpsync.NewAGPLSync(options.Logger, idpsync.SyncSettings{`
`279`	`281`	`OrganizationField:options.DeploymentValues.OIDC.OrganizationField.Value(),`
`280`	`282`	`OrganizationMapping:options.DeploymentValues.OIDC.OrganizationMapping.Value,`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,11 @@ import (`
`16`	`16`	`"github.com/coder/coder/v2/site"`
`17`	`17`	`)`
`18`	`18`
	`19`	`+// IDPSync is an interface, so we can implement this as AGPL and as enterprise,`
	`20`	`+// and just swap the underlying implementation.`
	`21`	`+// IDPSync exists to contain all the logic for mapping a user's external IDP`
	`22`	`+// claims to the internal representation of a user in Coder.`
	`23`	`+// TODO: Move group + role sync into this interface.`
`19`	`24`	`typeIDPSyncinterface {`
`20`	`25`	`// ParseOrganizationClaims takes claims from an OIDC provider, and returns the`
`21`	`26`	`// organization sync params for assigning users into organizations.`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`	`"github.com/stretchr/testify/require"`
`9`	`9`
`10`	`10`	`"cdr.dev/slog/sloggers/slogtest"`
`11`		`-"github.com/coder/coder/v2/coderd/entitlements"`
`12`	`11`	`"github.com/coder/coder/v2/coderd/idpsync"`
`13`	`12`	`"github.com/coder/coder/v2/testutil"`
`14`	`13`	`)`
`@@ -19,7 +18,7 @@ func TestParseOrganizationClaims(t *testing.T) {`
`19`	`18`	`t.Run("SingleOrgDeployment",func(t*testing.T) {`
`20`	`19`	`t.Parallel()`
`21`	`20`
`22`		`-s:=idpsync.NewAGPLSync(slogtest.Make(t,&slogtest.Options{}),entitlements.New(),idpsync.SyncSettings{`
	`21`	`+s:=idpsync.NewAGPLSync(slogtest.Make(t,&slogtest.Options{}), idpsync.SyncSettings{`
`23`	`22`	`OrganizationField:"",`
`24`	`23`	`OrganizationMapping:nil,`
`25`	`24`	`OrganizationAssignDefault:true,`
`@@ -39,7 +38,7 @@ func TestParseOrganizationClaims(t *testing.T) {`
`39`	`38`	`t.Parallel()`
`40`	`39`
`41`	`40`	`// AGPL has limited behavior`
`42`		`-s:=idpsync.NewAGPLSync(slogtest.Make(t,&slogtest.Options{}),entitlements.New(),idpsync.SyncSettings{`
	`41`	`+s:=idpsync.NewAGPLSync(slogtest.Make(t,&slogtest.Options{}), idpsync.SyncSettings{`
`43`	`42`	`OrganizationField:"orgs",`
`44`	`43`	`OrganizationMapping:map[string][]uuid.UUID{`
`45`	`44`	`"random": {uuid.New()},`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -1570,6 +1570,17 @@ when required by your organization's security policy.`,
`1570`	`1570`	`Group:&deploymentGroupOIDC,`
`1571`	`1571`	`YAML:"organizationAssignDefault",`
`1572`	`1572`	`},`
	`1573`	`+{`
	`1574`	`+Name:"OIDC Organization Sync Mapping",`
	`1575`	`+Description:"A map of OIDC claims and the organizations in Coder it should map to. "+`
	`1576`	`+"This is required because organization IDs must be used within Coder.",`
	`1577`	`+Flag:"oidc-organization-mapping",`
	`1578`	`+Env:"CODER_OIDC_ORGANIZATION_MAPPING",`
	`1579`	`+Default:"{}",`
	`1580`	`+Value:&c.OIDC.OrganizationMapping,`
	`1581`	`+Group:&deploymentGroupOIDC,`
	`1582`	`+YAML:"organizationMapping",`
	`1583`	`+},`
`1573`	`1584`	`{`
`1574`	`1585`	`Name:"OIDC Group Field",`
`1575`	`1586`	`Description:"This field must be set if using the group sync feature and the scope name is not 'groups'. Set to the claim to be used for groups.",`

Comments

(0)