Skip to content

fix: do not set max deadline for workspaces on template update #12446

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 7 commits into from
Mar 7, 2024
Merged

fix: do not set max deadline for workspaces on template update #12446

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9cfcc0b
fix: do not set max deadline for workspaces on template update
deansheather Mar 6, 2024
7e393dc
fixup! fix: do not set max deadline for workspaces on template update
deansheather Mar 6, 2024
f249a64
fixup! fix: do not set max deadline for workspaces on template update
deansheather Mar 6, 2024
3c0dc00
test: add unit test to excercise template schedule bug
Emyrk Mar 6, 2024
e2058d1
add test comment
Emyrk Mar 6, 2024
9625637
add unit test to ensure deadline is never nil if maxdeadline is set
Emyrk Mar 6, 2024
295b755
add comment to explain grace period
Emyrk Mar 6, 2024
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
test: add unit test to excercise template schedule bug 
added a user without quiet hours and a template without a autostop
requirment to trigger the bug.
  • Loading branch information
@Emyrk
Emyrk committed Mar 6, 2024
commit 3c0dc000727c9fab671e371c7c96261b978b600c
65 changes: 48 additions & 17 deletions enterprise/coderd/schedule/template_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,30 +27,35 @@ func TestTemplateUpdateBuildDeadlines(t *testing.T) {
db, _ := dbtestutil.NewDB(t)

var (
org = dbgen.Organization(t, db, database.Organization{})
user = dbgen.User(t, db, database.User{})
org = dbgen.Organization(t, db, database.Organization{})
quietUser = dbgen.User(t, db, database.User{
Username: "quiet",
})
noQuietUser = dbgen.User(t, db, database.User{
Username: "no-quiet",
})
file = dbgen.File(t, db, database.File{
CreatedBy: user.ID,
CreatedBy: quietUser.ID,
})
templateJob = dbgen.ProvisionerJob(t, db, nil, database.ProvisionerJob{
OrganizationID: org.ID,
FileID: file.ID,
InitiatorID: user.ID,
InitiatorID: quietUser.ID,
Tags: database.StringMap{
"foo": "bar",
},
})
templateVersion = dbgen.TemplateVersion(t, db, database.TemplateVersion{
OrganizationID: org.ID,
CreatedBy: user.ID,
CreatedBy: quietUser.ID,
JobID: templateJob.ID,
})
)

const userQuietHoursSchedule = "CRON_TZ=UTC 0 0 * * *" // midnight UTC
ctx := testutil.Context(t, testutil.WaitLong)
user, err := db.UpdateUserQuietHoursSchedule(ctx, database.UpdateUserQuietHoursScheduleParams{
ID: user.ID,
quietUser, err := db.UpdateUserQuietHoursSchedule(ctx, database.UpdateUserQuietHoursScheduleParams{
ID: quietUser.ID,
QuietHoursSchedule: userQuietHoursSchedule,
})
require.NoError(t, err)
Expand All @@ -68,6 +73,8 @@ func TestTemplateUpdateBuildDeadlines(t *testing.T) {
maxDeadline time.Time
newDeadline time.Time // 0 for no change
newMaxDeadline time.Time
noQuietHours bool
autostopReq *agplschedule.TemplateAutostopRequirement
}{
{
name: "SkippedWorkspaceMaxDeadlineTooSoon",
Expand Down Expand Up @@ -123,6 +130,20 @@ func TestTemplateUpdateBuildDeadlines(t *testing.T) {
newDeadline: nextQuietHours,
newMaxDeadline: nextQuietHours,
},
{
name: "MaxDealineShouldBeUnset",
now: buildTime,
deadline: buildTime.Add(time.Hour * 8),
maxDeadline: time.Time{}, // No max set
// Should be unchanged
newDeadline: buildTime.Add(time.Hour * 8),
newMaxDeadline: time.Time{},
noQuietHours: true,
autostopReq: &agplschedule.TemplateAutostopRequirement{
DaysOfWeek: 0,
Weeks: 0,
},
},
}

for _, c := range cases {
Expand All @@ -131,6 +152,11 @@ func TestTemplateUpdateBuildDeadlines(t *testing.T) {
t.Run(c.name, func(t *testing.T) {
t.Parallel()

user := quietUser
if c.noQuietHours {
user = noQuietUser
}

t.Log("buildTime", buildTime)
t.Log("nextQuietHours", nextQuietHours)
t.Log("now", c.now)
Expand Down Expand Up @@ -217,17 +243,22 @@ func TestTemplateUpdateBuildDeadlines(t *testing.T) {
templateScheduleStore.TimeNowFn = func() time.Time {
return c.now
}

autostopReq := agplschedule.TemplateAutostopRequirement{
// Every day
DaysOfWeek: 0b01111111,
Weeks: 0,
}
if c.autostopReq != nil {
autostopReq = *c.autostopReq
}
_, err = templateScheduleStore.Set(ctx, db, template, agplschedule.TemplateScheduleOptions{
UserAutostartEnabled: false,
UserAutostopEnabled: false,
DefaultTTL: 0,
MaxTTL: 0,
UseMaxTTL: false,
AutostopRequirement: agplschedule.TemplateAutostopRequirement{
// Every day
DaysOfWeek: 0b01111111,
Weeks: 0,
},
UserAutostartEnabled: false,
UserAutostopEnabled: false,
DefaultTTL: 0,
MaxTTL: 0,
UseMaxTTL: false,
AutostopRequirement: autostopReq,
FailureTTL: 0,
TimeTilDormant: 0,
TimeTilDormantAutoDelete: 0,
Expand Down