coder · deansheather · Dec 15, 2023 · Nov 28, 2023 · Dec 5, 2023 · Dec 8, 2023
diff --git a/cli/testdata/coder_server_--help.golden b/cli/testdata/coder_server_--help.golden
@@ -447,15 +447,15 @@ USER QUIET HOURS SCHEDULE OPTIONS:
 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
+      --default-quiet-hours-schedule string, $CODER_QUIET_HOURS_DEFAULT_SCHEDULE (default: CRON_TZ=UTC 0 0 * * *)
           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).
+          autostop requirement, and will round the max deadline 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).
 
 ⚠️ DANGEROUS OPTIONS: 
       --dangerous-allow-path-app-sharing bool, $CODER_DANGEROUS_ALLOW_PATH_APP_SHARING

diff --git a/cli/testdata/server-config.yaml.golden b/cli/testdata/server-config.yaml.golden
@@ -450,10 +450,10 @@ wgtunnelHost: ""
 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: ""
+  # will be force stopped due to the template's autostop requirement, and will round
+  # the max deadline 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: CRON_TZ=UTC 0 0 * * *, type: string)
+  defaultQuietHoursSchedule: CRON_TZ=UTC 0 0 * * *
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -6158,6 +6158,7 @@ func (q *FakeQuerier) UpdateTemplateScheduleByID(_ context.Context, arg database
 		tpl.AllowUserAutostop = arg.AllowUserAutostop
 		tpl.UpdatedAt = dbtime.Now()
 		tpl.DefaultTTL = arg.DefaultTTL
+		tpl.UseMaxTtl = arg.UseMaxTtl
 		tpl.MaxTTL = arg.MaxTTL
 		tpl.AutostopRequirementDaysOfWeek = arg.AutostopRequirementDaysOfWeek
 		tpl.AutostopRequirementWeeks = arg.AutostopRequirementWeeks

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000180_template_use_max_ttl.down.sql b/coderd/database/migrations/000180_template_use_max_ttl.down.sql
@@ -0,0 +1,19 @@
+DROP VIEW template_with_users;
+
+ALTER TABLE templates DROP COLUMN use_max_ttl;
+
+CREATE VIEW
+    template_with_users
+AS
+    SELECT
+        templates.*,
+		coalesce(visible_users.avatar_url, '') AS created_by_avatar_url,
+		coalesce(visible_users.username, '') AS created_by_username
+    FROM
+        templates
+    LEFT JOIN
+		visible_users
+	ON
+	    templates.created_by = visible_users.id;
+
+COMMENT ON VIEW template_with_users IS 'Joins in the username + avatar url of the created by user.';
diff --git a/coderd/database/migrations/000180_template_use_max_ttl.up.sql b/coderd/database/migrations/000180_template_use_max_ttl.up.sql
@@ -0,0 +1,28 @@
+-- Add column with default true, so existing templates will function as usual
+ALTER TABLE templates ADD COLUMN use_max_ttl boolean NOT NULL DEFAULT true;
+
+-- Find any templates with autostop_requirement_days_of_week set and set them to
+-- use_max_ttl = false
+UPDATE templates SET use_max_ttl = false WHERE autostop_requirement_days_of_week != 0;
+
+-- Alter column to default false, because we want autostop_requirement to be the
+-- default from now on
+ALTER TABLE templates ALTER COLUMN use_max_ttl SET DEFAULT false;
+
+DROP VIEW template_with_users;
+
+CREATE VIEW
+    template_with_users
+AS
+    SELECT
+        templates.*,
+		coalesce(visible_users.avatar_url, '') AS created_by_avatar_url,
+		coalesce(visible_users.username, '') AS created_by_username
+    FROM
+        templates
+    LEFT JOIN
+		visible_users
+	ON
+	    templates.created_by = visible_users.id;
+
+COMMENT ON VIEW template_with_users IS 'Joins in the username + avatar url of the created by user.';
diff --git a/coderd/database/modelqueries.go b/coderd/database/modelqueries.go
@@ -89,6 +89,7 @@ func (q *sqlQuerier) GetAuthorizedTemplates(ctx context.Context, arg GetTemplate
 			&i.AutostartBlockDaysOfWeek,
 			&i.RequireActiveVersion,
 			&i.Deprecated,
+			&i.UseMaxTtl,
 			&i.CreatedByAvatarURL,
 			&i.CreatedByUsername,
 		); err != nil {

diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/templates.sql b/coderd/database/queries/templates.sql
@@ -128,13 +128,14 @@ SET
 	allow_user_autostart = $3,
 	allow_user_autostop = $4,
 	default_ttl = $5,
-	max_ttl = $6,
-	autostop_requirement_days_of_week = $7,
-	autostop_requirement_weeks = $8,
-	autostart_block_days_of_week = $9,
-	failure_ttl = $10,
-	time_til_dormant = $11,
-	time_til_dormant_autodelete = $12
+	use_max_ttl = $6,
+	max_ttl = $7,
+	autostop_requirement_days_of_week = $8,
+	autostop_requirement_weeks = $9,
+	autostart_block_days_of_week = $10,
+	failure_ttl = $11,
+	time_til_dormant = $12,
+	time_til_dormant_autodelete = $13
 WHERE
 	id = $1
 ;