Review comments

dannykopping · dannykopping · commit aff9e6cd52c2 · 2024-07-04T11:21:52.000+02:00
Signed-off-by: Danny Kopping &lt;danny@coder.com&gt;
diff --git a/coderd/database/migrations/000221_notifications.up.sql b/coderd/database/migrations/000221_notifications.up.sql
@@ -52,7 +52,7 @@ CREATE INDEX idx_notification_messages_status ON notification_messages (status);
 -- TODO: autogenerate constants which reference the UUIDs
 INSERT INTO notification_templates (id, name, title_template, body_template, "group", actions)
 VALUES ('f517da0b-cdc9-410f-ab89-a86107c420ed', 'Workspace Deleted', E'Workspace "{{.Labels.name}}" deleted',
-        E'Hi {{.UserName}}\n\nYour workspace **{{.Labels.name}}** was deleted.\nThe specified reason was "**{{.Labels.reason}}{{ if .Labels.initiatedBy }} ({{ .Labels.initiatedBy }}){{end}}**".',
+        E'Hi {{.UserName}}\n\nYour workspace **{{.Labels.name}}** was deleted.\nThe specified reason was "**{{.Labels.reason}}{{ if .Labels.initiator }} ({{ .Labels.initiator }}){{end}}**".',
         'Workspace Events', '[
         {
             "label": "View workspaces",
diff --git a/coderd/notifications/dispatch/webhook.go b/coderd/notifications/dispatch/webhook.go
@@ -88,8 +88,8 @@ func (w *WebhookHandler) dispatch(msgPayload types.MessagePayload, title, body,
 
 		// Handle response.
 		if resp.StatusCode/100 > 2 {
-			// Body could be quite long here, let's grab the first 500B and hope it contains useful debug info.
-			respBody := make([]byte, 500)
+			// Body could be quite long here, let's grab the first 512B and hope it contains useful debug info.
+			respBody := make([]byte, 512)
 			lr := io.LimitReader(resp.Body, int64(len(respBody)))
 			n, err := lr.Read(respBody)
 			if err != nil && !errors.Is(err, io.EOF) {
diff --git a/coderd/notifications/events.go b/coderd/notifications/events.go
@@ -2,5 +2,8 @@ package notifications
 
 import "github.com/google/uuid"
 
-// Workspaces.
-var TemplateWorkspaceDeleted = uuid.MustParse("f517da0b-cdc9-410f-ab89-a86107c420ed") // ...
+// These vars are mapped to UUIDs in the notification_templates table.
+// TODO: autogenerate these.
+
+// Workspace-related events.
+var TemplateWorkspaceDeleted = uuid.MustParse("f517da0b-cdc9-410f-ab89-a86107c420ed")

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ CREATE INDEX idx_notification_messages_status ON notification_messages (status);`
`52`	`52`	`-- TODO: autogenerate constants which reference the UUIDs`
`53`	`53`	`INSERT INTO notification_templates (id, name, title_template, body_template, "group", actions)`
`54`	`54`	`VALUES ('f517da0b-cdc9-410f-ab89-a86107c420ed', 'Workspace Deleted', E'Workspace "{{.Labels.name}}" deleted',`
`55`		`- E'Hi {{.UserName}}\n\nYour workspace {{.Labels.name}} was deleted.\nThe specified reason was "{{.Labels.reason}}{{ if .Labels.initiatedBy }} ({{ .Labels.initiatedBy }}){{end}}".',`
	`55`	`+ E'Hi {{.UserName}}\n\nYour workspace {{.Labels.name}} was deleted.\nThe specified reason was "{{.Labels.reason}}{{ if .Labels.initiator }} ({{ .Labels.initiator }}){{end}}".',`
`56`	`56`	`'Workspace Events', '[`
`57`	`57`	`{`
`58`	`58`	`"label": "View workspaces",`