Simplify dormancy template

BrunoQuaresma · BrunoQuaresma · commit 16a3c193a4d4 · 2024-07-22T13:48:22.000Z
diff --git a/coderd/autobuild/lifecycle_executor.go b/coderd/autobuild/lifecycle_executor.go
@@ -332,8 +332,10 @@ func (e *Executor) runOnce(t time.Time) Stats {
 						*dormantNotification,
 					)
 					if err != nil {
-						e.log.Warn(e.ctx, "failed to notify of workspace marked as dormant", slog.Error(err), slog.F("workspace_id", dormantNotification.Workspace.ID))
+						log.Warn(e.ctx, "failed to notify of workspace marked as dormant", slog.Error(err), slog.F("workspace_id", dormantNotification.Workspace.ID))
 					}
+				} else {
+					log.Warn(e.ctx, "no dormant notification to send", slog.F("workspace_id", wsID))
 				}
 				return nil
 			}()
diff --git a/coderd/database/migrations/000229_dormancy_notification_template.up.sql b/coderd/database/migrations/000229_dormancy_notification_template.up.sql
@@ -1,13 +1,22 @@
-INSERT INTO notification_templates (id, name, title_template, body_template, "group", actions)
-VALUES ('0ea69165-ec14-4314-91f1-69566ac3c5a0', 'Workspace Marked as Dormant', E'Workspace "{{.Labels.name}}" marked as dormant',
-        E'Hi {{.UserName}}\n\n' ||
-        E'Your workspace **{{.Labels.name}}** has been marked as **dormant**.\n' ||
-        E'The specified reason was "**{{.Labels.reason}}{{ if .Labels.initiator }} (initiated by: {{ .Labels.initiator }}){{end}}**\n\n' ||
-        E'Dormancy refers to a workspace being unused for a defined length of time, and after it exceeds {{.Labels.dormancyHours}} hours of dormancy it will be deleted.\n' ||
-        E'To prevent your workspace from being deleted, simply use it as normal.',
-        'Workspace Events', '[
+INSERT INTO
+    notification_templates (
+        id,
+        name,
+        title_template,
+        body_template,
+        "group",
+        actions
+    )
+VALUES (
+        '0ea69165-ec14-4314-91f1-69566ac3c5a0',
+        'Workspace Marked as Dormant',
+        E'Workspace "{{.Labels.name}}" marked as dormant',
+        E'Hi {{.UserName}}\n\n' || E'Your workspace **{{.Labels.name}}** has been marked as **dormant**.\n' || E'The specified reason was "**{{.Labels.reason}} (initiated by: {{ .Labels.initiator }}){{end}}**\n\n' || E'Dormancy refers to a workspace being unused for a defined length of time, and after it exceeds {{.Labels.dormancyHours}} hours of dormancy it will be deleted.\n' || E'To prevent your workspace from being deleted, simply use it as normal.',
+        'Workspace Events',
+        '[
         {
 			"label": "View workspace",
 			"url": "{{ base_url }}/@{{.UserName}}/{{.Labels.name}}"
 		}
-    ]'::jsonb);
+    ]'::jsonb
+    );

Original file line number	Diff line number	Diff line change
`@@ -332,8 +332,10 @@ func (e *Executor) runOnce(t time.Time) Stats {`
`332`	`332`	`*dormantNotification,`
`333`	`333`	`)`
`334`	`334`	`if err != nil {`
`335`		`- e.log.Warn(e.ctx, "failed to notify of workspace marked as dormant", slog.Error(err), slog.F("workspace_id", dormantNotification.Workspace.ID))`
	`335`	`+ log.Warn(e.ctx, "failed to notify of workspace marked as dormant", slog.Error(err), slog.F("workspace_id", dormantNotification.Workspace.ID))`
`336`	`336`	`}`
	`337`	`+ } else {`
	`338`	`+ log.Warn(e.ctx, "no dormant notification to send", slog.F("workspace_id", wsID))`
`337`	`339`	`}`
`338`	`340`	`return nil`
`339`	`341`	`}()`