Skip to content

feat: allow removing deadline for running workspace #16085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 13, 2025
Merged

feat: allow removing deadline for running workspace #16085

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
46f6f9c
chore: remove deadline from running workspaces on ttl change
DanielleMaywood Jan 8, 2025
5ed74c0
test: add tests
DanielleMaywood Jan 9, 2025
7a9e872
test: remove test for old behaviour
DanielleMaywood Jan 10, 2025
1698b13
chore: fix lint issues
DanielleMaywood Jan 13, 2025
d787abb
chore: re-add old test but refactored
DanielleMaywood Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
chore: remove deadline from running workspaces on ttl change
  • Loading branch information
@DanielleMaywood
DanielleMaywood committed Jan 9, 2025
commit 46f6f9cda7a72d79bebefdf074782f99aeb9f895
19 changes: 19 additions & 0 deletions coderd/workspaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,25 @@ func (api *API) putWorkspaceTTL(rw http.ResponseWriter, r *http.Request) {
return xerrors.Errorf("update workspace time until shutdown: %w", err)
}

// If autostop has been disabled, we want to remove the deadline from the
// existing workspace build (if there is one).
if !dbTTL.Valid {
build, err := s.GetLatestWorkspaceBuildByWorkspaceID(ctx, workspace.ID)
if err != nil {
return xerrors.Errorf("get latest workspace build: %w", err)
}

if build.Transition == database.WorkspaceTransitionStart {
if err = s.UpdateWorkspaceBuildDeadlineByID(ctx, database.UpdateWorkspaceBuildDeadlineByIDParams{
ID: build.ID,
Deadline: time.Time{},
MaxDeadline: build.MaxDeadline,
}); err != nil {
return xerrors.Errorf("update workspace build deadline: %w", err)
}
}
}

return nil
}, nil)
if err != nil {
Expand Down
5 changes: 4 additions & 1 deletion site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,10 @@ export const WorkspaceSchedulePage: FC = () => {

await submitScheduleMutation.mutateAsync(data);

if (data.autostopChanged) {
if (
data.autostopChanged &&
getAutostop(workspace).autostopEnabled
) {
Comment on lines +121 to +124
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My gut tells me that this will need an update to WorkspaceSchedulePage.stories.tsx.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll take a look 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there aren't any existing stories covering hitting the "Save" button on the form.

setIsConfirmingApply(true);
}
}}
Expand Down