Skip to content

Commit 5fb0a5b

Browse files
chore: change approach
1 parent 665441e commit 5fb0a5b

File tree

6 files changed

+6
-129
lines changed

6 files changed

+6
-129
lines changed

coderd/autobuild/lifecycle_executor.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,13 +349,18 @@ func (e *Executor) runOnce(t time.Time) Stats {
349349
nextBuildReason = string(nextBuild.Reason)
350350
}
351351

352+
templateVersionMessage := activeTemplateVersion.Message
353+
if templateVersionMessage == "" {
354+
templateVersionMessage = "None provided"
355+
}
356+
352357
if _, err := e.notificationsEnqueuer.Enqueue(e.ctx, ws.OwnerID, notifications.TemplateWorkspaceAutoUpdated,
353358
map[string]string{
354359
"name": ws.Name,
355360
"initiator": "autobuild",
356361
"reason": nextBuildReason,
357362
"template_version_name": activeTemplateVersion.Name,
358-
"template_version_message": activeTemplateVersion.Message,
363+
"template_version_message": templateVersionMessage,
359364
}, "autobuild",
360365
// Associate this notification with all the related entities.
361366
ws.ID, ws.OwnerID, ws.TemplateID, ws.OrganizationID,

coderd/database/migrations/000328_fix_workspace_update_reason.down.sql

Lines changed: 0 additions & 4 deletions
This file was deleted.

coderd/database/migrations/000328_fix_workspace_update_reason.up.sql

Lines changed: 0 additions & 4 deletions
This file was deleted.

coderd/notifications/notifications_test.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -845,19 +845,6 @@ func TestNotificationTemplates_Golden(t *testing.T) {
845845
},
846846
},
847847
},
848-
{
849-
name: "TemplateWorkspaceAutoUpdated_NoMessage",
850-
id: notifications.TemplateWorkspaceAutoUpdated,
851-
payload: types.MessagePayload{
852-
UserName: "Bobby",
853-
UserEmail: "bobby@coder.com",
854-
UserUsername: "bobby",
855-
Labels: map[string]string{
856-
"name": "bobby-workspace",
857-
"template_version_name": "1.0",
858-
},
859-
},
860-
},
861848
{
862849
name: "TemplateWorkspaceMarkedForDeletion",
863850
id: notifications.TemplateWorkspaceMarkedForDeletion,

coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceAutoUpdated_NoMessage.html.golden

Lines changed: 0 additions & 78 deletions
This file was deleted.

coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceAutoUpdated_NoMessage.json.golden

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)