From ef62e626c88e9de04ff992ce5a0cfec96788bd4e Mon Sep 17 00:00:00 2001 From: Danielle Maywood Date: Wed, 19 Mar 2025 09:51:49 +0000 Subject: [PATCH] fix: ensure targets are propagated to inbox (#16985) Currently the `targets` column in `inbox_notifications` doesn't get filled. This PR fixes that. Rather than give targets special treatment, we should put it in the payload like everything else. This correctly propagates notification targets to the inbox table without much code change. --- coderd/database/queries.sql.go | 3 --- coderd/database/queries/notifications.sql | 1 - coderd/notifications/enqueuer.go | 11 ++++++----- coderd/notifications/notifications_test.go | 3 +-- .../webhook/TemplateTemplateDeleted.json.golden | 2 +- .../webhook/TemplateTemplateDeprecated.json.golden | 2 +- .../webhook/TemplateTestNotification.json.golden | 2 +- .../webhook/TemplateUserAccountActivated.json.golden | 2 +- .../webhook/TemplateUserAccountCreated.json.golden | 2 +- .../webhook/TemplateUserAccountDeleted.json.golden | 2 +- .../webhook/TemplateUserAccountSuspended.json.golden | 2 +- .../TemplateUserRequestedOneTimePasscode.json.golden | 2 +- .../webhook/TemplateWorkspaceAutoUpdated.json.golden | 2 +- .../TemplateWorkspaceAutobuildFailed.json.golden | 7 +++++-- .../TemplateWorkspaceBuildsFailedReport.json.golden | 2 +- .../webhook/TemplateWorkspaceCreated.json.golden | 2 +- .../webhook/TemplateWorkspaceDeleted.json.golden | 7 +++++-- ...plateWorkspaceDeleted_CustomAppearance.json.golden | 2 +- .../webhook/TemplateWorkspaceDormant.json.golden | 2 +- .../TemplateWorkspaceManualBuildFailed.json.golden | 2 +- .../TemplateWorkspaceManuallyUpdated.json.golden | 2 +- .../TemplateWorkspaceMarkedForDeletion.json.golden | 2 +- .../webhook/TemplateWorkspaceOutOfDisk.json.golden | 2 +- ...lateWorkspaceOutOfDisk_MultipleVolumes.json.golden | 2 +- .../webhook/TemplateWorkspaceOutOfMemory.json.golden | 2 +- .../webhook/TemplateYourAccountActivated.json.golden | 2 +- .../webhook/TemplateYourAccountSuspended.json.golden | 2 +- 27 files changed, 38 insertions(+), 36 deletions(-) diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go index 9e7406864d..2f8054e674 100644 --- a/coderd/database/queries.sql.go +++ b/coderd/database/queries.sql.go @@ -3804,7 +3804,6 @@ SELECT nm.method, nm.attempt_count::int AS attempt_count, nm.queued_seconds::float AS queued_seconds, - nm.targets, -- template nt.id AS template_id, nt.title_template, @@ -3830,7 +3829,6 @@ type AcquireNotificationMessagesRow struct { Method NotificationMethod `db:"method" json:"method"` AttemptCount int32 `db:"attempt_count" json:"attempt_count"` QueuedSeconds float64 `db:"queued_seconds" json:"queued_seconds"` - Targets []uuid.UUID `db:"targets" json:"targets"` TemplateID uuid.UUID `db:"template_id" json:"template_id"` TitleTemplate string `db:"title_template" json:"title_template"` BodyTemplate string `db:"body_template" json:"body_template"` @@ -3867,7 +3865,6 @@ func (q *sqlQuerier) AcquireNotificationMessages(ctx context.Context, arg Acquir &i.Method, &i.AttemptCount, &i.QueuedSeconds, - pq.Array(&i.Targets), &i.TemplateID, &i.TitleTemplate, &i.BodyTemplate, diff --git a/coderd/database/queries/notifications.sql b/coderd/database/queries/notifications.sql index 921a58379d..f2d1a14c3a 100644 --- a/coderd/database/queries/notifications.sql +++ b/coderd/database/queries/notifications.sql @@ -84,7 +84,6 @@ SELECT nm.method, nm.attempt_count::int AS attempt_count, nm.queued_seconds::float AS queued_seconds, - nm.targets, -- template nt.id AS template_id, nt.title_template, diff --git a/coderd/notifications/enqueuer.go b/coderd/notifications/enqueuer.go index dbcc67d1c5..84d3025a8e 100644 --- a/coderd/notifications/enqueuer.go +++ b/coderd/notifications/enqueuer.go @@ -74,7 +74,7 @@ func (s *StoreEnqueuer) EnqueueWithData(ctx context.Context, userID, templateID dispatchMethod = metadata.CustomMethod.NotificationMethod } - payload, err := s.buildPayload(metadata, labels, data) + payload, err := s.buildPayload(metadata, labels, data, targets) if err != nil { s.log.Warn(ctx, "failed to build payload", slog.F("template_id", templateID), slog.F("user_id", userID), slog.Error(err)) return nil, xerrors.Errorf("enqueue notification (payload build): %w", err) @@ -132,9 +132,9 @@ func (s *StoreEnqueuer) EnqueueWithData(ctx context.Context, userID, templateID // buildPayload creates the payload that the notification will for variable substitution and/or routing. // The payload contains information about the recipient, the event that triggered the notification, and any subsequent // actions which can be taken by the recipient. -func (s *StoreEnqueuer) buildPayload(metadata database.FetchNewMessageMetadataRow, labels map[string]string, data map[string]any) (*types.MessagePayload, error) { +func (s *StoreEnqueuer) buildPayload(metadata database.FetchNewMessageMetadataRow, labels map[string]string, data map[string]any, targets []uuid.UUID) (*types.MessagePayload, error) { payload := types.MessagePayload{ - Version: "1.1", + Version: "1.2", NotificationName: metadata.NotificationName, NotificationTemplateID: metadata.NotificationTemplateID.String(), @@ -144,8 +144,9 @@ func (s *StoreEnqueuer) buildPayload(metadata database.FetchNewMessageMetadataRo UserName: metadata.UserName, UserUsername: metadata.UserUsername, - Labels: labels, - Data: data, + Labels: labels, + Data: data, + Targets: targets, // No actions yet } diff --git a/coderd/notifications/notifications_test.go b/coderd/notifications/notifications_test.go index e567465211..a823cb117e 100644 --- a/coderd/notifications/notifications_test.go +++ b/coderd/notifications/notifications_test.go @@ -1333,7 +1333,6 @@ func TestNotificationTemplates_Golden(t *testing.T) { ) require.NoError(t, err) - tc.payload.Targets = append(tc.payload.Targets, user.ID) _, err = smtpEnqueuer.EnqueueWithData( ctx, user.ID, @@ -1466,7 +1465,7 @@ func TestNotificationTemplates_Golden(t *testing.T) { tc.payload.Labels, tc.payload.Data, user.Username, - user.ID, + tc.payload.Targets..., ) require.NoError(t, err) diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateTemplateDeleted.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateTemplateDeleted.json.golden index d4d7b5cbf4..32c81c9e57 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateTemplateDeleted.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateTemplateDeleted.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "Template Deleted", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateTemplateDeprecated.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateTemplateDeprecated.json.golden index 053cec2c56..11b0a95b7f 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateTemplateDeprecated.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateTemplateDeprecated.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "Template Deprecated", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateTestNotification.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateTestNotification.json.golden index e2c5744adb..8ca629ff86 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateTestNotification.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateTestNotification.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "Test Notification", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserAccountActivated.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserAccountActivated.json.golden index fc777758ef..98212e3c91 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserAccountActivated.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserAccountActivated.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "User account activated", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserAccountCreated.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserAccountCreated.json.golden index 6408398b55..12a62529ae 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserAccountCreated.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserAccountCreated.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "User account created", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserAccountDeleted.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserAccountDeleted.json.golden index 71260e8e8b..3a6bc7f72c 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserAccountDeleted.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserAccountDeleted.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "User account deleted", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserAccountSuspended.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserAccountSuspended.json.golden index 7d5afe2642..b89bf8d7b3 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserAccountSuspended.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserAccountSuspended.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "User account suspended", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserRequestedOneTimePasscode.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserRequestedOneTimePasscode.json.golden index 0d22706cd2..8573e0ddfc 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserRequestedOneTimePasscode.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateUserRequestedOneTimePasscode.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "One-Time Passcode", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceAutoUpdated.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceAutoUpdated.json.golden index a6f566448e..e09726f1c6 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceAutoUpdated.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceAutoUpdated.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "Workspace Updated Automatically", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceAutobuildFailed.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceAutobuildFailed.json.golden index 2d4c8da409..fe8066e3d8 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceAutobuildFailed.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceAutobuildFailed.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "Workspace Autobuild Failed", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", @@ -20,7 +20,10 @@ "reason": "autostart" }, "data": null, - "targets": null + "targets": [ + "00000000-0000-0000-0000-000000000000", + "00000000-0000-0000-0000-000000000000" + ] }, "title": "Workspace \"bobby-workspace\" autobuild failed", "title_markdown": "Workspace \"bobby-workspace\" autobuild failed", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceBuildsFailedReport.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceBuildsFailedReport.json.golden index bacf59837f..d93d9b2678 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceBuildsFailedReport.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceBuildsFailedReport.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "Report: Workspace Builds Failed For Template", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceCreated.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceCreated.json.golden index baa032fee5..93c46240b2 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceCreated.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceCreated.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "Workspace Created", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceDeleted.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceDeleted.json.golden index 0ef7a16ae1..d891b6c57c 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceDeleted.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceDeleted.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "Workspace Deleted", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", @@ -25,7 +25,10 @@ "reason": "autodeleted due to dormancy" }, "data": null, - "targets": null + "targets": [ + "00000000-0000-0000-0000-000000000000", + "00000000-0000-0000-0000-000000000000" + ] }, "title": "Workspace \"bobby-workspace\" deleted", "title_markdown": "Workspace \"bobby-workspace\" deleted", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceDeleted_CustomAppearance.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceDeleted_CustomAppearance.json.golden index 0ef7a16ae1..59c1fb277d 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceDeleted_CustomAppearance.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceDeleted_CustomAppearance.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "Workspace Deleted", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceDormant.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceDormant.json.golden index 5e672c1657..46341c130c 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceDormant.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceDormant.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "Workspace Marked as Dormant", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceManualBuildFailed.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceManualBuildFailed.json.golden index e06fdb36a2..79f2009456 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceManualBuildFailed.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceManualBuildFailed.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "Workspace Manual Build Failed", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceManuallyUpdated.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceManuallyUpdated.json.golden index af80db4cf7..4917b6c6aa 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceManuallyUpdated.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceManuallyUpdated.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "Workspace Manually Updated", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceMarkedForDeletion.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceMarkedForDeletion.json.golden index 2701337b34..abe6e0f89a 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceMarkedForDeletion.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceMarkedForDeletion.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "Workspace Marked for Deletion", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceOutOfDisk.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceOutOfDisk.json.golden index a87d32d4b3..1e3c6cd2d3 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceOutOfDisk.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceOutOfDisk.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "Workspace Out Of Disk", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceOutOfDisk_MultipleVolumes.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceOutOfDisk_MultipleVolumes.json.golden index d2d666377b..ed96e100c5 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceOutOfDisk_MultipleVolumes.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceOutOfDisk_MultipleVolumes.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "Workspace Out Of Disk", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceOutOfMemory.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceOutOfMemory.json.golden index 4787c5c256..9e35e759f0 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceOutOfMemory.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceOutOfMemory.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "Workspace Out Of Memory", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateYourAccountActivated.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateYourAccountActivated.json.golden index df0681c76e..c7061868cb 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateYourAccountActivated.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateYourAccountActivated.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "Your account has been activated", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000", diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateYourAccountSuspended.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateYourAccountSuspended.json.golden index 8bfeff26a3..fed4e81317 100644 --- a/coderd/notifications/testdata/rendered-templates/webhook/TemplateYourAccountSuspended.json.golden +++ b/coderd/notifications/testdata/rendered-templates/webhook/TemplateYourAccountSuspended.json.golden @@ -2,7 +2,7 @@ "_version": "1.1", "msg_id": "00000000-0000-0000-0000-000000000000", "payload": { - "_version": "1.1", + "_version": "1.2", "notification_name": "Your account has been suspended", "notification_template_id": "00000000-0000-0000-0000-000000000000", "user_id": "00000000-0000-0000-0000-000000000000",