add to workspace create cli command

Emyrk · Emyrk · commit c1ec0cc8f72e · 2023-11-09T16:38:44.000-06:00
diff --git a/cli/create.go b/cli/create.go
@@ -21,10 +21,11 @@ import (
 
 func (r *RootCmd) create() *clibase.Cmd {
 	var (
-		templateName  string
-		startAt       string
-		stopAfter     time.Duration
-		workspaceName string
+		templateName   string
+		startAt        string
+		stopAfter      time.Duration
+		defaultTTLBump time.Duration
+		workspaceName  string
 
 		parameterFlags     workspaceParameterFlags
 		autoUpdates        string
@@ -199,12 +200,17 @@ func (r *RootCmd) create() *clibase.Cmd {
 			if stopAfter > 0 {
 				ttlMillis = ptr.Ref(stopAfter.Milliseconds())
 			}
+			var ttlBumpMillis *int64
+			if defaultTTLBump.Milliseconds() > 0 {
+				ttlBumpMillis = ptr.Ref(defaultTTLBump.Milliseconds())
+			}
 
 			workspace, err := client.CreateWorkspace(inv.Context(), organization.ID, workspaceOwner, codersdk.CreateWorkspaceRequest{
 				TemplateVersionID:   templateVersionID,
 				Name:                workspaceName,
 				AutostartSchedule:   schedSpec,
 				TTLMillis:           ttlMillis,
+				TTLBumpMillis:       ttlBumpMillis,
 				RichParameterValues: richParameters,
 				AutomaticUpdates:    codersdk.AutomaticUpdates(autoUpdates),
 			})
@@ -246,6 +252,12 @@ func (r *RootCmd) create() *clibase.Cmd {
 			Description: "Specify a duration after which the workspace should shut down (e.g. 8h).",
 			Value:       clibase.DurationOf(&stopAfter),
 		},
+		clibase.Option{
+			Flag:        "activity-bump",
+			Description: "Specify a default amount of time to bump the deadline for the workspaces based on workspace activity. By default, activity will extend the deadline for a workspace by the 'stop-after' amount.",
+			Default:     "0",
+			Value:       clibase.DurationOf(&defaultTTLBump),
+		},
 		clibase.Option{
 			Flag:        "automatic-updates",
 			Env:         "CODER_WORKSPACE_AUTOMATIC_UPDATES",
diff --git a/cli/create_test.go b/cli/create_test.go
@@ -39,6 +39,7 @@ func TestCreate(t *testing.T) {
 			"--template", template.Name,
 			"--start-at", "9:30AM Mon-Fri US/Central",
 			"--stop-after", "8h",
+			"--activity-bump", "1h",
 			"--automatic-updates", "always",
 		}
 		inv, root := clitest.New(t, args...)
@@ -75,6 +76,7 @@ func TestCreate(t *testing.T) {
 			if assert.NotNil(t, ws.TTLMillis) {
 				assert.Equal(t, *ws.TTLMillis, 8*time.Hour.Milliseconds())
 			}
+			assert.Equal(t, ws.TTLBumpMillis, 1*time.Hour.Milliseconds())
 			assert.Equal(t, codersdk.AutomaticUpdatesAlways, ws.AutomaticUpdates)
 		}
 	})
diff --git a/cli/templateedit_test.go b/cli/templateedit_test.go
@@ -44,6 +44,7 @@ func TestTemplateEdit(t *testing.T) {
 		desc := "lorem ipsum dolor sit amet et cetera"
 		icon := "/icon/new-icon.png"
 		defaultTTL := 12 * time.Hour
+		defaultTTLBump := time.Hour
 		allowUserCancelWorkspaceJobs := false
 
 		cmdArgs := []string{
@@ -55,6 +56,7 @@ func TestTemplateEdit(t *testing.T) {
 			"--description", desc,
 			"--icon", icon,
 			"--default-ttl", defaultTTL.String(),
+			"--default-activity-bump", defaultTTLBump.String(),
 			"--allow-user-cancel-workspace-jobs=" + strconv.FormatBool(allowUserCancelWorkspaceJobs),
 		}
 		inv, root := clitest.New(t, cmdArgs...)
@@ -73,6 +75,7 @@ func TestTemplateEdit(t *testing.T) {
 		assert.Equal(t, desc, updated.Description)
 		assert.Equal(t, icon, updated.Icon)
 		assert.Equal(t, defaultTTL.Milliseconds(), updated.DefaultTTLMillis)
+		assert.Equal(t, defaultTTLBump.Milliseconds(), updated.DefaultTTLBumpMillis)
 		assert.Equal(t, allowUserCancelWorkspaceJobs, updated.AllowUserCancelWorkspaceJobs)
 	})
 	t.Run("FirstEmptyThenNotModified", func(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ func TestCreate(t *testing.T) {`
`39`	`39`	`"--template", template.Name,`
`40`	`40`	`"--start-at", "9:30AM Mon-Fri US/Central",`
`41`	`41`	`"--stop-after", "8h",`
	`42`	`+ "--activity-bump", "1h",`
`42`	`43`	`"--automatic-updates", "always",`
`43`	`44`	`}`
`44`	`45`	`inv, root := clitest.New(t, args...)`
`@@ -75,6 +76,7 @@ func TestCreate(t *testing.T) {`
`75`	`76`	`if assert.NotNil(t, ws.TTLMillis) {`
`76`	`77`	`assert.Equal(t, ws.TTLMillis, 8time.Hour.Milliseconds())`
`77`	`78`	`}`
	`79`	`+ assert.Equal(t, ws.TTLBumpMillis, 1*time.Hour.Milliseconds())`
`78`	`80`	`assert.Equal(t, codersdk.AutomaticUpdatesAlways, ws.AutomaticUpdates)`
`79`	`81`	`}`
`80`	`82`	`})`