GREEN: do the thing

coder · johnstcn · Jun 9, 2022 · Jun 7, 2022 · Jun 7, 2022 · Jun 8, 2022
commit 07320a42a94185c9bc539c73e1fe61514c7f7e33
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -539,11 +539,57 @@ func (api *API) putWorkspaceTTL(rw http.ResponseWriter, r *http.Request) {
 	})
 	if err != nil {
 		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
-			Message: "Internal error updating workspace TTL.",
+			Message: "Error updating workspace TTL!",
 			Detail:  err.Error(),
 		})
 		return
 	}
+
+	// Also extend the workspace deadline if the workspace is running
+	latestBuild, err := api.Database.GetLatestWorkspaceBuildByWorkspaceID(r.Context(), workspace.ID)
+	if err != nil {
+		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
+			Message: "Error fetching latest workspace build!",
+			Detail:  err.Error(),
+		})
+		return
+	}
+
+	if latestBuild.Transition != database.WorkspaceTransitionStart {
+		httpapi.Write(rw, http.StatusOK, nil)
+		return
+	}
+
+	if latestBuild.UpdatedAt.IsZero() {
+		// Build in progress; provisionerd should update with the new TTL.
+		httpapi.Write(rw, http.StatusOK, nil)
+		return
+	}
+
+	var newDeadline time.Time
+	if dbTTL.Valid {
+		newDeadline = latestBuild.UpdatedAt.Add(time.Duration(dbTTL.Int64))
+	}
+
+	err = api.Database.UpdateWorkspaceBuildByID(
+		r.Context(),
+		database.UpdateWorkspaceBuildByIDParams{
+			ID:               latestBuild.ID,
+			UpdatedAt:        latestBuild.UpdatedAt,
+			ProvisionerState: latestBuild.ProvisionerState,
+			Deadline:         newDeadline,
+		},
+	)
+
+	if err != nil {
+		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
+			Message: "Internal error extending workspace deadline.",
+			Detail:  err.Error(),
+		})
+		return
+	}
+
+	httpapi.Write(rw, http.StatusOK, nil)
 }
 
 func (api *API) putExtendWorkspace(rw http.ResponseWriter, r *http.Request) {

diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
@@ -521,19 +521,16 @@ func TestWorkspaceUpdateAutostart(t *testing.T) {
 			name:          "invalid location",
 			schedule:      ptr.Ref("CRON_TZ=Imaginary/Place 30 9 * * 1-5"),
 			expectedError: "parse schedule: provided bad location Imaginary/Place: unknown time zone Imaginary/Place",
-			// expectedError: "status code 500: Invalid autostart schedule\n\tError: parse schedule: provided bad location Imaginary/Place: unknown time zone Imaginary/Place",
 		},
 		{
 			name:          "invalid schedule",
 			schedule:      ptr.Ref("asdf asdf asdf "),
 			expectedError: `validate weekly schedule: expected schedule to consist of 5 fields with an optional CRON_TZ=<timezone> prefix`,
-			// expectedError: "status code 500: Invalid autostart schedule\n\tError: validate weekly schedule: expected schedule to consist of 5 fields with an optional CRON_TZ=<timezone> prefix",
 		},
 		{
 			name:          "only 3 values",
 			schedule:      ptr.Ref("CRON_TZ=Europe/Dublin 30 9 *"),
 			expectedError: `validate weekly schedule: expected schedule to consist of 5 fields with an optional CRON_TZ=<timezone> prefix`,
-			// expectedError: "status code 500: Invalid autostart schedule\n\tError: validate weekly schedule: expected schedule to consist of 5 fields with an optional CRON_TZ=<timezone> prefix",
 		},
 	}
 
@@ -611,16 +608,23 @@ func TestWorkspaceUpdateTTL(t *testing.T) {
 	t.Parallel()
 
 	testCases := []struct {
-		name           string
-		ttlMillis      *int64
-		expectedError  string
-		modifyTemplate func(*codersdk.CreateTemplateRequest)
+		name             string
+		ttlMillis        *int64
+		expectedError    string
+		expectedDeadline time.Time
+		modifyTemplate   func(*codersdk.CreateTemplateRequest)
 	}{
 		{
 			name:          "disable ttl",
 			ttlMillis:     nil,
 			expectedError: "",
 		},
+		{
+			name:             "update ttl",
+			ttlMillis:        ptr.Ref(12 * time.Hour.Milliseconds()),
+			expectedError:    "",
+			expectedDeadline: time.Now().Add(12 * time.Hour),
+		},
 		{
 			name:          "below minimum ttl",
 			ttlMillis:     ptr.Ref((30 * time.Second).Milliseconds()),
@@ -686,6 +690,9 @@ 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.IsZero() {
+				require.WithinDuration(t, testCase.expectedDeadline, updated.LatestBuild.Deadline, time.Minute, "expected autostop deadline to be equal expected")
+			}
 		})
 	}