fix: allow setting workspace deadline as early as now plus 30 minutes #2328
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
johnstcn
commented
Jun 14, 2022
coderd/workspaces.go
Outdated
Comment on lines
886
to
897
| now := time.Now() | ||
| if new.Before(now) { | ||
| return xerrors.New("new deadline must be in the future") | ||
| } | ||
|
|
||
| delta := new.Sub(old) | ||
| if delta < time.Minute { | ||
| return xerrors.New("minimum extension is one minute") | ||
| } | ||
|
|
||
| if delta > 24*time.Hour { | ||
| return xerrors.New("maximum extension is 24 hours") |
There was a problem hiding this comment.
review: Dropping these validations for the moment till we have more information from #2318
There was a problem hiding this comment.
Actually, there's one very important validation involving templates that I may have overlooked! Adding this in now.
3 tasks
deansheather
approved these changes
Jun 14, 2022
johnstcn
commented
Jun 14, 2022
Comment on lines
+1020
to
+1025
| // And with a deadline greater than the template max_ttl should also fail | ||
| deadlineExceedsMaxTTL := time.Now().Add(time.Duration(template.MaxTTLMillis) * time.Millisecond).Add(time.Minute) | ||
| err = client.PutExtendWorkspace(ctx, workspace.ID, codersdk.PutExtendWorkspaceRequest{ | ||
| Deadline: deadlineExceedsMaxTTL, | ||
| }) | ||
| require.ErrorContains(t, err, "new deadline is greater than template allows", "setting a deadline greater than that allowed by the template should fail") |
There was a problem hiding this comment.
review: I forgot to add this in earlier. We don't folks folks sneaking around template-level restrictions this way.
johnstcn
commented
Jun 14, 2022
| return xerrors.New("minimum extension is one minute") | ||
| // No idea how this could happen. | ||
| if newDeadline.Before(startedAt) { | ||
| return xerrors.Errorf("new deadline must be before workspace start time") |
There was a problem hiding this comment.
I figure if we get here, time is broken.
johnstcn
commented
Jun 14, 2022
Comment on lines
+611
to
+615
| if build.Deadline.IsZero() { | ||
| code = http.StatusConflict | ||
| resp.Message = "Workspace shutdown is manual." | ||
| return xerrors.Errorf("workspace shutdown is manual") | ||
| } |
There was a problem hiding this comment.
review: I'm not allowing this yet as if someone does, then there's currently no way to un-set this.
deansheather
approved these changes
Jun 14, 2022
johnstcn
commented
Jun 14, 2022
| @@ -62,7 +72,6 @@ func bump() *cobra.Command { | |||
| newDeadline.Format(timeFormat), | |||
| newDeadline.Format(dateFormat), | |||
| ) | |||
|
|
|||
| return nil | |||
| }, | |||
| } | |||
There was a problem hiding this comment.
Also: this won't be called coder bump any more.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR makes the following changes:
/api/v2/workspaces/:workspace/extendnow accepts any time at least 30 minutes in the futurecoder bumpcommand also allows the above. Some small copy changes to command.UI changes to come later.