wokr on golden files

coder · defelmnq · Mar 21, 2025 · Mar 18, 2025 · Mar 18, 2025 · Mar 18, 2025
commit 9ce82de638e155e1c71810ae00caba7966709769
diff --git a/coderd/notifications/dispatch/smtp/html.gotmpl b/coderd/notifications/dispatch/smtp/html.gotmpl
@@ -14,7 +14,7 @@
         {{ .Labels._subject }}
       </h1>
       <div style="line-height: 1.5;">
-				Hi {{ .UserUsername }},
+				Hi,
         {{ .Labels._body }}
       </div>
       <div style="text-align: center; margin-top: 32px;">

diff --git a/coderd/notifications/testdata/rendered-templates/smtp/TemplateTemplateDeleted.html.golden b/coderd/notifications/testdata/rendered-templates/smtp/TemplateTemplateDeleted.html.golden
@@ -45,6 +45,7 @@ argin: 8px 0 32px; line-height: 1.5;">
         Template "Bobby's Template" deleted
       </h1>
       <div style=3D"line-height: 1.5;">
+				Hi,
         <p>Hi Bobby,</p>
 
 <p>The template <strong>Bobby&rsquo;s Template</strong> was deleted by <str=

diff --git a/coderd/notifications/testdata/rendered-templates/smtp/TemplateTemplateDeprecated.html.golden b/coderd/notifications/testdata/rendered-templates/smtp/TemplateTemplateDeprecated.html.golden
@@ -10,8 +10,6 @@ MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain; charset=UTF-8
 
-Hello Bobby,
-
 The template alpha has been deprecated with the following message:
 
 This template has been replaced by beta
@@ -53,10 +51,9 @@ argin: 8px 0 32px; line-height: 1.5;">
         Template 'alpha' has been deprecated
       </h1>
       <div style=3D"line-height: 1.5;">
-        <p>Hello Bobby,</p>
-
-<p>The template <strong>alpha</strong> has been deprecated with the followi=
-ng message:</p>
+				Hi,
+        <p>The template <strong>alpha</strong> has been deprecated with the=
+ following message:</p>
 
 <p><strong>This template has been replaced by beta</strong></p>
 

diff --git a/coderd/notifications/testdata/rendered-templates/smtp/TemplateTestNotification.html.golden b/coderd/notifications/testdata/rendered-templates/smtp/TemplateTestNotification.html.golden
@@ -10,8 +10,6 @@ MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain; charset=UTF-8
 
-Hi Bobby,
-
 This is a test notification.
 
 
@@ -46,9 +44,8 @@ argin: 8px 0 32px; line-height: 1.5;">
         A test notification
       </h1>
       <div style=3D"line-height: 1.5;">
-        <p>Hi Bobby,</p>
-
-<p>This is a test notification.</p>
+				Hi,
+        <p>This is a test notification.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/...d/notifications/testdata/rendered-templates/smtp/TemplateUserAccountActivated.html.golden b/...d/notifications/testdata/rendered-templates/smtp/TemplateUserAccountActivated.html.golden
@@ -10,12 +10,8 @@ MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain; charset=UTF-8
 
-Hi Bobby,
-
 User account bobby has been activated.
 
-The account belongs to William Tables and it was activated by rob.
-
 
 View accounts: http://test.com/deployment/users?filter=3Dstatus%3Aactive
 
@@ -47,12 +43,8 @@ argin: 8px 0 32px; line-height: 1.5;">
         User account "bobby" activated
       </h1>
       <div style=3D"line-height: 1.5;">
-        <p>Hi Bobby,</p>
-
-<p>User account <strong>bobby</strong> has been activated.</p>
-
-<p>The account belongs to <strong>William Tables</strong> and it was activa=
-ted by <strong>rob</strong>.</p>
+				Hi,
+        <p>User account <strong>bobby</strong> has been activated.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/coderd/notifications/testdata/rendered-templates/smtp/TemplateUserAccountCreated.html.golden b/coderd/notifications/testdata/rendered-templates/smtp/TemplateUserAccountCreated.html.golden
@@ -10,12 +10,8 @@ MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain; charset=UTF-8
 
-Hi Bobby,
-
 New user account bobby has been created.
 
-This new user account was created for William Tables by rob.
-
 
 View accounts: http://test.com/deployment/users?filter=3Dstatus%3Aactive
 
@@ -47,12 +43,8 @@ argin: 8px 0 32px; line-height: 1.5;">
         User account "bobby" created
       </h1>
       <div style=3D"line-height: 1.5;">
-        <p>Hi Bobby,</p>
-
-<p>New user account <strong>bobby</strong> has been created.</p>
-
-<p>This new user account was created for <strong>William Tables</strong> by=
- <strong>rob</strong>.</p>
+				Hi,
+        <p>New user account <strong>bobby</strong> has been created.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/coderd/notifications/testdata/rendered-templates/smtp/TemplateUserAccountDeleted.html.golden b/coderd/notifications/testdata/rendered-templates/smtp/TemplateUserAccountDeleted.html.golden
@@ -10,12 +10,8 @@ MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain; charset=UTF-8
 
-Hi Bobby,
-
 User account bobby has been deleted.
 
-The deleted account belonged to William Tables and was deleted by rob.
-
 
 View accounts: http://test.com/deployment/users?filter=3Dstatus%3Aactive
 
@@ -47,12 +43,8 @@ argin: 8px 0 32px; line-height: 1.5;">
         User account "bobby" deleted
       </h1>
       <div style=3D"line-height: 1.5;">
-        <p>Hi Bobby,</p>
-
-<p>User account <strong>bobby</strong> has been deleted.</p>
-
-<p>The deleted account belonged to <strong>William Tables</strong> and was =
-deleted by <strong>rob</strong>.</p>
+				Hi,
+        <p>User account <strong>bobby</strong> has been deleted.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/...d/notifications/testdata/rendered-templates/smtp/TemplateUserAccountSuspended.html.golden b/...d/notifications/testdata/rendered-templates/smtp/TemplateUserAccountSuspended.html.golden
@@ -10,12 +10,8 @@ MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain; charset=UTF-8
 
-Hi Bobby,
-
 User account bobby has been suspended.
 
-The account belongs to William Tables and it was suspended by rob.
-
 
 View suspended accounts: http://test.com/deployment/users?filter=3Dstatus%3=
 Asuspended
@@ -48,12 +44,8 @@ argin: 8px 0 32px; line-height: 1.5;">
         User account "bobby" suspended
       </h1>
       <div style=3D"line-height: 1.5;">
-        <p>Hi Bobby,</p>
-
-<p>User account <strong>bobby</strong> has been suspended.</p>
-
-<p>The account belongs to <strong>William Tables</strong> and it was suspen=
-ded by <strong>rob</strong>.</p>
+				Hi,
+        <p>User account <strong>bobby</strong> has been suspended.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/...cations/testdata/rendered-templates/smtp/TemplateUserRequestedOneTimePasscode.html.golden b/...cations/testdata/rendered-templates/smtp/TemplateUserRequestedOneTimePasscode.html.golden
@@ -10,11 +10,12 @@ MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain; charset=UTF-8
 
-Hi Bobby,
+A request to reset the password for your Coder account has been made. Your =
+one-time passcode is:
 
-Use the link below to reset your password.
+fad9020b-6562-4cdb-87f1-0486f1bea415
 
-If you did not make this request, you can ignore this message.
+If you did not request to reset your password, you can ignore this message.
 
 
 Reset password: http://test.com/reset-password/change?otp=3Dfad9020b-6562-4=
@@ -48,11 +49,14 @@ argin: 8px 0 32px; line-height: 1.5;">
         Reset your password for Coder
       </h1>
       <div style=3D"line-height: 1.5;">
-        <p>Hi Bobby,</p>
+				Hi,
+        <p>A request to reset the password for your Coder account has been =
+made. Your one-time passcode is:</p>
 
-<p>Use the link below to reset your password.</p>
+<p><strong>fad9020b-6562-4cdb-87f1-0486f1bea415</strong></p>
 
-<p>If you did not make this request, you can ignore this message.</p>
+<p>If you did not request to reset your password, you can ignore this messa=
+ge.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/...d/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceAutoUpdated.html.golden b/...d/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceAutoUpdated.html.golden
@@ -10,13 +10,9 @@ MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain; charset=UTF-8
 
-Hi Bobby,
-
 Your workspace bobby-workspace has been updated automatically to the latest=
  template version (1.0).
 
-Reason for update: template now includes catnip.
-
 
 View workspace: http://test.com/@bobby/bobby-workspace
 
@@ -48,12 +44,9 @@ argin: 8px 0 32px; line-height: 1.5;">
         Workspace "bobby-workspace" updated automatically
       </h1>
       <div style=3D"line-height: 1.5;">
-        <p>Hi Bobby,</p>
-
-<p>Your workspace <strong>bobby-workspace</strong> has been updated automat=
-ically to the latest template version (1.0).</p>
-
-<p>Reason for update: <strong>template now includes catnip</strong>.</p>
+				Hi,
+        <p>Your workspace <strong>bobby-workspace</strong> has been updated=
+ automatically to the latest template version (1.0).</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/...tifications/testdata/rendered-templates/smtp/TemplateWorkspaceAutobuildFailed.html.golden b/...tifications/testdata/rendered-templates/smtp/TemplateWorkspaceAutobuildFailed.html.golden
@@ -10,10 +10,7 @@ MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain; charset=UTF-8
 
-Hi Bobby,
-
 Automatic build of your workspace bobby-workspace failed.
-
 The specified reason was "autostart".
 
 
@@ -47,12 +44,10 @@ argin: 8px 0 32px; line-height: 1.5;">
         Workspace "bobby-workspace" autobuild failed
       </h1>
       <div style=3D"line-height: 1.5;">
-        <p>Hi Bobby,</p>
-
-<p>Automatic build of your workspace <strong>bobby-workspace</strong> faile=
-d.</p>
-
-<p>The specified reason was &ldquo;<strong>autostart</strong>&rdquo;.</p>
+				Hi,
+        <p>Automatic build of your workspace <strong>bobby-workspace</stron=
+g> failed.<br>
+The specified reason was &ldquo;<strong>autostart</strong>&rdquo;.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceCreated.html.golden b/coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceCreated.html.golden
@@ -10,8 +10,6 @@ MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain; charset=UTF-8
 
-Hello Bobby,
-
 The workspace bobby-workspace has been created from the template bobby-temp=
 late using version alpha.
 
@@ -46,11 +44,10 @@ argin: 8px 0 32px; line-height: 1.5;">
         Workspace 'bobby-workspace' has been created
       </h1>
       <div style=3D"line-height: 1.5;">
-        <p>Hello Bobby,</p>
-
-<p>The workspace <strong>bobby-workspace</strong> has been created from the=
- template <strong>bobby-template</strong> using version <strong>alpha</stro=
-ng>.</p>
+				Hi,
+        <p>The workspace <strong>bobby-workspace</strong> has been created =
+from the template <strong>bobby-template</strong> using version <strong>alp=
+ha</strong>.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceDeleted.html.golden b/coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceDeleted.html.golden
@@ -10,10 +10,7 @@ MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain; charset=UTF-8
 
-Hi Bobby,
-
 Your workspace bobby-workspace was deleted.
-
 The specified reason was "autodeleted due to dormancy (autobuild)".
 
 
@@ -49,12 +46,10 @@ argin: 8px 0 32px; line-height: 1.5;">
         Workspace "bobby-workspace" deleted
       </h1>
       <div style=3D"line-height: 1.5;">
-        <p>Hi Bobby,</p>
-
-<p>Your workspace <strong>bobby-workspace</strong> was deleted.</p>
-
-<p>The specified reason was &ldquo;<strong>autodeleted due to dormancy (aut=
-obuild)</strong>&rdquo;.</p>
+				Hi,
+        <p>Your workspace <strong>bobby-workspace</strong> was deleted.<br>
+The specified reason was &ldquo;<strong>autodeleted due to dormancy (autobu=
+ild)</strong>&rdquo;.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/...ns/testdata/rendered-templates/smtp/TemplateWorkspaceDeleted_CustomAppearance.html.golden b/...ns/testdata/rendered-templates/smtp/TemplateWorkspaceDeleted_CustomAppearance.html.golden
@@ -10,10 +10,7 @@ MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain; charset=UTF-8
 
-Hi Bobby,
-
 Your workspace bobby-workspace was deleted.
-
 The specified reason was "autodeleted due to dormancy (autobuild)".
 
 
@@ -49,12 +46,10 @@ argin: 8px 0 32px; line-height: 1.5;">
         Workspace "bobby-workspace" deleted
       </h1>
       <div style=3D"line-height: 1.5;">
-        <p>Hi Bobby,</p>
-
-<p>Your workspace <strong>bobby-workspace</strong> was deleted.</p>
-
-<p>The specified reason was &ldquo;<strong>autodeleted due to dormancy (aut=
-obuild)</strong>&rdquo;.</p>
+				Hi,
+        <p>Your workspace <strong>bobby-workspace</strong> was deleted.<br>
+The specified reason was &ldquo;<strong>autodeleted due to dormancy (autobu=
+ild)</strong>&rdquo;.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceDormant.html.golden b/coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceDormant.html.golden
@@ -51,6 +51,7 @@ argin: 8px 0 32px; line-height: 1.5;">
         Workspace "bobby-workspace" marked as dormant
       </h1>
       <div style=3D"line-height: 1.5;">
+				Hi,
         <p>Hi Bobby,</p>
 
 <p>Your workspace <strong>bobby-workspace</strong> has been marked as <a hr=

diff --git a/...fications/testdata/rendered-templates/smtp/TemplateWorkspaceManualBuildFailed.html.golden b/...fications/testdata/rendered-templates/smtp/TemplateWorkspaceManualBuildFailed.html.golden
@@ -10,11 +10,8 @@ MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain; charset=UTF-8
 
-Hi Bobby,
-
 A manual build of the workspace bobby-workspace using the template bobby-te=
 mplate failed (version: bobby-template-version).
-
 The workspace build was initiated by joe.
 
 
@@ -48,13 +45,11 @@ argin: 8px 0 32px; line-height: 1.5;">
         Workspace "bobby-workspace" manual build failed
       </h1>
       <div style=3D"line-height: 1.5;">
-        <p>Hi Bobby,</p>
-
-<p>A manual build of the workspace <strong>bobby-workspace</strong> using t=
-he template <strong>bobby-template</strong> failed (version: <strong>bobby-=
-template-version</strong>).</p>
-
-<p>The workspace build was initiated by <strong>joe</strong>.</p>
+				Hi,
+        <p>A manual build of the workspace <strong>bobby-workspace</strong>=
+ using the template <strong>bobby-template</strong> failed (version: <stron=
+g>bobby-template-version</strong>).<br>
+The workspace build was initiated by <strong>joe</strong>.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20