Skip to content

Commit 0563f7e

Browse files
defelmnqdefelmnq
committed
fix golden-files
1 parent 672e4c5 commit 0563f7e

27 files changed

+33
-33
lines changed

‎coderd/database/migrations/000302_remove_greetings_notifications_templates.down.sql

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\n\n' ||
1616
UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\n\n' ||
1717
E'User account **{{.Labels.suspended_account_name}}** has been suspended.\n\n' ||
1818
E'The account {{if .Labels.suspended_account_user_name}}belongs to **{{.Labels.suspended_account_user_name}}** and it {{end}}was suspended by **{{.Labels.initiator}}**.' WHERE id = 'b02ddd82-4733-4d02-a2d7-c36f3598997d';
19-
UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\nYour account **{{.Labels.suspended_account_name}}** has been suspended.' WHERE id = '6a2f0609-9b69-4d36-a989-9f5925b6cbff';
19+
UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\n\n' ||
20+
E'Your account **{{.Labels.suspended_account_name}}** has been suspended by **{{.Labels.initiator}}**.' WHERE id = '6a2f0609-9b69-4d36-a989-9f5925b6cbff';
2021
UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\n\n' ||
2122
E'User account **{{.Labels.activated_account_name}}** has been activated.\n\n' ||
2223
E'The account {{if .Labels.activated_account_user_name}}belongs to **{{.Labels.activated_account_user_name}}** and it {{ end }}was activated by **{{.Labels.initiator}}**.' WHERE id = '9f5af851-8408-4e73-a7a1-c6502ba46689';
@@ -57,3 +58,5 @@ UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\n\n'||
5758
E'{{ end }}' WHERE id = 'f047f6a3-5713-40f7-85aa-0394cce9fa3a';
5859
UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\n\n'||
5960
E'This is a test notification.' WHERE id = 'c425f63e-716a-4bf4-ae24-78348f706c3f';
61+
UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\n\n' ||
62+
E'The template **{{.Labels.name}}** was deleted by **{{ .Labels.initiator }}**.\n\n' WHERE id = '29a09665-2a4c-403f-9648-54301670e7be';

‎coderd/database/migrations/000302_remove_greetings_notifications_templates.up.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,4 @@ UPDATE notification_templates SET body_template = E'{{ if eq (len .Data.volumes)
4141
E'{{ end }}'||
4242
E'{{ end }}' WHERE id = 'f047f6a3-5713-40f7-85aa-0394cce9fa3a';
4343
UPDATE notification_templates SET body_template = E'This is a test notification.' WHERE id = 'c425f63e-716a-4bf4-ae24-78348f706c3f';
44+
UPDATE notification_templates SET body_template = E'The template **{{.Labels.name}}** was deleted by **{{ .Labels.initiator }}**.\n\n' WHERE id = '29a09665-2a4c-403f-9648-54301670e7be';

‎coderd/notifications/dispatch/smtp/html.gotmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
{{ .Labels._subject }}
1515
</h1>
1616
<div style="line-height: 1.5;">
17-
<p>Hi {{ .UserUsername }},</p>
17+
<p>Hi {{ .UserUsername }},</p><br />
1818
{{ .Labels._body }}
1919
</div>
2020
<div style="text-align: center; margin-top: 32px;">

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateTemplateDeleted.html.golden

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ MIME-Version: 1.0
1010
Content-Transfer-Encoding: quoted-printable
1111
Content-Type: text/plain; charset=UTF-8
1212

13-
Hi Bobby,
14-
1513
The template Bobby's Template was deleted by rob.
1614

1715

@@ -45,11 +43,9 @@ argin: 8px 0 32px; line-height: 1.5;">
4543
Template "Bobby's Template" deleted
4644
</h1>
4745
<div style=3D"line-height: 1.5;">
48-
<p>Hi bobby,</p>
49-
<p>Hi Bobby,</p>
50-
51-
<p>The template <strong>Bobby&rsquo;s Template</strong> was deleted by <str=
52-
ong>rob</strong>.</p>
46+
<p>Hi bobby,</p><br />
47+
<p>The template <strong>Bobby&rsquo;s Template</strong> was deleted=
48+
by <strong>rob</strong>.</p>
5349
</div>
5450
<div style=3D"text-align: center; margin-top: 32px;">
5551
=20

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateTemplateDeprecated.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ argin: 8px 0 32px; line-height: 1.5;">
5151
Template 'alpha' has been deprecated
5252
</h1>
5353
<div style=3D"line-height: 1.5;">
54-
<p>Hi bobby,</p>
54+
<p>Hi bobby,</p><br />
5555
<p>The template <strong>alpha</strong> has been deprecated with the=
5656
following message:</p>
5757

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateTestNotification.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4444
A test notification
4545
</h1>
4646
<div style=3D"line-height: 1.5;">
47-
<p>Hi bobby,</p>
47+
<p>Hi bobby,</p><br />
4848
<p>This is a test notification.</p>
4949
</div>
5050
<div style=3D"text-align: center; margin-top: 32px;">

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateUserAccountActivated.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4545
User account "bobby" activated
4646
</h1>
4747
<div style=3D"line-height: 1.5;">
48-
<p>Hi bobby,</p>
48+
<p>Hi bobby,</p><br />
4949
<p>User account <strong>bobby</strong> has been activated.</p>
5050

5151
<p>The account belongs to <strong>William Tables</strong> and it was activa=

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateUserAccountCreated.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4545
User account "bobby" created
4646
</h1>
4747
<div style=3D"line-height: 1.5;">
48-
<p>Hi bobby,</p>
48+
<p>Hi bobby,</p><br />
4949
<p>New user account <strong>bobby</strong> has been created.</p>
5050

5151
<p>This new user account was created for <strong>William Tables</strong> by=

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateUserAccountDeleted.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4545
User account "bobby" deleted
4646
</h1>
4747
<div style=3D"line-height: 1.5;">
48-
<p>Hi bobby,</p>
48+
<p>Hi bobby,</p><br />
4949
<p>User account <strong>bobby</strong> has been deleted.</p>
5050

5151
<p>The deleted account belonged to <strong>William Tables</strong> and was =

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateUserAccountSuspended.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4646
User account "bobby" suspended
4747
</h1>
4848
<div style=3D"line-height: 1.5;">
49-
<p>Hi bobby,</p>
49+
<p>Hi bobby,</p><br />
5050
<p>User account <strong>bobby</strong> has been suspended.</p>
5151

5252
<p>The account belongs to <strong>William Tables</strong> and it was suspen=

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateUserRequestedOneTimePasscode.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4646
Reset your password for Coder
4747
</h1>
4848
<div style=3D"line-height: 1.5;">
49-
<p>Hi bobby,</p>
49+
<p>Hi bobby,</p><br />
5050
<p>Use the link below to reset your password.</p>
5151

5252
<p>If you did not make this request, you can ignore this message.</p>

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceAutoUpdated.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4646
Workspace "bobby-workspace" updated automatically
4747
</h1>
4848
<div style=3D"line-height: 1.5;">
49-
<p>Hi bobby,</p>
49+
<p>Hi bobby,</p><br />
5050
<p>Your workspace <strong>bobby-workspace</strong> has been updated=
5151
automatically to the latest template version (1.0).</p>
5252

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceAutobuildFailed.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4545
Workspace "bobby-workspace" autobuild failed
4646
</h1>
4747
<div style=3D"line-height: 1.5;">
48-
<p>Hi bobby,</p>
48+
<p>Hi bobby,</p><br />
4949
<p>Automatic build of your workspace <strong>bobby-workspace</stron=
5050
g> failed.</p>
5151

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceBuildsFailedReport.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ argin: 8px 0 32px; line-height: 1.5;">
6363
Workspace builds failed for template "Bobby First Template"
6464
</h1>
6565
<div style=3D"line-height: 1.5;">
66-
<p>Hi bobby,</p>
66+
<p>Hi bobby,</p><br />
6767
<p>Template <strong>Bobby First Template</strong> has failed to bui=
6868
ld <sup>4</sup>&frasl;<sub>55</sub> times over the last week.</p>
6969

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceCreated.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4444
Workspace 'bobby-workspace' has been created
4545
</h1>
4646
<div style=3D"line-height: 1.5;">
47-
<p>Hi bobby,</p>
47+
<p>Hi bobby,</p><br />
4848
<p>The workspace <strong>bobby-workspace</strong> has been created =
4949
from the template <strong>bobby-template</strong> using version <strong>alp=
5050
ha</strong>.</p>

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceDeleted.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4747
Workspace "bobby-workspace" deleted
4848
</h1>
4949
<div style=3D"line-height: 1.5;">
50-
<p>Hi bobby,</p>
50+
<p>Hi bobby,</p><br />
5151
<p>Your workspace <strong>bobby-workspace</strong> was deleted.</p>
5252

5353
<p>The specified reason was &ldquo;<strong>autodeleted due to dormancy (aut=

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceDeleted_CustomAppearance.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4747
Workspace "bobby-workspace" deleted
4848
</h1>
4949
<div style=3D"line-height: 1.5;">
50-
<p>Hi bobby,</p>
50+
<p>Hi bobby,</p><br />
5151
<p>Your workspace <strong>bobby-workspace</strong> was deleted.</p>
5252

5353
<p>The specified reason was &ldquo;<strong>autodeleted due to dormancy (aut=

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceDormant.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ argin: 8px 0 32px; line-height: 1.5;">
5151
Workspace "bobby-workspace" marked as dormant
5252
</h1>
5353
<div style=3D"line-height: 1.5;">
54-
<p>Hi bobby,</p>
54+
<p>Hi bobby,</p><br />
5555
<p>Hi Bobby,</p>
5656

5757
<p>Your workspace <strong>bobby-workspace</strong> has been marked as <a hr=

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceManualBuildFailed.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4545
Workspace "bobby-workspace" manual build failed
4646
</h1>
4747
<div style=3D"line-height: 1.5;">
48-
<p>Hi bobby,</p>
48+
<p>Hi bobby,</p><br />
4949
<p>A manual build of the workspace <strong>bobby-workspace</strong>=
5050
using the template <strong>bobby-template</strong> failed (version: <stron=
5151
g>bobby-template-version</strong>).<br>

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceManuallyUpdated.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4747
Workspace 'bobby-workspace' has been manually updated
4848
</h1>
4949
<div style=3D"line-height: 1.5;">
50-
<p>Hi bobby,</p>
50+
<p>Hi bobby,</p><br />
5151
<p>A new workspace build has been manually created for your workspa=
5252
ce <strong>bobby-workspace</strong> by <strong>bobby</strong> to update it =
5353
to version <strong>alpha</strong> of template <strong>bobby-template</stron=

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceMarkedForDeletion.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4848
Workspace "bobby-workspace" marked for deletion
4949
</h1>
5050
<div style=3D"line-height: 1.5;">
51-
<p>Hi bobby,</p>
51+
<p>Hi bobby,</p><br />
5252
<p>Hi Bobby,</p>
5353

5454
<p>Your workspace <strong>bobby-workspace</strong> has been marked for <str=

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceOutOfDisk.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4343
Your workspace "bobby-workspace" is low on volume space
4444
</h1>
4545
<div style=3D"line-height: 1.5;">
46-
<p>Hi bobby,</p>
46+
<p>Hi bobby,</p><br />
4747
<p>Volume <strong><code>/home/coder</code></strong> is over 90% ful=
4848
l in workspace <strong>bobby-workspace</strong>.</p>
4949
</div>

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceOutOfDisk_MultipleVolumes.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4747
Your workspace "bobby-workspace" is low on volume space
4848
</h1>
4949
<div style=3D"line-height: 1.5;">
50-
<p>Hi bobby,</p>
50+
<p>Hi bobby,</p><br />
5151
<p>The following volumes are nearly full in workspace <strong>bobby=
5252
-workspace</strong></p>
5353

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceOutOfMemory.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4444
Your workspace "bobby-workspace" is low on memory
4545
</h1>
4646
<div style=3D"line-height: 1.5;">
47-
<p>Hi bobby,</p>
47+
<p>Hi bobby,</p><br />
4848
<p>Your workspace <strong>bobby-workspace</strong> has reached the =
4949
memory usage threshold set at <strong>90%</strong>.</p>
5050
</div>

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateYourAccountActivated.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4343
Your account "bobby" has been activated
4444
</h1>
4545
<div style=3D"line-height: 1.5;">
46-
<p>Hi bobby,</p>
46+
<p>Hi bobby,</p><br />
4747
<p>Your account <strong>bobby</strong> has been activated by <stron=
4848
g>rob</strong>.</p>
4949
</div>

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateYourAccountSuspended.html.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4141
Your account "bobby" has been suspended
4242
</h1>
4343
<div style=3D"line-height: 1.5;">
44-
<p>Hi bobby,</p>
44+
<p>Hi bobby,</p><br />
4545
<p>Your account <strong>bobby</strong> has been suspended by <stron=
4646
g>rob</strong>.</p>
4747
</div>

‎coderd/notifications/testdata/rendered-templates/webhook/TemplateTemplateDeleted.json.golden

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
},
2525
"title": "Template \"Bobby's Template\" deleted",
2626
"title_markdown": "Template \"Bobby's Template\" deleted",
27-
"body": "Hi Bobby,\n\nThe template Bobby's Template was deleted by rob.",
28-
"body_markdown": "Hi Bobby,\n\nThe template **Bobby's Template** was deleted by **rob**.\n\n"
27+
"body": "The template Bobby's Template was deleted by rob.",
28+
"body_markdown": "The template **Bobby's Template** was deleted by **rob**.\n\n"
2929
}

0 commit comments

Comments
 (0)