working!

coder · deansheather · Jul 20, 2023 · Jun 20, 2023 · Jun 20, 2023 · Jun 21, 2023
commit 6cfd270d0dd1b89a7133154a7a31e67a4d8c1086
diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -4685,6 +4685,8 @@ func (q *fakeQuerier) UpdateTemplateScheduleByID(_ context.Context, arg database
 		tpl.AllowUserAutostop = arg.AllowUserAutostop
 		tpl.UpdatedAt = database.Now()
 		tpl.DefaultTTL = arg.DefaultTTL
+		tpl.RestartRequirementDaysOfWeek = arg.RestartRequirementDaysOfWeek
+		tpl.RestartRequirementWeeks = arg.RestartRequirementWeeks
 		tpl.FailureTTL = arg.FailureTTL
 		tpl.InactivityTTL = arg.InactivityTTL
 		q.templates[idx] = tpl

diff --git a/coderd/templates.go b/coderd/templates.go
@@ -768,5 +768,9 @@ func (api *API) convertTemplate(
 		FailureTTLMillis:             time.Duration(template.FailureTTL).Milliseconds(),
 		InactivityTTLMillis:          time.Duration(template.InactivityTTL).Milliseconds(),
 		LockedTTLMillis:              time.Duration(template.LockedTTL).Milliseconds(),
+		RestartRequirement: codersdk.TemplateRestartRequirement{
+			DaysOfWeek: codersdk.BitmapToWeekdays(uint8(template.RestartRequirementDaysOfWeek)),
+			Weeks:      template.RestartRequirementWeeks,
+		},
 	}
 }
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -427,7 +427,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {
 
 			quietHoursStore, err := schedule.NewEnterpriseUserQuietHoursScheduleStore(api.DefaultQuietHoursSchedule, api.QuietHoursWindowDuration)
 			if err != nil {
-				api.Logger.Error(ctx, "unable to set up enterprise user quiet hours schedule store, quiet hours schedules will not be applied", slog.Error(err))
+				api.Logger.Error(ctx, "unable to set up enterprise user quiet hours schedule store, template restart requirements will not be applied to workspace builds", slog.Error(err))
 			} else {
 				api.AGPL.UserQuietHoursScheduleStore.Store(&quietHoursStore)
 			}

diff --git a/enterprise/coderd/schedule/template.go b/enterprise/coderd/schedule/template.go
@@ -68,7 +68,7 @@ func (*EnterpriseTemplateScheduleStore) SetTemplateScheduleOptions(ctx context.C
 		return tpl, nil
 	}
 
-	err := agpl.VerifyTemplateRestartRequirement(uint8(opts.RestartRequirement.DaysOfWeek), opts.RestartRequirement.Weeks)
+	err := agpl.VerifyTemplateRestartRequirement(opts.RestartRequirement.DaysOfWeek, opts.RestartRequirement.Weeks)
 	if err != nil {
 		return database.Template{}, err
 	}

diff --git a/enterprise/coderd/schedule/user.go b/enterprise/coderd/schedule/user.go
@@ -56,6 +56,9 @@ func (s *enterpriseUserQuietHoursScheduleStore) parseSchedule(rawSchedule string
 		return agpl.UserQuietHoursScheduleOptions{}, xerrors.Errorf("parse daily schedule %q: %w", rawSchedule, err)
 	}
 	if strings.HasPrefix(sched.Time(), "cron(") {
+		// Times starting with "cron(" mean it isn't a single time and probably
+		// a range or a list of times as a cron expression. We only support
+		// single times for user quiet hours schedules.
 		// This shouldn't get hit during Gets, only Sets.
 		return agpl.UserQuietHoursScheduleOptions{}, xerrors.Errorf("daily schedule %q has more than one time: %v", rawSchedule, sched.Time())
 	}

diff --git a/enterprise/coderd/templates_test.go b/enterprise/coderd/templates_test.go
@@ -46,7 +46,8 @@ func TestTemplates(t *testing.T) {
 		require.Empty(t, 0, template.RestartRequirement.DaysOfWeek)
 		require.Zero(t, template.RestartRequirement.Weeks)
 
-		ctx := testutil.Context(t, testutil.WaitLong)
+		// ctx := testutil.Context(t, testutil.WaitLong)
+		ctx := context.Background()
 		updated, err := client.UpdateTemplateMeta(ctx, template.ID, codersdk.UpdateTemplateMeta{
 			Name:                         template.Name,
 			DisplayName:                  template.DisplayName,
@@ -61,12 +62,12 @@ func TestTemplates(t *testing.T) {
 		})
 		require.NoError(t, err)
 		require.Equal(t, []string{"monday", "saturday"}, updated.RestartRequirement.DaysOfWeek)
-		require.Equal(t, 3, updated.RestartRequirement.Weeks)
+		require.EqualValues(t, 3, updated.RestartRequirement.Weeks)
 
 		template, err = client.Template(ctx, template.ID)
 		require.NoError(t, err)
 		require.Equal(t, []string{"monday", "saturday"}, template.RestartRequirement.DaysOfWeek)
-		require.Equal(t, 3, template.RestartRequirement.Weeks)
+		require.EqualValues(t, 3, template.RestartRequirement.Weeks)
 	})
 }