Merge remote-tracking branch 'origin/main' into stevenmasley/oidc_rol…

…e_sync
coder · Emyrk · Jul 24, 2023 · Jul 19, 2023 · Jul 19, 2023 · Jul 19, 2023
commit 293a9b00cb0d051da3da473b72cddc58d1c45309
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -118,14 +118,15 @@ type Options struct {
 	RealIPConfig                   *httpmw.RealIPConfig
 	TrialGenerator                 func(ctx context.Context, email string) error
 	// TLSCertificates is used to mesh DERP servers securely.
-	TLSCertificates       []tls.Certificate
-	TailnetCoordinator    tailnet.Coordinator
-	DERPServer            *derp.Server
-	DERPMap               *tailcfg.DERPMap
-	SwaggerEndpoint       bool
-	SetUserGroups         func(ctx context.Context, tx database.Store, userID uuid.UUID, groupNames []string) error
-	SetUserSiteRoles      func(ctx context.Context, tx database.Store, userID uuid.UUID, roles []string) error
-	TemplateScheduleStore *atomic.Pointer[schedule.TemplateScheduleStore]
+	TLSCertificates             []tls.Certificate
+	TailnetCoordinator          tailnet.Coordinator
+	DERPServer                  *derp.Server
+	DERPMap                     *tailcfg.DERPMap
+	SwaggerEndpoint             bool
+	SetUserGroups               func(ctx context.Context, tx database.Store, userID uuid.UUID, groupNames []string) error
+	SetUserSiteRoles      func(ctx context.Context, tx database.Store, userID uuid.UUID, roles []string) error	
+	TemplateScheduleStore       *atomic.Pointer[schedule.TemplateScheduleStore]
+	UserQuietHoursScheduleStore *atomic.Pointer[schedule.UserQuietHoursScheduleStore]
 	// AppSecurityKey is the crypto key used to sign and encrypt tokens related to
 	// workspace applications. It consists of both a signing and encryption key.
 	AppSecurityKey     workspaceapps.SecurityKey
@@ -1105,7 +1106,7 @@ func (api *API) CreateInMemoryProvisionerDaemon(ctx context.Context, debounce ti
 }
 
 // nolint:revive
-func ReadExperiments(log slog.Logger, raw []string) codersdk.Experiments {
+func initExperiments(log slog.Logger, raw []string) codersdk.Experiments {
 	exps := make([]codersdk.Experiment, 0, len(raw))
 	for _, v := range raw {
 		switch v {