fix: coderd: decouple ttl and deadline

johnstcn · johnstcn · commit faebe14938ad · 2022-06-13T21:11:02.000Z
diff --git a/cli/ttl.go b/cli/ttl.go
@@ -1,14 +1,14 @@
 package cli
 
 import (
-	"errors"
 	"fmt"
 	"time"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/xerrors"
 
-	"github.com/coder/coder/cli/cliui"
+	"github.com/coder/coder/coderd/autobuild/schedule"
+	"github.com/coder/coder/coderd/util/ptr"
 	"github.com/coder/coder/codersdk"
 )
 
@@ -91,37 +91,35 @@ func ttlset() *cobra.Command {
 				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "warning: ttl rounded down to %s\n", truncated)
 			}
 
-			if changed, newDeadline := changedNewDeadline(workspace, truncated); changed {
-				// For the purposes of the user, "less than a minute" is essentially the same as "immediately".
-				timeRemaining := time.Until(newDeadline).Truncate(time.Minute)
-				humanRemaining := "in " + timeRemaining.String()
-				if timeRemaining <= 0 {
-					humanRemaining = "immediately"
-				}
-				_, err = cliui.Prompt(cmd, cliui.PromptOptions{
-					Text: fmt.Sprintf(
-						"Workspace %q will be stopped %s. Are you sure?",
-						workspace.Name,
-						humanRemaining,
-					),
-					Default:   "yes",
-					IsConfirm: true,
-				})
-				if err != nil {
-					if errors.Is(err, cliui.Canceled) {
-						return nil
-					}
-					return err
-				}
-			}
-
 			millis := truncated.Milliseconds()
 			if err = client.UpdateWorkspaceTTL(cmd.Context(), workspace.ID, codersdk.UpdateWorkspaceTTLRequest{
 				TTLMillis: &millis,
 			}); err != nil {
 				return xerrors.Errorf("update workspace ttl: %w", err)
 			}
 
+			if ptr.NilOrEmpty(workspace.AutostartSchedule) {
+				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "%q will shut down %s after start.\n", workspace.Name, truncated)
+				return nil
+			}
+
+			sched, err := schedule.Weekly(*workspace.AutostartSchedule)
+			if err != nil {
+				return xerrors.Errorf("parse workspace schedule: %w", err)
+			}
+
+			loc, err := time.LoadLocation(sched.Timezone())
+			if err != nil {
+				return xerrors.Errorf("schedule has invalid timezone: %w", err)
+			}
+
+			nextShutdown := sched.Next(time.Now()).Add(truncated).In(loc)
+			_, _ = 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"),
+				truncated,
+			)
 			return nil
 		},
 	}
@@ -157,18 +155,3 @@ func ttlunset() *cobra.Command {
 		},
 	}
 }
-
-func changedNewDeadline(ws codersdk.Workspace, newTTL time.Duration) (changed bool, newDeadline time.Time) {
-	if ws.LatestBuild.Transition != codersdk.WorkspaceTransitionStart {
-		// not running
-		return false, newDeadline
-	}
-
-	if ws.LatestBuild.Job.CompletedAt == nil {
-		// still building
-		return false, newDeadline
-	}
-
-	newDeadline = ws.LatestBuild.Job.CompletedAt.Add(newTTL)
-	return true, newDeadline
-}
diff --git a/cli/ttl_test.go b/cli/ttl_test.go
@@ -3,7 +3,6 @@ package cli_test
 import (
 	"bytes"
 	"context"
-	"fmt"
 	"strings"
 	"testing"
 	"time"
@@ -109,9 +108,6 @@ func TestTTL(t *testing.T) {
 			assert.NoError(t, err, "unexpected error")
 		}()
 
-		pty.ExpectMatch(fmt.Sprintf("warning: ttl rounded down to %s", ttl.Truncate(time.Minute)))
-		pty.ExpectMatch(fmt.Sprintf("Workspace %q will be stopped in 8h29m0s. Are you sure?", workspace.Name))
-		pty.WriteLine("yes")
 		// Ensure ttl updated
 		updated, err := client.Workspace(ctx, workspace.ID)
 		require.NoError(t, err, "fetch updated workspace")
diff --git a/coderd/autobuild/executor/lifecycle_executor.go b/coderd/autobuild/executor/lifecycle_executor.go
@@ -85,11 +85,9 @@ func (e *Executor) runOnce(t time.Time) Stats {
 		// is what we compare against when performing autostop operations, rounded down
 		// to the minute.
 		//
-		// NOTE: Currently, if a workspace build is created with a given TTL and then
-		//       the user either changes or unsets the TTL, the deadline for the workspace
-		//       build will not have changed. So, autostop will still happen at the
-		//       original TTL value from when the workspace build was created.
-		//       Whether this is expected behavior from a user's perspective is not yet known.
+		// NOTE: If a workspace build is created with a given TTL and then the user either
+		//       changes or unsets the TTL, the deadline for the workspace build will not
+		//       have changed. This behavior is as expected per #2229.
 		eligibleWorkspaces, err := db.GetWorkspacesAutostart(e.ctx)
 		if err != nil {
 			return xerrors.Errorf("get eligible workspaces for autostart or autostop: %w", err)
diff --git a/coderd/autobuild/executor/lifecycle_executor_test.go b/coderd/autobuild/executor/lifecycle_executor_test.go
@@ -308,8 +308,7 @@ func TestExecutorAutostopNotEnabled(t *testing.T) {
 	require.NoError(t, err)
 	require.Nil(t, workspace.TTLMillis)
 
-	// TODO(cian): need to stop and start the workspace as we do not update the deadline yet
-	//             see: https://github.com/coder/coder/issues/1783
+	// TODO(cian): need to stop and start the workspace as we do not update the deadline. See: #2229
 	coderdtest.MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
 	coderdtest.MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStop, database.WorkspaceTransitionStart)
 
@@ -440,41 +439,47 @@ func TestExecutorWorkspaceAutostopNoWaitChangedMyMind(t *testing.T) {
 	err := client.UpdateWorkspaceTTL(ctx, workspace.ID, codersdk.UpdateWorkspaceTTLRequest{TTLMillis: nil})
 	require.NoError(t, err)
 
-	// Then: the deadline should be the zero value
+	// Then: the deadline should still be the original value
 	updated := coderdtest.MustWorkspace(t, client, workspace.ID)
-	assert.Zero(t, updated.LatestBuild.Deadline)
+	assert.WithinDuration(t, workspace.LatestBuild.Deadline, updated.LatestBuild.Deadline, time.Minute)
 
 	// When: the autobuild executor ticks after the original deadline
 	go func() {
 		tickCh <- workspace.LatestBuild.Deadline.Add(time.Minute)
 	}()
 
-	// Then: the workspace should not stop
+	// Then: the workspace should stop
 	stats := <-statsCh
 	assert.NoError(t, stats.Error)
-	assert.Len(t, stats.Transitions, 0)
+	assert.Len(t, stats.Transitions, 1)
+	assert.Equal(t, stats.Transitions[workspace.ID], database.WorkspaceTransitionStop)
+
+	// Wait for stop to complete
+	updated = coderdtest.MustWorkspace(t, client, workspace.ID)
+	_ = coderdtest.AwaitWorkspaceBuildJob(t, client, updated.LatestBuild.ID)
+
+	// Start the workspace again
+	workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStop, database.WorkspaceTransitionStart)
 
 	// Given: the user changes their mind again and wants to enable auto-stop
 	newTTL := 8 * time.Hour
-	expectedDeadline := workspace.LatestBuild.UpdatedAt.Add(newTTL)
 	err = client.UpdateWorkspaceTTL(ctx, workspace.ID, codersdk.UpdateWorkspaceTTLRequest{TTLMillis: ptr.Ref(newTTL.Milliseconds())})
 	require.NoError(t, err)
 
-	// Then: the deadline should be updated based on the TTL
+	// Then: the deadline should remain at the zero value
 	updated = coderdtest.MustWorkspace(t, client, workspace.ID)
-	assert.WithinDuration(t, expectedDeadline, updated.LatestBuild.Deadline, time.Minute)
+	assert.Zero(t, updated.LatestBuild.Deadline)
 
 	// When: the relentless onward march of time continues
 	go func() {
 		tickCh <- workspace.LatestBuild.Deadline.Add(newTTL + time.Minute)
 		close(tickCh)
 	}()
 
-	// Then: the workspace should stop
+	// Then: the workspace should not stop
 	stats = <-statsCh
 	assert.NoError(t, stats.Error)
-	assert.Len(t, stats.Transitions, 1)
-	assert.Equal(t, stats.Transitions[workspace.ID], database.WorkspaceTransitionStop)
+	assert.Len(t, stats.Transitions, 0)
 }
 
 func TestExecutorAutostartMultipleOK(t *testing.T) {
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -541,75 +541,41 @@ func (api *API) putWorkspaceTTL(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	template, err := api.Database.GetTemplateByID(r.Context(), workspace.TemplateID)
-	if err != nil {
-		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
-			Message: "Error fetching workspace template!",
-		})
-		return
-	}
+	var validErrs []httpapi.Error
 
-	dbTTL, err := validWorkspaceTTLMillis(req.TTLMillis, time.Duration(template.MaxTtl))
-	if err != nil {
-		httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
-			Message: "Invalid workspace TTL.",
-			Detail:  err.Error(),
-			Validations: []httpapi.Error{
-				{
-					Field:  "ttl_ms",
-					Detail: err.Error(),
-				},
-			},
-		})
-		return
-	}
+	err := api.Database.InTx(func(s database.Store) error {
+		template, err := s.GetTemplateByID(r.Context(), workspace.TemplateID)
+		if err != nil {
+			httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
+				Message: "Error fetching workspace template!",
+			})
+			return xerrors.Errorf("fetch workspace template: %w", err)
+		}
 
-	err = api.Database.InTx(func(s database.Store) error {
+		dbTTL, err := validWorkspaceTTLMillis(req.TTLMillis, time.Duration(template.MaxTtl))
+		if err != nil {
+			validErrs = append(validErrs, httpapi.Error{Field: "ttl_ms", Detail: err.Error()})
+			return err
+		}
 		if err := s.UpdateWorkspaceTTL(r.Context(), database.UpdateWorkspaceTTLParams{
 			ID:  workspace.ID,
 			Ttl: dbTTL,
 		}); err != nil {
 			return xerrors.Errorf("update workspace TTL: %w", err)
 		}
 
-		// Also extend the workspace deadline if the workspace is running
-		latestBuild, err := s.GetLatestWorkspaceBuildByWorkspaceID(r.Context(), workspace.ID)
-		if err != nil {
-			return xerrors.Errorf("get latest workspace build: %w", err)
-		}
-
-		if latestBuild.Transition != database.WorkspaceTransitionStart {
-			return nil // nothing to do
-		}
-
-		if latestBuild.UpdatedAt.IsZero() {
-			// Build in progress; provisionerd should update with the new TTL.
-			return nil
-		}
-
-		var newDeadline time.Time
-		if dbTTL.Valid {
-			newDeadline = latestBuild.UpdatedAt.Add(time.Duration(dbTTL.Int64))
-		}
-
-		if err := s.UpdateWorkspaceBuildByID(
-			r.Context(),
-			database.UpdateWorkspaceBuildByIDParams{
-				ID:               latestBuild.ID,
-				UpdatedAt:        latestBuild.UpdatedAt,
-				ProvisionerState: latestBuild.ProvisionerState,
-				Deadline:         newDeadline,
-			},
-		); err != nil {
-			return xerrors.Errorf("update workspace deadline: %w", err)
-		}
 		return nil
 	})
 
 	if err != nil {
-		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
-			Message: "Error updating workspace time until shutdown!",
-			Detail:  err.Error(),
+		code := http.StatusInternalServerError
+		if len(validErrs) > 0 {
+			code = http.StatusBadRequest
+		}
+		httpapi.Write(rw, code, httpapi.Response{
+			Message:     "Error updating workspace time until shutdown!",
+			Validations: validErrs,
+			Detail:      err.Error(),
 		})
 		return
 	}
diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
@@ -668,40 +668,35 @@ func TestWorkspaceUpdateTTL(t *testing.T) {
 	t.Parallel()
 
 	testCases := []struct {
-		name             string
-		ttlMillis        *int64
-		expectedError    string
-		expectedDeadline *time.Time
-		modifyTemplate   func(*codersdk.CreateTemplateRequest)
+		name           string
+		ttlMillis      *int64
+		expectedError  string
+		modifyTemplate func(*codersdk.CreateTemplateRequest)
 	}{
 		{
-			name:             "disable ttl",
-			ttlMillis:        nil,
-			expectedError:    "",
-			expectedDeadline: ptr.Ref(time.Time{}),
+			name:          "disable ttl",
+			ttlMillis:     nil,
+			expectedError: "",
 		},
 		{
-			name:             "update ttl",
-			ttlMillis:        ptr.Ref(12 * time.Hour.Milliseconds()),
-			expectedError:    "",
-			expectedDeadline: ptr.Ref(time.Now().Add(12*time.Hour + time.Minute)),
+			name:          "update ttl",
+			ttlMillis:     ptr.Ref(12 * time.Hour.Milliseconds()),
+			expectedError: "",
 		},
 		{
 			name:          "below minimum ttl",
 			ttlMillis:     ptr.Ref((30 * time.Second).Milliseconds()),
 			expectedError: "ttl must be at least one minute",
 		},
 		{
-			name:             "minimum ttl",
-			ttlMillis:        ptr.Ref(time.Minute.Milliseconds()),
-			expectedError:    "",
-			expectedDeadline: ptr.Ref(time.Now().Add(2 * time.Minute)),
+			name:          "minimum ttl",
+			ttlMillis:     ptr.Ref(time.Minute.Milliseconds()),
+			expectedError: "",
 		},
 		{
-			name:             "maximum ttl",
-			ttlMillis:        ptr.Ref((24 * 7 * time.Hour).Milliseconds()),
-			expectedError:    "",
-			expectedDeadline: ptr.Ref(time.Now().Add(24*7*time.Hour + time.Minute)),
+			name:          "maximum ttl",
+			ttlMillis:     ptr.Ref((24 * 7 * time.Hour).Milliseconds()),
+			expectedError: "",
 		},
 		{
 			name:          "above maximum ttl",
@@ -754,9 +749,6 @@ func TestWorkspaceUpdateTTL(t *testing.T) {
 			require.NoError(t, err, "fetch updated workspace")
 
 			require.Equal(t, testCase.ttlMillis, updated.TTLMillis, "expected autostop ttl to equal requested")
-			if testCase.expectedDeadline != nil {
-				require.WithinDuration(t, *testCase.expectedDeadline, updated.LatestBuild.Deadline, time.Minute, "expected autostop deadline to be equal expected")
-			}
 		})
 	}
 
diff --git a/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.test.ts b/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.test.ts
diff --git a/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx b/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx
