Skip to content

fix: coderd: decouple ttl and deadline #2282

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 11 commits into from
Jun 14, 2022
Merged

fix: coderd: decouple ttl and deadline #2282

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a19a0e9
fix: coderd: decouple ttl and deadline
johnstcn Jun 13, 2022
3999661
yarn lint
johnstcn Jun 13, 2022
f5ce8a3
update storybook
johnstcn Jun 13, 2022
987f785
fmt
johnstcn Jun 13, 2022
cd4dce3
fix ttl command
johnstcn Jun 14, 2022
91e3171
drive-by: default ttl to min(12 hours, template max) for new workspaces
johnstcn Jun 14, 2022
00ac2a2
fix: WorkspaceSchedule: show tz of schedule if available, default to …
johnstcn Jun 14, 2022
3faf3c8
cli: list: measure extension from provisioner job completed_at
johnstcn Jun 14, 2022
a763d2f
WorkspaceScheduleForm: fix "a few seconds after start"
johnstcn Jun 14, 2022
bbd8288
address PR comments
johnstcn Jun 14, 2022
feef823
Merge remote-tracking branch 'origin/main' into cj/2229/decouple-ws-d…
johnstcn Jun 14, 2022
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
Prev Previous commit
Next Next commit
address PR comments
  • Loading branch information
@johnstcn
johnstcn committed Jun 14, 2022
commit bbd8288a6fcd5d18803d5e044bf10f8a686d31fc
5 changes: 3 additions & 2 deletions cli/bump.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ func bump() *cobra.Command {

_, _ = fmt.Fprintf(
cmd.OutOrStdout(),
"Workspace %q will now stop at %s\n", workspace.Name,
newDeadline.Format(time.RFC822),
"Workspace %q will now stop at %s on %s\n", workspace.Name,
newDeadline.Format(timeFormat),
newDeadline.Format(dateFormat),
)

return nil
Expand Down
6 changes: 6 additions & 0 deletions cli/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package cli

const (
timeFormat = "3:04:05 PM MST"
dateFormat = "Jan 2, 2006"
)
6 changes: 4 additions & 2 deletions cli/ttl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,12 @@ func ttlset() *cobra.Command {
nextShutdown := sched.Next(time.Now()).Add(truncated).In(sched.Location())
_, _ = 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"),
nextShutdown.Format(timeFormat),
nextShutdown.Format(dateFormat),
truncated,
)

_, _ = fmt.Fprintf(cmd.OutOrStdout(), "NOTE: this will only take effect the next time the workspace is started.\n")
return nil
},
}
Expand Down
4 changes: 3 additions & 1 deletion coderd/workspaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ import (
"github.com/coder/coder/codersdk"
)

const workspaceDefaultTTL = 12 * time.Hour

func (api *API) workspace(rw http.ResponseWriter, r *http.Request) {
workspace := httpmw.WorkspaceParam(r)
if !api.Authorize(rw, r, rbac.ActionRead, workspace) {
Expand Down Expand Up @@ -320,7 +322,7 @@ func (api *API) postWorkspacesByOrganization(rw http.ResponseWriter, r *http.Req

if !dbTTL.Valid {
// Default to min(12 hours, template maximum). Just defaulting to template maximum can be surprising.
dbTTL = sql.NullInt64{Valid: true, Int64: min(template.MaxTtl, int64(12*time.Hour))}
dbTTL = sql.NullInt64{Valid: true, Int64: min(template.MaxTtl, int64(workspaceDefaultTTL))}
}

workspace, err := api.Database.GetWorkspaceByOwnerIDAndName(r.Context(), database.GetWorkspaceByOwnerIDAndNameParams{
Expand Down