fixup compile issues

Emyrk · Emyrk · commit 721ae797c282 · 2024-08-28T09:39:25.000-05:00
diff --git a/cli/server.go b/cli/server.go
@@ -612,6 +612,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 					SSHConfigOptions: configSSHOptions,
 				},
 				AllowWorkspaceRenames: vals.AllowWorkspaceRenames.Value(),
+				Entitlements:          entitlements.New(),
 				NotificationsEnqueuer: notifications.NewNoopEnqueuer(), // Changed further down if notifications enabled.
 			}
 			if httpServers.TLSConfig != nil {
@@ -674,7 +675,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 				// Missing:
 				//	- Userinfo
 				//	- Verify
-				oc, err := createOIDCConfig(ctx, options.Logger, vals)
+				oc, err := createOIDCConfig(ctx, options.Logger, options.Entitlements, vals)
 				if err != nil {
 					return xerrors.Errorf("create oidc config: %w", err)
 				}
diff --git a/coderd/idpsync/idpsync.go b/coderd/idpsync/idpsync.go
@@ -22,7 +22,9 @@ import (
 // So instead, if the code is compiled with the enterprise logic, it will
 // override this function to return the enterprise IDP sync object.
 // For unit testing, the callers can specifically choose which "NewSync" to use.
-var NewSync = NewAGPLSync
+var NewSync = func(logger slog.Logger, entitlements *entitlements.Set, settings SyncSettings) IDPSync {
+	return NewAGPLSync(logger, entitlements, settings)
+}
 
 type IDPSync interface {
 	// ParseOrganizationClaims takes claims from an OIDC provider, and returns the
@@ -54,7 +56,7 @@ type SyncSettings struct {
 	OrganizationAssignDefault bool
 }
 
-func NewAGPLSync(logger slog.Logger, _ *entitlements.Set, settings SyncSettings) IDPSync {
+func NewAGPLSync(logger slog.Logger, _ *entitlements.Set, settings SyncSettings) *AGPLIDPSync {
 	return &AGPLIDPSync{
 		Logger:       logger.Named("idp-sync"),
 		SyncSettings: settings,
diff --git a/enterprise/coderd/enidpsync/enidpsync.go b/enterprise/coderd/enidpsync/enidpsync.go
@@ -8,17 +8,19 @@ import (
 )
 
 func init() {
-	idpsync.NewSync = NewSync
+	idpsync.NewSync = func(logger slog.Logger, entitlements *entitlements.Set, settings idpsync.SyncSettings) idpsync.IDPSync {
+		return NewSync(logger, entitlements, settings)
+	}
 }
 
 type EnterpriseIDPSync struct {
 	entitlements *entitlements.Set
 	*idpsync.AGPLIDPSync
 }
 
-func NewSync(logger slog.Logger, entitlements *entitlements.Set, settings idpsync.SyncSettings) idpsync.IDPSync {
+func NewSync(logger slog.Logger, entitlements *entitlements.Set, settings idpsync.SyncSettings) *EnterpriseIDPSync {
 	return &EnterpriseIDPSync{
 		entitlements: entitlements,
-		AGPLIDPSync:  idpsync.NewAGPLSync(logger, entitlements, settings),
+		AGPLIDPSync:  idpsync.NewAGPLSync(logger.With(slog.F("enterprise_capable", "true")), entitlements, settings),
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -8,17 +8,19 @@ import (`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func init() {`
`11`		`- idpsync.NewSync = NewSync`
	`11`	`+ idpsync.NewSync = func(logger slog.Logger, entitlements *entitlements.Set, settings idpsync.SyncSettings) idpsync.IDPSync {`
	`12`	`+ return NewSync(logger, entitlements, settings)`
	`13`	`+ }`
`12`	`14`	`}`
`13`	`15`
`14`	`16`	`type EnterpriseIDPSync struct {`
`15`	`17`	`entitlements *entitlements.Set`
`16`	`18`	`*idpsync.AGPLIDPSync`
`17`	`19`	`}`
`18`	`20`
`19`		`-func NewSync(logger slog.Logger, entitlements *entitlements.Set, settings idpsync.SyncSettings) idpsync.IDPSync {`
	`21`	`+func NewSync(logger slog.Logger, entitlements entitlements.Set, settings idpsync.SyncSettings) EnterpriseIDPSync {`
`20`	`22`	`return &EnterpriseIDPSync{`
`21`	`23`	`entitlements: entitlements,`
`22`		`- AGPLIDPSync: idpsync.NewAGPLSync(logger, entitlements, settings),`
	`24`	`+ AGPLIDPSync: idpsync.NewAGPLSync(logger.With(slog.F("enterprise_capable", "true")), entitlements, settings),`
`23`	`25`	`}`
`24`	`26`	`}`