stuff

coder · deansheather · Jul 20, 2023 · Jun 20, 2023 · Jun 20, 2023 · Jun 21, 2023
commit ede278e44b920529464d86a4d2548cc1d7815ca3
diff --git a/cli/testdata/coder_server_--help.golden b/cli/testdata/coder_server_--help.golden
@@ -371,6 +371,25 @@ telemetrywhen required by your organization's security policy.
           anonymized application tracing to help improve our product. Disabling
           telemetry also disables this option.
 
+[1mUser Quiet Hours Schedule Options[0m 
+Allow users to set quiet hours schedules each day for workspaces to avoid
+workspaces stopping during the day due to template max TTL.
+
+      --default-quiet-hours-schedule string, $CODER_QUIET_HOURS_DEFAULT_SCHEDULE
+          The default daily cron schedule applied to users that haven't set a
+          custom quiet hours schedule themselves. The quiet hours schedule
+          determines when workspaces will be force stopped due to the template's
+          max TTL, and will round the max TTL up to be within the user's quiet
+          hours window (or default). The format is the same as the standard cron
+          format, but the day-of-month, month and day-of-week must be *. Only
+          one hour and minute can be specified (ranges or comma separated values
+          are not supported).
+
+      --quiet-hours-window-duration duration, $CODER_QUIET_HOURS_WINDOW_DURATION (default: 4h0m0s)
+          The duration of quiet hours windows when triggered by cron. Workspaces
+          can only be stopped due to max TTL during this window. Must be at
+          least 1 hour.
+
 [1m⚠️ Dangerous Options[0m 
       --dangerous-allow-path-app-sharing bool, $CODER_DANGEROUS_ALLOW_PATH_APP_SHARING
           Allow workspace apps that are not served from subdomains to be shared.

diff --git a/cli/testdata/server-config.yaml.golden b/cli/testdata/server-config.yaml.golden
@@ -363,3 +363,19 @@ supportLinks: []
 # "tunnel.example.com".
 # (default: <unset>, type: string)
 wgtunnelHost: ""
+# Allow users to set quiet hours schedules each day for workspaces to avoid
+# workspaces stopping during the day due to template max TTL.
+userQuietHoursSchedule:
+  # The default daily cron schedule applied to users that haven't set a custom quiet
+  # hours schedule themselves. The quiet hours schedule determines when workspaces
+  # will be force stopped due to the template's max TTL, and will round the max TTL
+  # up to be within the user's quiet hours window (or default). The format is the
+  # same as the standard cron format, but the day-of-month, month and day-of-week
+  # must be *. Only one hour and minute can be specified (ranges or comma separated
+  # values are not supported).
+  # (default: <unset>, type: string)
+  defaultQuietHoursSchedule: ""
+  # The duration of quiet hours windows when triggered by cron. Workspaces can only
+  # be stopped due to max TTL during this window. Must be at least 1 hour.
+  # (default: 4h0m0s, type: duration)
+  quietHoursWindowDuration: 4h0m0s
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -2348,13 +2348,6 @@ func (q *querier) UpdateUserLinkedID(ctx context.Context, arg database.UpdateUse
 	return q.db.UpdateUserLinkedID(ctx, arg)
 }
 
-func (q *querier) UpdateUserQuietHoursSchedule(ctx context.Context, arg database.UpdateUserQuietHoursScheduleParams) (database.User, error) {
-	fetch := func(ctx context.Context, arg database.UpdateUserQuietHoursScheduleParams) (database.User, error) {
-		return q.db.GetUserByID(ctx, arg.ID)
-	}
-	return updateWithReturn(q.log, q.auth, fetch, q.db.UpdateUserQuietHoursSchedule)(ctx, arg)
-}
-
 func (q *querier) UpdateUserProfile(ctx context.Context, arg database.UpdateUserProfileParams) (database.User, error) {
 	u, err := q.db.GetUserByID(ctx, arg.ID)
 	if err != nil {
@@ -2366,6 +2359,13 @@ func (q *querier) UpdateUserProfile(ctx context.Context, arg database.UpdateUser
 	return q.db.UpdateUserProfile(ctx, arg)
 }
 
+func (q *querier) UpdateUserQuietHoursSchedule(ctx context.Context, arg database.UpdateUserQuietHoursScheduleParams) (database.User, error) {
+	fetch := func(ctx context.Context, arg database.UpdateUserQuietHoursScheduleParams) (database.User, error) {
+		return q.db.GetUserByID(ctx, arg.ID)
+	}
+	return updateWithReturn(q.log, q.auth, fetch, q.db.UpdateUserQuietHoursSchedule)(ctx, arg)
+}
+
 // UpdateUserRoles updates the site roles of a user. The validation for this function include more than
 // just a basic RBAC check.
 func (q *querier) UpdateUserRoles(ctx context.Context, arg database.UpdateUserRolesParams) (database.User, error) {

diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -4870,7 +4870,7 @@ func (q *fakeQuerier) UpdateUserLinkedID(_ context.Context, params database.Upda
 	return database.UserLink{}, sql.ErrNoRows
 }
 
-func (q *fakeQuerier) UpdateUserQuietHoursSchedule(_ context.Context, arg database.UpdateUserQuietHoursScheduleParams) (database.User, error) {
+func (q *fakeQuerier) UpdateUserProfile(_ context.Context, arg database.UpdateUserProfileParams) (database.User, error) {
 	if err := validateDatabaseType(arg); err != nil {
 		return database.User{}, err
 	}
@@ -4882,14 +4882,16 @@ func (q *fakeQuerier) UpdateUserQuietHoursSchedule(_ context.Context, arg databa
 		if user.ID != arg.ID {
 			continue
 		}
-		user.QuietHoursSchedule = arg.QuietHoursSchedule
+		user.Email = arg.Email
+		user.Username = arg.Username
+		user.AvatarURL = arg.AvatarURL
 		q.users[index] = user
 		return user, nil
 	}
 	return database.User{}, sql.ErrNoRows
 }
 
-func (q *fakeQuerier) UpdateUserProfile(_ context.Context, arg database.UpdateUserProfileParams) (database.User, error) {
+func (q *fakeQuerier) UpdateUserQuietHoursSchedule(_ context.Context, arg database.UpdateUserQuietHoursScheduleParams) (database.User, error) {
 	if err := validateDatabaseType(arg); err != nil {
 		return database.User{}, err
 	}
@@ -4901,9 +4903,7 @@ func (q *fakeQuerier) UpdateUserProfile(_ context.Context, arg database.UpdateUs
 		if user.ID != arg.ID {
 			continue
 		}
-		user.Email = arg.Email
-		user.Username = arg.Username
-		user.AvatarURL = arg.AvatarURL
+		user.QuietHoursSchedule = arg.QuietHoursSchedule
 		q.users[index] = user
 		return user, nil
 	}

diff --git a/coderd/database/dbmetrics/dbmetrics.go b/coderd/database/dbmetrics/dbmetrics.go
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go
diff --git a/...000130_user_quiet_hours_schedule.down.sql → ...000131_user_quiet_hours_schedule.down.sql b/...000130_user_quiet_hours_schedule.down.sql → ...000131_user_quiet_hours_schedule.down.sql
diff --git a/...s/000130_user_quiet_hours_schedule.up.sql → ...s/000131_user_quiet_hours_schedule.up.sql b/...s/000130_user_quiet_hours_schedule.up.sql → ...s/000131_user_quiet_hours_schedule.up.sql
diff --git a/coderd/database/querier.go b/coderd/database/querier.go