coder · greyscaled · May 19, 2022 · May 18, 2022 · May 19, 2022 · May 19, 2022
diff --git a/agent/usershell/usershell_darwin.go b/agent/usershell/usershell_darwin.go
@@ -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
 }
diff --git a/cli/autostop.go b/cli/autostop.go
diff --git a/cli/list.go b/cli/list.go
@@ -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]

diff --git a/cli/root.go b/cli/root.go
@@ -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(),

diff --git a/cli/ssh.go b/cli/ssh.go
@@ -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

diff --git a/cli/ttl.go b/cli/ttl.go
@@ -0,0 +1,144 @@
+package cli
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/spf13/cobra"
+	"golang.org/x/xerrors"
+
+	"github.com/coder/coder/codersdk"
+)
+
+const ttlDescriptionLong = `To have your workspace stop automatically after a configurable interval has passed.
+Minimum TTL is 1 minute.
+`
+
+func ttl() *cobra.Command {
+	ttlCmd := &cobra.Command{
+		Annotations: workspaceCommand,
+		Use:         "ttl [command]",
+		Short:       "Schedule a workspace to automatically stop after a configurable interval",
+		Long:        ttlDescriptionLong,
+		Example:     "coder ttl set my-workspace 8h30m",
+	}
+
+	ttlCmd.AddCommand(ttlShow())
+	ttlCmd.AddCommand(ttlset())
+	ttlCmd.AddCommand(ttlunset())
+
+	return ttlCmd
+}
+
+func ttlShow() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:  "show <workspace_name>",
+		Args: cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			client, err := createClient(cmd)
+			if err != nil {
+				return xerrors.Errorf("create client: %w", err)
+			}
+			organization, err := currentOrganization(cmd, client)
+			if err != nil {
+				return xerrors.Errorf("get current org: %w", err)
+			}
+
+			workspace, err := client.WorkspaceByOwnerAndName(cmd.Context(), organization.ID, codersdk.Me, args[0])
+			if err != nil {
+				return xerrors.Errorf("get workspace: %w", err)
+			}
+
+			if workspace.TTL == nil {
+				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "not set\n")
+				return nil
+			}
+
+			_, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s\n", workspace.TTL)
+
+			return nil
+		},
+	}
+	return cmd
+}
+
+func ttlset() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:  "set <workspace_name> <ttl>",
+		Args: cobra.ExactArgs(2),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			client, err := createClient(cmd)
+			if err != nil {
+				return xerrors.Errorf("create client: %w", err)
+			}
+			organization, err := currentOrganization(cmd, client)
+			if err != nil {
+				return xerrors.Errorf("get current org: %w", err)
+			}
+
+			workspace, err := client.WorkspaceByOwnerAndName(cmd.Context(), organization.ID, codersdk.Me, args[0])
+			if err != nil {
+				return xerrors.Errorf("get workspace: %w", err)
+			}
+
+			ttl, err := time.ParseDuration(args[1])
+			if err != nil {
+				return xerrors.Errorf("parse ttl: %w", err)
+			}
+
+			truncated := ttl.Truncate(time.Minute)
+
+			if truncated == 0 {
+				return xerrors.Errorf("ttl must be at least 1m")
+			}
+
+			if truncated != ttl {
+				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "warning: ttl rounded down to %s\n", truncated)
+			}
+
+			err = client.UpdateWorkspaceTTL(cmd.Context(), workspace.ID, codersdk.UpdateWorkspaceTTLRequest{
+				TTL: &truncated,
+			})
+			if err != nil {
+				return xerrors.Errorf("update workspace ttl: %w", err)
+			}
+
+			return nil
+		},
+	}
+
+	return cmd
+}
+
+func ttlunset() *cobra.Command {
+	return &cobra.Command{
+		Use:  "unset <workspace_name>",
+		Args: cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			client, err := createClient(cmd)
+			if err != nil {
+				return xerrors.Errorf("create client: %w", err)
+			}
+			organization, err := currentOrganization(cmd, client)
+			if err != nil {
+				return xerrors.Errorf("get current org: %w", err)
+			}
+
+			workspace, err := client.WorkspaceByOwnerAndName(cmd.Context(), organization.ID, codersdk.Me, args[0])
+			if err != nil {
+				return xerrors.Errorf("get workspace: %w", err)
+			}
+
+			err = client.UpdateWorkspaceTTL(cmd.Context(), workspace.ID, codersdk.UpdateWorkspaceTTLRequest{
+				TTL: nil,
+			})
+			if err != nil {
+				return xerrors.Errorf("update workspace ttl: %w", err)
+			}
+
+			_, _ = fmt.Fprint(cmd.OutOrStdout(), "ttl unset\n", workspace.Name)
+
+			return nil
+		},
+	}
+}