opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: reword autostop reminder to use relative countdown (#26948)

Browse Source
This commit is contained in:
Jon Ayers
2026-07-01 21:24:42 -05:00
committed by GitHub
parent 40bceeaf8d
commit cda7a9d4f4
7 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coderd/autobuild/lifecycle_executor.go
+2 -2
View File
@@ -565,8 +565,8 @@ func (e *Executor) runOnce(t time.Time) Stats {
ws.OwnerID,
notifications.TemplateWorkspaceAutostopReminder,
map[string]string{
"workspace": ws.Name,
"deadline": reminderDeadline.UTC().Format(time.RFC1123),
"workspace": ws.Name,
"timeTilShutdown": humanize.Time(reminderDeadline),
},
"lifecycle_executor",
// Associate this notification with all the related entities.
coderd/autobuild/lifecycle_executor_test.go
+3 -3
View File
@@ -1994,7 +1994,7 @@ func TestExecutorAutostopReminder(t *testing.T) {
require.Len(t, sent, 1)
require.Equal(t, workspace.OwnerID, sent[0].UserID)
require.Equal(t, workspace.Name, sent[0].Labels["workspace"])
require.Equal(t, deadline.UTC().Format(time.RFC1123), sent[0].Labels["deadline"])
require.NotEmpty(t, sent[0].Labels["timeTilShutdown"])
require.Contains(t, sent[0].Targets, workspace.ID)
require.Contains(t, sent[0].Targets, workspace.OwnerID)
require.Contains(t, sent[0].Targets, workspace.TemplateID)
@@ -2169,7 +2169,7 @@ func TestExecutorAutostopReminder(t *testing.T) {
testutil.TryReceive(ctx, t, statsCh)
sent := notifyEnq.Sent(notificationstest.WithTemplateID(notifications.TemplateWorkspaceAutostopReminder))
require.Len(t, sent, 1)
require.Equal(t, deadline.UTC().Format(time.RFC1123), sent[0].Labels["deadline"])
require.NotEmpty(t, sent[0].Labels["timeTilShutdown"])
// Move the deadline well into the future. The marker now differs from
// the build deadline, re-arming the reminder.
@@ -2188,7 +2188,7 @@ func TestExecutorAutostopReminder(t *testing.T) {
testutil.TryReceive(ctx, t, statsCh)
sent = notifyEnq.Sent(notificationstest.WithTemplateID(notifications.TemplateWorkspaceAutostopReminder))
require.Len(t, sent, 2)
require.Equal(t, newDeadline.UTC().Format(time.RFC1123), sent[1].Labels["deadline"])
require.NotEmpty(t, sent[1].Labels["timeTilShutdown"])
})
// ExceedsLifetime: a time_til_autostop_notify larger than the