review

ethanndickson · ethanndickson · commit bb1096b04fee · 2024-08-20T03:21:41.000Z
diff --git a/cli/completion.go b/cli/completion.go
@@ -75,17 +75,13 @@ func installCompletion(inv *serpent.Invocation, shell completion.Shell) error {
 		Options: []string{
 			"Confirm",
 			"Print to terminal",
-			"Cancel",
 		},
 		Message:    fmt.Sprintf("Install completion for %s at %s?", shell.Name(), path),
 		HideSearch: true,
 	})
 	if err != nil {
 		return err
 	}
-	if choice == "Cancel" {
-		return nil
-	}
 	if choice == "Print to terminal" {
 		return shell.WriteCompletion(inv.Stdout)
 	}
diff --git a/cli/templateedit.go b/cli/templateedit.go
@@ -16,7 +16,6 @@ import (
 
 func (r *RootCmd) templateEdit() *serpent.Command {
 	const deprecatedFlagName = "deprecated"
-	daysOfWeekEnum := []string{"monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"}
 	var (
 		name                           string
 		displayName                    string
@@ -241,12 +240,12 @@ func (r *RootCmd) templateEdit() *serpent.Command {
 		{
 			Flag:        "autostart-requirement-weekdays",
 			Description: "Edit the template autostart requirement weekdays - workspaces created from this template can only autostart on the given weekdays. To unset this value for the template (and allow autostart on all days), pass 'all'.",
-			Value:       serpent.EnumArrayOf(&autostartRequirementDaysOfWeek, append(daysOfWeekEnum, "all")...),
+			Value:       serpent.EnumArrayOf(&autostartRequirementDaysOfWeek, append(codersdk.AllDaysOfWeek, "all")...),
 		},
 		{
 			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'.",
-			Value:       serpent.EnumArrayOf(&autostopRequirementDaysOfWeek, append(daysOfWeekEnum, "none")...),
+			Value:       serpent.EnumArrayOf(&autostopRequirementDaysOfWeek, append(codersdk.AllDaysOfWeek, "none")...),
 		},
 		{
 			Flag:        "autostop-requirement-weeks",
diff --git a/cli/templateversions.go b/cli/templateversions.go
@@ -40,11 +40,11 @@ func (r *RootCmd) templateVersions() *serpent.Command {
 
 func (r *RootCmd) templateVersionsList() *serpent.Command {
 	defaultColumns := []string{
-		"Name",
-		"Created At",
-		"Created By",
-		"Status",
-		"Active",
+		"name",
+		"created at",
+		"created by",
+		"status",
+		"active",
 	}
 	formatter := cliui.NewOutputFormatter(
 		cliui.TableFormat([]templateVersionRow{}, defaultColumns),
diff --git a/cli/testdata/coder_templates_versions_list_--help.golden b/cli/testdata/coder_templates_versions_list_--help.golden
@@ -9,7 +9,7 @@ OPTIONS:
   -O, --org string, $CODER_ORGANIZATION
           Select which organization (uuid or name) to use.
 
-  -c, --column [name|created at|created by|status|active|archived] (default: Name,Created At,Created By,Status,Active)
+  -c, --column [name|created at|created by|status|active|archived] (default: name,created at,created by,status,active)
           Columns to display in table output.
 
       --include-archived bool
diff --git a/codersdk/templates.go b/codersdk/templates.go
@@ -118,6 +118,8 @@ func BitmapToWeekdays(bitmap uint8) []string {
 	return days
 }
 
+var AllDaysOfWeek = []string{"monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"}
+
 type TemplateAutostartRequirement struct {
 	// DaysOfWeek is a list of days of the week in which autostart is allowed
 	// to happen. If no days are specified, autostart is not allowed.
diff --git a/docs/reference/cli/features_list.md b/docs/reference/cli/features_list.md
diff --git a/docs/reference/cli/templates_versions_list.md b/docs/reference/cli/templates_versions_list.md
diff --git a/enterprise/cli/features.go b/enterprise/cli/features.go
@@ -32,7 +32,7 @@ func (r *RootCmd) features() *serpent.Command {
 
 func (r *RootCmd) featuresList() *serpent.Command {
 	var (
-		featureColumns = []string{"Name", "Entitlement", "Enabled", "Limit", "Actual"}
+		featureColumns = []string{"name", "entitlement", "enabled", "limit", "actual"}
 		columns        []string
 		outputFormat   string
 	)
diff --git a/enterprise/cli/testdata/coder_features_list_--help.golden b/enterprise/cli/testdata/coder_features_list_--help.golden
@@ -6,7 +6,7 @@ USAGE:
   Aliases: ls
 
 OPTIONS:
-  -c, --column [Name|Entitlement|Enabled|Limit|Actual] (default: Name,Entitlement,Enabled,Limit,Actual)
+  -c, --column [name|entitlement|enabled|limit|actual] (default: name,entitlement,enabled,limit,actual)
           Specify columns to filter in the table.
 
   -o, --output table|json (default: table)

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,8 @@ func BitmapToWeekdays(bitmap uint8) []string {`
`118`	`118`	`return days`
`119`	`119`	`}`
`120`	`120`
	`121`	`+var AllDaysOfWeek = []string{"monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"}`
	`122`	`+`
`121`	`123`	`type TemplateAutostartRequirement struct {`
`122`	`124`	`// DaysOfWeek is a list of days of the week in which autostart is allowed`
`123`	`125`	`// to happen. If no days are specified, autostart is not allowed.`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func (r RootCmd) features() serpent.Command {`
`32`	`32`
`33`	`33`	`func (r RootCmd) featuresList() serpent.Command {`
`34`	`34`	`var (`
`35`		`- featureColumns = []string{"Name", "Entitlement", "Enabled", "Limit", "Actual"}`
	`35`	`+ featureColumns = []string{"name", "entitlement", "enabled", "limit", "actual"}`
`36`	`36`	`columns []string`
`37`	`37`	`outputFormat string`
`38`	`38`	`)`