Merge branch 'main' into dean/disable-user-custom-quiet-hours

coder · deansheather · Dec 15, 2023 · Dec 11, 2023 · Dec 15, 2023 · Dec 15, 2023
commit 79574464127bd5da3fdaab1ba6e012f3d3a892ff
diff --git a/cli/testdata/coder_server_--help.golden b/cli/testdata/coder_server_--help.golden
@@ -453,7 +453,7 @@ workspaces stopping during the day due to template max TTL.
           false, users can't change their quiet hours schedule and the site
           default is always used.
 
-      --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

diff --git a/cli/testdata/server-config.yaml.golden b/cli/testdata/server-config.yaml.golden
@@ -450,13 +450,13 @@ 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 * * *
   # Allow users to set their own quiet hours schedule for workspaces to stop in
   # (depending on template autostop requirement settings). If false, users can't
   # change their quiet hours schedule and the site default is always used.

diff --git a/enterprise/cli/testdata/coder_server_--help.golden b/enterprise/cli/testdata/coder_server_--help.golden
@@ -454,7 +454,7 @@ workspaces stopping during the day due to template max TTL.
           false, users can't change their quiet hours schedule and the site
           default is always used.
 
-      --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

diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -569,8 +569,6 @@ func (api *API) updateEntitlements(ctx context.Context) error {
 				api.Logger.Warn(ctx, "template autostop requirement will default to UTC midnight as the default user quiet hours schedule. Set a custom default quiet hours schedule using CODER_QUIET_HOURS_DEFAULT_SCHEDULE to avoid this warning")
 				api.DefaultQuietHoursSchedule = "CRON_TZ=UTC 0 0 * * *"
 			}
-			enterpriseTemplateStore.UseAutostopRequirement.Store(true)
-
 			quietHoursStore, err := schedule.NewEnterpriseUserQuietHoursScheduleStore(api.DefaultQuietHoursSchedule, api.DeploymentValues.UserQuietHoursSchedule.AllowUserCustom.Value())
 			if err != nil {
 				api.Logger.Error(ctx, "unable to set up enterprise user quiet hours schedule store, template autostop requirements will not be applied to workspace builds", slog.Error(err))

diff --git a/enterprise/coderd/users_test.go b/enterprise/coderd/users_test.go
@@ -177,68 +177,10 @@ func TestUserQuietHours(t *testing.T) {
 		require.Equal(t, http.StatusForbidden, sdkErr.StatusCode())
 	})
 
-	t.Run("NotEnabled", func(t *testing.T) {
-		t.Parallel()
-
-		dv := coderdtest.DeploymentValues(t)
-		dv.UserQuietHoursSchedule.DefaultSchedule.Set("")
-		dv.Experiments.Set(string(codersdk.ExperimentTemplateAutostopRequirement))
-
-		client, user := coderdenttest.New(t, &coderdenttest.Options{
-			NoDefaultQuietHoursSchedule: true,
-			Options: &coderdtest.Options{
-				DeploymentValues: dv,
-			},
-			LicenseOptions: &coderdenttest.LicenseOptions{
-				Features: license.Features{
-					codersdk.FeatureAdvancedTemplateScheduling:  1,
-					codersdk.FeatureTemplateAutostopRequirement: 1,
-				},
-			},
-		})
-
-		ctx := testutil.Context(t, testutil.WaitLong)
-		//nolint:gocritic // We want to test the lack of feature, not RBAC.
-		_, err := client.UserQuietHoursSchedule(ctx, user.UserID.String())
-		require.Error(t, err)
-		var sdkErr *codersdk.Error
-		require.ErrorAs(t, err, &sdkErr)
-		require.Equal(t, http.StatusForbidden, sdkErr.StatusCode())
-	})
-
-	t.Run("NoFeatureFlag", func(t *testing.T) {
-		t.Parallel()
-
-		dv := coderdtest.DeploymentValues(t)
-		dv.UserQuietHoursSchedule.DefaultSchedule.Set("CRON_TZ=America/Chicago 0 0 * * *")
-		dv.UserQuietHoursSchedule.DefaultSchedule.Set("")
-
-		client, user := coderdenttest.New(t, &coderdenttest.Options{
-			Options: &coderdtest.Options{
-				DeploymentValues: dv,
-			},
-			LicenseOptions: &coderdenttest.LicenseOptions{
-				Features: license.Features{
-					codersdk.FeatureAdvancedTemplateScheduling:  1,
-					codersdk.FeatureTemplateAutostopRequirement: 1,
-				},
-			},
-		})
-
-		ctx := testutil.Context(t, testutil.WaitLong)
-		//nolint:gocritic // We want to test the lack of feature, not RBAC.
-		_, err := client.UserQuietHoursSchedule(ctx, user.UserID.String())
-		require.Error(t, err)
-		var sdkErr *codersdk.Error
-		require.ErrorAs(t, err, &sdkErr)
-		require.Equal(t, http.StatusNotFound, sdkErr.StatusCode())
-	})
-
 	t.Run("UserCannotSet", func(t *testing.T) {
 		t.Parallel()
 
 		dv := coderdtest.DeploymentValues(t)
-		dv.Experiments.Set(string(codersdk.ExperimentTemplateAutostopRequirement))
 		dv.UserQuietHoursSchedule.DefaultSchedule.Set("CRON_TZ=America/Chicago 0 0 * * *")
 		dv.UserQuietHoursSchedule.AllowUserCustom.Set("false")
 
@@ -248,8 +190,7 @@ func TestUserQuietHours(t *testing.T) {
 			},
 			LicenseOptions: &coderdenttest.LicenseOptions{
 				Features: license.Features{
-					codersdk.FeatureAdvancedTemplateScheduling:  1,
-					codersdk.FeatureTemplateAutostopRequirement: 1,
+					codersdk.FeatureAdvancedTemplateScheduling: 1,
 				},
 			},
 		})

diff --git a/site/src/pages/UserSettingsPage/SchedulePage/SchedulePage.test.tsx b/site/src/pages/UserSettingsPage/SchedulePage/SchedulePage.test.tsx
@@ -37,6 +37,7 @@ const submitForm = async () => {
 const defaultQuietHoursResponse = {
   raw_schedule: "CRON_TZ=America/Chicago 0 0 * * *",
   user_set: false,
+  user_can_set: true,
   time: "00:00",
   timezone: "America/Chicago",
   next: "", // not consumed by the frontend
@@ -52,7 +53,6 @@ const cronTests = [
 
 describe("SchedulePage", () => {
   beforeEach(() => {
-    // appear logged out
     server.use(
       rest.get(`/api/v2/users/${MockUser.id}/quiet-hours`, (req, res, ctx) => {
         return res(ctx.status(200), ctx.json(defaultQuietHoursResponse));
@@ -72,7 +72,6 @@ describe("SchedulePage", () => {
               return res(
                 ctx.status(200),
                 ctx.json({
-                  response: {},
                   raw_schedule: data.schedule,
                   user_set: true,
                   time: `${test.hour.toString().padStart(2, "0")}:${test.minute
@@ -121,4 +120,39 @@ describe("SchedulePage", () => {
       expect(errorMessage).toBeDefined();
     });
   });
+
+  describe("when user custom schedule is disabled", () => {
+    it("shows a warning and disables the form", async () => {
+      server.use(
+        rest.get(
+          `/api/v2/users/${MockUser.id}/quiet-hours`,
+          (req, res, ctx) => {
+            return res(
+              ctx.status(200),
+              ctx.json({
+                raw_schedule: "CRON_TZ=America/Chicago 0 0 * * *",
+                user_can_set: false,
+                user_set: false,
+                time: "00:00",
+                timezone: "America/Chicago",
+                next: "", // not consumed by the frontend
+              }),
+            );
+          },
+        ),
+      );
+
+      renderWithAuth(<SchedulePage />);
+      await screen.findByText(
+        "Your administrator has disabled the ability to set a custom quiet hours schedule.",
+      );
+
+      const timeInput = screen.getByLabelText("Start time");
+      expect(timeInput).toBeDisabled();
+      const timezoneDropdown = screen.getByLabelText("Timezone");
+      expect(timezoneDropdown).toHaveClass("Mui-disabled");
+      const updateButton = screen.getByText("Update schedule");
+      expect(updateButton).toBeDisabled();
+    });
+  });
 });