address PR comments

johnstcn · johnstcn · commit bbd8288a6fcd · 2022-06-14T12:09:58.000Z
diff --git a/cli/bump.go b/cli/bump.go
@@ -58,8 +58,9 @@ func bump() *cobra.Command {
 
 			_, _ = fmt.Fprintf(
 				cmd.OutOrStdout(),
-				"Workspace %q will now stop at %s\n", workspace.Name,
-				newDeadline.Format(time.RFC822),
+				"Workspace %q will now stop at %s on %s\n", workspace.Name,
+				newDeadline.Format(timeFormat),
+				newDeadline.Format(dateFormat),
 			)
 
 			return nil
diff --git a/cli/constants.go b/cli/constants.go
@@ -0,0 +1,6 @@
+package cli
+
+const (
+	timeFormat = "3:04:05 PM MST"
+	dateFormat = "Jan 2, 2006"
+)
diff --git a/cli/ttl.go b/cli/ttl.go
@@ -111,10 +111,12 @@ func ttlset() *cobra.Command {
 			nextShutdown := sched.Next(time.Now()).Add(truncated).In(sched.Location())
 			_, _ = fmt.Fprintf(cmd.OutOrStdout(), "%q will shut down at %s on %s (%s after start).\n",
 				workspace.Name,
-				nextShutdown.Format("15:04:05 MST"),
-				nextShutdown.Format("2006-02-01"),
+				nextShutdown.Format(timeFormat),
+				nextShutdown.Format(dateFormat),
 				truncated,
 			)
+
+			_, _ = fmt.Fprintf(cmd.OutOrStdout(), "NOTE: this will only take effect the next time the workspace is started.\n")
 			return nil
 		},
 	}
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -29,6 +29,8 @@ import (
 	"github.com/coder/coder/codersdk"
 )
 
+const workspaceDefaultTTL = 12 * time.Hour
+
 func (api *API) workspace(rw http.ResponseWriter, r *http.Request) {
 	workspace := httpmw.WorkspaceParam(r)
 	if !api.Authorize(rw, r, rbac.ActionRead, workspace) {
@@ -320,7 +322,7 @@ func (api *API) postWorkspacesByOrganization(rw http.ResponseWriter, r *http.Req
 
 	if !dbTTL.Valid {
 		// Default to min(12 hours, template maximum). Just defaulting to template maximum can be surprising.
-		dbTTL = sql.NullInt64{Valid: true, Int64: min(template.MaxTtl, int64(12*time.Hour))}
+		dbTTL = sql.NullInt64{Valid: true, Int64: min(template.MaxTtl, int64(workspaceDefaultTTL))}
 	}
 
 	workspace, err := api.Database.GetWorkspaceByOwnerIDAndName(r.Context(), database.GetWorkspaceByOwnerIDAndNameParams{

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ import (`
`29`	`29`	`"github.com/coder/coder/codersdk"`
`30`	`30`	`)`
`31`	`31`
	`32`	`+const workspaceDefaultTTL = 12 * time.Hour`
	`33`	`+`
`32`	`34`	`func (api API) workspace(rw http.ResponseWriter, r http.Request) {`
`33`	`35`	`workspace := httpmw.WorkspaceParam(r)`
`34`	`36`	`if !api.Authorize(rw, r, rbac.ActionRead, workspace) {`
`@@ -320,7 +322,7 @@ func (api API) postWorkspacesByOrganization(rw http.ResponseWriter, r http.Req`
`320`	`322`
`321`	`323`	`if !dbTTL.Valid {`
`322`	`324`	`// Default to min(12 hours, template maximum). Just defaulting to template maximum can be surprising.`
`323`		`- dbTTL = sql.NullInt64{Valid: true, Int64: min(template.MaxTtl, int64(12*time.Hour))}`
	`325`	`+ dbTTL = sql.NullInt64{Valid: true, Int64: min(template.MaxTtl, int64(workspaceDefaultTTL))}`
`324`	`326`	`}`
`325`	`327`
`326`	`328`	`workspace, err := api.Database.GetWorkspaceByOwnerIDAndName(r.Context(), database.GetWorkspaceByOwnerIDAndNameParams{`