coder
diff --git a/‎.vscode/settings.json
Lines changed: 4 additions & 2 deletions b/‎.vscode/settings.json
Lines changed: 4 additions & 2 deletions
diff --git a/‎agent/usershell/usershell_darwin.go
Lines changed: 1 addition & 1 deletion b/‎agent/usershell/usershell_darwin.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎cli/autostop.go
Lines changed: 0 additions & 167 deletions b/‎cli/autostop.go
Lines changed: 0 additions & 167 deletions
diff --git a/‎cli/list.go
Lines changed: 3 additions & 5 deletions b/‎cli/list.go
Lines changed: 3 additions & 5 deletions
diff --git a/‎cli/root.go
Lines changed: 1 addition & 1 deletion b/‎cli/root.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎cli/ssh.go
Lines changed: 2 additions & 8 deletions b/‎cli/ssh.go
Lines changed: 2 additions & 8 deletions
@@ -1,5 +1,6 @@
 {
   "cSpell.words": [
+    "buildname",
     "circbuf",
     "cliflag",
     "cliui",
@@ -55,6 +56,7 @@
     "TCGETS",
     "tcpip",
     "TCSETS",
+    "testid",
     "tfexec",
     "tfjson",
     "tfstate",
@@ -76,7 +78,7 @@
       },
       {
         "match": "provisionerd/proto/provisionerd.proto",
-        "cmd": "make provisionerd/proto/provisionerd.pb.go",
+        "cmd": "make provisionerd/proto/provisionerd.pb.go"
       }
     ]
   },
@@ -104,5 +106,5 @@
   },
   // We often use a version of TypeScript that's ahead of the version shipped
   // with VS Code.
-  "typescript.tsdk": "./site/node_modules/typescript/lib",
+  "typescript.tsdk": "./site/node_modules/typescript/lib"
 }
@@ -3,6 +3,6 @@ package usershell
 import "os"
 
 // Get returns the $SHELL environment variable.
-func Get(username string) (string, error) {
+func Get(_ string) (string, error) {
 	return os.Getenv("SHELL"), nil
 }
@@ -49,7 +49,7 @@ func list() *cobra.Command {
 			}
 
 			tableWriter := cliui.Table()
-			header := table.Row{"workspace", "template", "status", "last built", "outdated", "autostart", "autostop"}
+			header := table.Row{"workspace", "template", "status", "last built", "outdated", "autostart", "ttl"}
 			tableWriter.AppendHeader(header)
 			tableWriter.SortBy([]table.SortBy{{
 				Name: "workspace",
@@ -116,10 +116,8 @@ func list() *cobra.Command {
 				}
 
 				autostopDisplay := "-"
-				if workspace.AutostopSchedule != "" {
-					if sched, err := schedule.Weekly(workspace.AutostopSchedule); err == nil {
-						autostopDisplay = sched.Cron()
-					}
+				if workspace.TTL != nil {
+					autostopDisplay = workspace.TTL.String()
 				}
 
 				user := usersByID[workspace.OwnerID]
 
@@ -62,7 +62,6 @@ func Root() *cobra.Command {
 
 	cmd.AddCommand(
 		autostart(),
-		autostop(),
 		configSSH(),
 		create(),
 		delete(),
@@ -78,6 +77,7 @@ func Root() *cobra.Command {
 		stop(),
 		ssh(),
 		templates(),
+		ttl(),
 		update(),
 		users(),
 		portForward(),
 
@@ -21,7 +21,6 @@ import (
 	"github.com/coder/coder/cli/cliflag"
 	"github.com/coder/coder/cli/cliui"
 	"github.com/coder/coder/coderd/autobuild/notify"
-	"github.com/coder/coder/coderd/autobuild/schedule"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/cryptorand"
 )
@@ -270,16 +269,11 @@ func notifyCondition(ctx context.Context, client *codersdk.Client, workspaceID u
 			return time.Time{}, nil
 		}
 
-		if ws.AutostopSchedule == "" {
+		if ws.TTL == nil || *ws.TTL == 0 {
 			return time.Time{}, nil
 		}
 
-		sched, err := schedule.Weekly(ws.AutostopSchedule)
-		if err != nil {
-			return time.Time{}, nil
-		}
-
-		deadline = sched.Next(now)
+		deadline = ws.LatestBuild.UpdatedAt.Add(*ws.TTL)
 		callback = func() {
 			ttl := deadline.Sub(now)
 			var title, body string
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"cSpell.words": [`
	`3`	`+ "buildname",`
`3`	`4`	`"circbuf",`
`4`	`5`	`"cliflag",`
`5`	`6`	`"cliui",`
`@@ -55,6 +56,7 @@`
`55`	`56`	`"TCGETS",`
`56`	`57`	`"tcpip",`
`57`	`58`	`"TCSETS",`
	`59`	`+ "testid",`
`58`	`60`	`"tfexec",`
`59`	`61`	`"tfjson",`
`60`	`62`	`"tfstate",`
`@@ -76,7 +78,7 @@`
`76`	`78`	`},`
`77`	`79`	`{`
`78`	`80`	`"match": "provisionerd/proto/provisionerd.proto",`
`79`		`- "cmd": "make provisionerd/proto/provisionerd.pb.go",`
	`81`	`+ "cmd": "make provisionerd/proto/provisionerd.pb.go"`
`80`	`82`	`}`
`81`	`83`	`]`
`82`	`84`	`},`
`@@ -104,5 +106,5 @@`
`104`	`106`	`},`
`105`	`107`	`// We often use a version of TypeScript that's ahead of the version shipped`
`106`	`108`	`// with VS Code.`
`107`		`- "typescript.tsdk": "./site/node_modules/typescript/lib",`
	`109`	`+ "typescript.tsdk": "./site/node_modules/typescript/lib"`
`108`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ package usershell`
`3`	`3`	`import "os"`
`4`	`4`
`5`	`5`	`// Get returns the $SHELL environment variable.`
`6`		`-func Get(username string) (string, error) {`
	`6`	`+func Get(_ string) (string, error) {`
`7`	`7`	`return os.Getenv("SHELL"), nil`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func list() *cobra.Command {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`tableWriter := cliui.Table()`
`52`		`- header := table.Row{"workspace", "template", "status", "last built", "outdated", "autostart", "autostop"}`
	`52`	`+ header := table.Row{"workspace", "template", "status", "last built", "outdated", "autostart", "ttl"}`
`53`	`53`	`tableWriter.AppendHeader(header)`
`54`	`54`	`tableWriter.SortBy([]table.SortBy{{`
`55`	`55`	`Name: "workspace",`
`@@ -116,10 +116,8 @@ func list() *cobra.Command {`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`autostopDisplay := "-"`
`119`		`- if workspace.AutostopSchedule != "" {`
`120`		`- if sched, err := schedule.Weekly(workspace.AutostopSchedule); err == nil {`
`121`		`- autostopDisplay = sched.Cron()`
`122`		`- }`
	`119`	`+ if workspace.TTL != nil {`
	`120`	`+ autostopDisplay = workspace.TTL.String()`
`123`	`121`	`}`
`124`	`122`
`125`	`123`	`user := usersByID[workspace.OwnerID]`