Merge branch 'main' into dean/rename-restart-requirement

coder · deansheather · Aug 29, 2023 · Aug 24, 2023 · Aug 29, 2023 · Aug 29, 2023
commit d0ac9a95d4760ebda72c02ce94ee9f5d261c7112
diff --git a/cli/templateedit.go b/cli/templateedit.go
@@ -151,8 +151,8 @@ func (r *RootCmd) templateEdit() *clibase.Cmd {
 			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'.",
+			Flag:        "autostop-requirement-weekdays",
+			Description: "Edit the template autostop requirement weekdays - workspaces created from this template must be restarted on the given weekdays. To unset this value for the template (and disable the autostop requirement for the template), pass 'none'.",
 			// TODO(@dean): unhide when we delete max_ttl
 			Hidden: true,
 			Value: clibase.Validate(clibase.StringArrayOf(&autostopRequirementDaysOfWeek), func(value *clibase.StringArray) error {
@@ -162,14 +162,14 @@ func (r *RootCmd) templateEdit() *clibase.Cmd {
 				}
 				_, err := codersdk.WeekdaysToBitmap(v)
 				if err != nil {
-					return xerrors.Errorf("invalid restart requirement days of week %q: %w", strings.Join(v, ","), err)
+					return xerrors.Errorf("invalid autostop 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.",
+			Flag:        "autostop-requirement-weeks",
+			Description: "Edit the template autostop 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(&autostopRequirementWeeks),

diff --git a/cli/templateedit_test.go b/cli/templateedit_test.go
@@ -263,20 +263,20 @@ func TestTemplateEdit(t *testing.T) {
 				{
 					name: "Weekdays",
 					flags: []string{
-						"--restart-requirement-weekdays", "monday",
+						"--autostop-requirement-weekdays", "monday",
 					},
 				},
 				{
 					name: "WeekdaysNoneAllowed",
 					flags: []string{
-						"--restart-requirement-weekdays", "none",
+						"--autostop-requirement-weekdays", "none",
 					},
 					ok: true,
 				},
 				{
 					name: "Weeks",
 					flags: []string{
-						"--restart-requirement-weeks", "1",
+						"--autostop-requirement-weeks", "1",
 					},
 				},
 			}
@@ -377,20 +377,20 @@ func TestTemplateEdit(t *testing.T) {
 				{
 					name: "Weekdays",
 					flags: []string{
-						"--restart-requirement-weekdays", "monday",
+						"--autostop-requirement-weekdays", "monday",
 					},
 				},
 				{
 					name: "WeekdaysNoneAllowed",
 					flags: []string{
-						"--restart-requirement-weekdays", "none",
+						"--autostop-requirement-weekdays", "none",
 					},
 					ok: true,
 				},
 				{
 					name: "Weeks",
 					flags: []string{
-						"--restart-requirement-weeks", "1",
+						"--autostop-requirement-weeks", "1",
 					},
 				},
 			}
@@ -504,8 +504,8 @@ func TestTemplateEdit(t *testing.T) {
 				"templates",
 				"edit",
 				template.Name,
-				"--restart-requirement-weekdays", "monday,tuesday",
-				"--restart-requirement-weeks", "3",
+				"--autostop-requirement-weekdays", "monday,tuesday",
+				"--autostop-requirement-weeks", "3",
 			}
 			inv, root := clitest.New(t, cmdArgs...)
 			clitest.SetupConfig(t, proxyClient, root)

diff --git a/coderd/activitybump_test.go b/coderd/activitybump_test.go
@@ -26,7 +26,7 @@ func TestWorkspaceActivityBump(t *testing.T) {
 	ctx := context.Background()
 
 	// deadline allows you to forcibly set a max_deadline on the build. This
-	// doesn't use template restart requirements and instead edits the
+	// doesn't use template autostop requirements and instead edits the
 	// max_deadline on the build directly in the database.
 	setupActivityTest := func(t *testing.T, deadline ...time.Duration) (client *codersdk.Client, workspace codersdk.Workspace, assertBumped func(want bool)) {
 		const ttl = time.Minute

diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go