address PR comments

johnstcn · johnstcn · commit b12e19eff8b3 · 2022-05-26T16:48:10.000Z
diff --git a/coderd/autobuild/executor/lifecycle_executor.go b/coderd/autobuild/executor/lifecycle_executor.go
@@ -98,8 +98,7 @@ func (e *Executor) runOnce(t time.Time) error {
 					)
 					continue
 				}
-				// Truncate to nearest minute for consistency with autostart
-				// behavior, and add one minute for padding.
+				// Truncate to nearest minute for consistency with autostart behavior
 				nextTransition = priorHistory.Deadline.Truncate(time.Minute)
 			case database.WorkspaceTransitionStop:
 				validTransition = database.WorkspaceTransitionStart
diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -550,7 +550,7 @@ func (server *provisionerdServer) CompleteJob(ctx context.Context, completed *pr
 			workspace, err := db.GetWorkspaceByID(ctx, workspaceBuild.WorkspaceID)
 			if err == nil {
 				if workspace.Ttl.Valid {
-					workspaceDeadline = now.Add(time.Duration(workspace.Ttl.Int64))
+					workspaceDeadline = now.Add(time.Duration(workspace.Ttl.Int64)).Truncate(time.Minute)
 				}
 			} else {
 				// Huh? Did the workspace get deleted?
@@ -569,8 +569,8 @@ func (server *provisionerdServer) CompleteJob(ctx context.Context, completed *pr
 				return xerrors.Errorf("update provisioner job: %w", err)
 			}
 			err = db.UpdateWorkspaceBuildByID(ctx, database.UpdateWorkspaceBuildByIDParams{
-				Deadline:         workspaceDeadline,
 				ID:               workspaceBuild.ID,
+				Deadline:         workspaceDeadline,
 				ProvisionerState: jobType.WorkspaceBuild.State,
 				UpdatedAt:        now,
 			})
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -574,8 +574,7 @@ func (api *API) putWorkspaceTTL(rw http.ResponseWriter, r *http.Request) {
 func (api *API) putExtendWorkspace(rw http.ResponseWriter, r *http.Request) {
 	workspace := httpmw.WorkspaceParam(r)
 
-	if !api.Authorize(rw, r, rbac.ActionUpdate, rbac.ResourceWorkspace.
-		InOrg(workspace.OrganizationID).WithOwner(workspace.OwnerID.String()).WithID(workspace.ID.String())) {
+	if !api.Authorize(rw, r, rbac.ActionUpdate, workspace) {
 		return
 	}
 
@@ -598,18 +597,19 @@ func (api *API) putExtendWorkspace(rw http.ResponseWriter, r *http.Request) {
 			return xerrors.Errorf("workspace must be started, current status: %s", build.Transition)
 		}
 
-		newDeadline := req.Deadline.UTC()
+		newDeadline := req.Deadline.Truncate(time.Minute).UTC()
 		if newDeadline.IsZero() {
 			// This should not be possible because the struct validation field enforces a non-zero value.
 			code = http.StatusBadRequest
 			return xerrors.New("new deadline cannot be zero")
 		}
 
-		if newDeadline.Before(build.Deadline) {
+		if newDeadline.Before(build.Deadline) || newDeadline.Before(time.Now()) {
 			code = http.StatusBadRequest
 			return xerrors.Errorf("new deadline %q must be after existing deadline %q", newDeadline.Format(time.RFC3339), build.Deadline.Format(time.RFC3339))
 		}
 
+		// both newDeadline and build.Deadline are truncated to time.Minute
 		if newDeadline == build.Deadline {
 			code = http.StatusNotModified
 			return nil
diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
@@ -633,7 +633,7 @@ func TestWorkspaceExtend(t *testing.T) {
 
 	workspace, err := client.Workspace(ctx, workspace.ID)
 	require.NoError(t, err, "fetch provisioned workspace")
-	require.InDelta(t, oldDeadline.Unix(), workspace.LatestBuild.Deadline.Unix(), 1)
+	require.InDelta(t, oldDeadline.Unix(), workspace.LatestBuild.Deadline.Unix(), 60)
 
 	// Updating the deadline should succeed
 	req := codersdk.PutExtendWorkspaceRequest{
@@ -645,7 +645,7 @@ func TestWorkspaceExtend(t *testing.T) {
 	// Ensure deadline set correctly
 	updated, err := client.Workspace(ctx, workspace.ID)
 	require.NoError(t, err, "failed to fetch updated workspace")
-	require.InDelta(t, newDeadline.Unix(), updated.LatestBuild.Deadline.Unix(), 1)
+	require.InDelta(t, newDeadline.Unix(), updated.LatestBuild.Deadline.Unix(), 60)
 
 	// Zero time should fail
 	err = client.PutExtendWorkspace(ctx, workspace.ID, codersdk.PutExtendWorkspaceRequest{
@@ -662,7 +662,7 @@ func TestWorkspaceExtend(t *testing.T) {
 	// Ensure deadline still set correctly
 	updated, err = client.Workspace(ctx, workspace.ID)
 	require.NoError(t, err, "failed to fetch updated workspace")
-	require.InDelta(t, newDeadline.Unix(), updated.LatestBuild.Deadline.Unix(), 1)
+	require.InDelta(t, newDeadline.Unix(), updated.LatestBuild.Deadline.Unix(), 60)
 }
 
 func TestWorkspaceWatcher(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,7 @@ func (e *Executor) runOnce(t time.Time) error {`
`98`	`98`	`)`
`99`	`99`	`continue`
`100`	`100`	`}`
`101`		`- // Truncate to nearest minute for consistency with autostart`
`102`		`- // behavior, and add one minute for padding.`
	`101`	`+ // Truncate to nearest minute for consistency with autostart behavior`
`103`	`102`	`nextTransition = priorHistory.Deadline.Truncate(time.Minute)`
`104`	`103`	`case database.WorkspaceTransitionStop:`
`105`	`104`	`validTransition = database.WorkspaceTransitionStart`