coder · deansheather · Jul 20, 2023 · Jun 20, 2023 · Jun 20, 2023 · Jun 21, 2023
diff --git a/cli/create.go b/cli/create.go
@@ -149,8 +149,6 @@ func (r *RootCmd) create() *clibase.Cmd {
 			var ttlMillis *int64
 			if stopAfter > 0 {
 				ttlMillis = ptr.Ref(stopAfter.Milliseconds())
-			} else if template.MaxTTLMillis > 0 {
-				ttlMillis = &template.MaxTTLMillis
 			}
 
 			workspace, err := client.CreateWorkspace(inv.Context(), organization.ID, workspaceOwner, codersdk.CreateWorkspaceRequest{

diff --git a/cli/schedule_test.go b/cli/schedule_test.go
@@ -316,7 +316,8 @@ func TestScheduleOverride(t *testing.T) {
 			stdoutBuf = &bytes.Buffer{}
 		)
 		require.Zero(t, template.DefaultTTLMillis)
-		require.Zero(t, template.MaxTTLMillis)
+		require.Empty(t, template.RestartRequirement.DaysOfWeek)
+		require.Zero(t, template.RestartRequirement.Weeks)
 
 		// Unset the workspace TTL
 		err = client.UpdateWorkspaceTTL(ctx, workspace.ID, codersdk.UpdateWorkspaceTTLRequest{TTLMillis: nil})

diff --git a/cli/server.go b/cli/server.go
@@ -496,6 +496,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 				FilesRateLimit:              filesRateLimit,
 				HTTPClient:                  httpClient,
 				TemplateScheduleStore:       &atomic.Pointer[schedule.TemplateScheduleStore]{},
+				UserQuietHoursScheduleStore: &atomic.Pointer[schedule.UserQuietHoursScheduleStore]{},
 				SSHConfig: codersdk.SSHConfigResponse{
 					HostnamePrefix:   cfg.SSHConfig.DeploymentName.String(),
 					SSHConfigOptions: configSSHOptions,

diff --git a/cli/templateedit.go b/cli/templateedit.go
@@ -3,6 +3,7 @@ package cli
 import (
 	"fmt"
 	"net/http"
+	"strings"
 	"time"
 
 	"golang.org/x/xerrors"
@@ -20,6 +21,8 @@ func (r *RootCmd) templateEdit() *clibase.Cmd {
 		icon                         string
 		defaultTTL                   time.Duration
 		maxTTL                       time.Duration
+		restartRequirementDaysOfWeek []string
+		restartRequirementWeeks      int64
 		failureTTL                   time.Duration
 		inactivityTTL                time.Duration
 		allowUserCancelWorkspaceJobs bool
@@ -48,7 +51,15 @@ func (r *RootCmd) templateEdit() *clibase.Cmd {
 				}
 			}
 
-			if maxTTL != 0 || !allowUserAutostart || !allowUserAutostop || failureTTL != 0 || inactivityTTL != 0 {
+			unsetRestartRequirementDaysOfWeek := len(restartRequirementDaysOfWeek) == 1 && restartRequirementDaysOfWeek[0] == "none"
+			requiresEntitlement := (len(restartRequirementDaysOfWeek) > 0 && !unsetRestartRequirementDaysOfWeek) ||
+				restartRequirementWeeks > 0 ||
+				!allowUserAutostart ||
+				!allowUserAutostop ||
+				maxTTL != 0 ||
+				failureTTL != 0 ||
+				inactivityTTL != 0
+			if requiresEntitlement {
 				entitlements, err := client.Entitlements(inv.Context())
 				var sdkErr *codersdk.Error
 				if xerrors.As(err, &sdkErr) && sdkErr.StatusCode() == http.StatusNotFound {
@@ -71,14 +82,27 @@ func (r *RootCmd) templateEdit() *clibase.Cmd {
 				return xerrors.Errorf("get workspace template: %w", err)
 			}
 
+			// Copy the default value if the list is empty, or if the user
+			// specified the "none" value clear the list.
+			if len(restartRequirementDaysOfWeek) == 0 {
+				restartRequirementDaysOfWeek = template.RestartRequirement.DaysOfWeek
+			}
+			if unsetRestartRequirementDaysOfWeek {
+				restartRequirementDaysOfWeek = []string{}
+			}
+
 			// NOTE: coderd will ignore empty fields.
 			req := codersdk.UpdateTemplateMeta{
-				Name:                         name,
-				DisplayName:                  displayName,
-				Description:                  description,
-				Icon:                         icon,
-				DefaultTTLMillis:             defaultTTL.Milliseconds(),
-				MaxTTLMillis:                 maxTTL.Milliseconds(),
+				Name:             name,
+				DisplayName:      displayName,
+				Description:      description,
+				Icon:             icon,
+				DefaultTTLMillis: defaultTTL.Milliseconds(),
+				MaxTTLMillis:     maxTTL.Milliseconds(),
+				RestartRequirement: &codersdk.TemplateRestartRequirement{
+					DaysOfWeek: restartRequirementDaysOfWeek,
+					Weeks:      restartRequirementWeeks,
+				},
 				FailureTTLMillis:             failureTTL.Milliseconds(),
 				InactivityTTLMillis:          inactivityTTL.Milliseconds(),
 				AllowUserCancelWorkspaceJobs: allowUserCancelWorkspaceJobs,
@@ -126,6 +150,30 @@ func (r *RootCmd) templateEdit() *clibase.Cmd {
 			Description: "Edit the template maximum time before shutdown - workspaces created from this template must shutdown within the given duration after starting. This is an enterprise-only feature.",
 			Value:       clibase.DurationOf(&maxTTL),
 		},
+		{
+			Flag:        "restart-requirement-weekdays",
+			Description: "Edit the template restart requirement weekdays - workspaces created from this template must be restarted on the given weekdays. To unset this value for the template (and disable the restart requirement for the template), pass 'none'.",
+			// TODO(@dean): unhide when we delete max_ttl
+			Hidden: true,
+			Value: clibase.Validate(clibase.StringArrayOf(&restartRequirementDaysOfWeek), func(value *clibase.StringArray) error {
+				v := value.GetSlice()
+				if len(v) == 1 && v[0] == "none" {
+					return nil
+				}
+				_, err := codersdk.WeekdaysToBitmap(v)
+				if err != nil {
+					return xerrors.Errorf("invalid restart requirement days of week %q: %w", strings.Join(v, ","), err)
+				}
+				return nil
+			}),
+		},
+		{
+			Flag:        "restart-requirement-weeks",
+			Description: "Edit the template restart requirement weeks - workspaces created from this template must be restarted on an n-weekly basis.",
+			// TODO(@dean): unhide when we delete max_ttl
+			Hidden: true,
+			Value:  clibase.Int64Of(&restartRequirementWeeks),
+		},
 		{
 			Flag:        "failure-ttl",
 			Description: "Specify a failure TTL for workspaces created from this template. This licensed feature's default is 0h (off).",