Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 18a9a2e

Browse files
DanielleMaywoodDanielleMaywood
committed
chore: fix broken test, update template
1 parent 3a2ebee commit 18a9a2e

File tree

4 files changed

+52
-46
lines changed

4 files changed

+52
-46
lines changed

‎coderd/database/migrations/000316_group_build_failure_notifications.up.sql

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ E'The following templates have had build failures over the last {{.Data.report_f
1010
1111
**Report:**
1212
{{range $template := .Data.templates}}
13+
**{{$template.display_name}}**
1314
{{range $version := $template.versions}}
14-
**{{$template.display_name}}**@**{{$version.template_version_name}}** failed {{$version.failed_count}} time{{if gt $version.failed_count 1.0}}s{{end}}:
15+
- **{{$version.template_version_name}}** failed {{$version.failed_count}} time{{if gt $version.failed_count 1.0}}s{{end}}:
1516
{{range $build := $version.failed_builds}}
16-
* [{{$build.workspace_owner_username}} / {{$build.workspace_name}} / #{{$build.build_number}}]({{base_url}}/@{{$build.workspace_owner_username}}/{{$build.workspace_name}}/builds/{{$build.build_number}})
17+
- [{{$build.workspace_owner_username}} / {{$build.workspace_name}} / #{{$build.build_number}}]({{base_url}}/@{{$build.workspace_owner_username}}/{{$build.workspace_name}}/builds/{{$build.build_number}})
1718
{{end}}
1819
{{end}}
1920
{{end}}

‎coderd/notifications/notifications_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,8 +1011,8 @@ func TestNotificationTemplates_Golden(t *testing.T) {
10111011
},
10121012
},
10131013
{
1014-
"template_version_count": "bobby-template-version-2",
1015-
"failed_count": 1.0,
1014+
"template_version_name": "bobby-template-version-2",
1015+
"failed_count": 1.0,
10161016
"failed_builds": []map[string]any{
10171017
{
10181018
"workspace_owner_username": "ben",
@@ -1051,8 +1051,8 @@ func TestNotificationTemplates_Golden(t *testing.T) {
10511051
},
10521052
},
10531053
{
1054-
"template_version_count": "bobby-template-version-2",
1055-
"failed_count": 2.0,
1054+
"template_version_name": "bobby-template-version-2",
1055+
"failed_count": 2.0,
10561056
"failed_builds": []map[string]any{
10571057
{
10581058
"workspace_owner_username": "ben",

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

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,34 @@ Bobby Second Template failed to build 5/50 times
1919

2020
Report:
2121

22-
Bobby First Template@bobby-template-version-1 failed 3 times:
22+
Bobby First Template
23+
24+
bobby-template-version-1 failed 3 times:
25+
mtojek / workspace-1 / #1234 (http://test.com/@mtojek/workspace-1/build=
26+
s/1234)
27+
johndoe / my-workspace-3 / #5678 (http://test.com/@johndoe/my-workspace=
28+
-3/builds/5678)
29+
jack / workwork / #774 (http://test.com/@jack/workwork/builds/774)
30+
bobby-template-version-2 failed 1 time:
31+
ben / cool-workspace / #8888 (http://test.com/@ben/cool-workspace/build=
32+
s/8888)
33+
34+
35+
Bobby Second Template
36+
37+
bobby-template-version-1 failed 3 times:
38+
daniellemaywood / workspace-9 / #9234 (http://test.com/@daniellemaywood=
39+
/workspace-9/builds/9234)
40+
johndoe / my-workspace-7 / #8678 (http://test.com/@johndoe/my-workspace=
41+
-7/builds/8678)
42+
jack / workworkwork / #374 (http://test.com/@jack/workworkwork/builds/3=
43+
74)
44+
bobby-template-version-2 failed 2 times:
45+
ben / more-cool-workspace / #8878 (http://test.com/@ben/more-cool-works=
46+
pace/builds/8878)
47+
ben / less-cool-workspace / #8848 (http://test.com/@ben/less-cool-works=
48+
pace/builds/8848)
2349

24-
mtojek / workspace-1 / #1234 (http://test.com/@mtojek/workspace-1/builds/12=
25-
34)
26-
johndoe / my-workspace-3 / #5678 (http://test.com/@johndoe/my-workspace-3/b=
27-
uilds/5678)
28-
jack / workwork / #774 (http://test.com/@jack/workwork/builds/774)
29-
30-
Bobby First Template@ failed 1 time:
31-
32-
ben / cool-workspace / #8888 (http://test.com/@ben/cool-workspace/builds/88=
33-
88)
34-
35-
Bobby Second Template@bobby-template-version-1 failed 3 times:
36-
37-
daniellemaywood / workspace-9 / #9234 (http://test.com/@daniellemaywood/wor=
38-
kspace-9/builds/9234)
39-
johndoe / my-workspace-7 / #8678 (http://test.com/@johndoe/my-workspace-7/b=
40-
uilds/8678)
41-
jack / workworkwork / #374 (http://test.com/@jack/workworkwork/builds/374)
42-
43-
Bobby Second Template@ failed 2 times:
44-
45-
ben / more-cool-workspace / #8878 (http://test.com/@ben/more-cool-workspace=
46-
/builds/8878)
47-
ben / less-cool-workspace / #8848 (http://test.com/@ben/less-cool-workspace=
48-
/builds/8848)
4950

5051
We recommend reviewing these issues to ensure future builds are successful.
5152

@@ -94,8 +95,10 @@ frasl;<sub>50</sub> times</p></li>
9495

9596
<p><strong>Report:</strong></p>
9697

97-
<p><strong>Bobby First Template</strong>@<strong>bobby-template-version-1</=
98-
strong> failed 3 times:</p>
98+
<p><strong>Bobby First Template</strong></p>
99+
100+
<ul>
101+
<li><p><strong>bobby-template-version-1</strong> failed 3 times:</p>
99102

100103
<ul>
101104
<li><p><a href=3D"http://test.com/@mtojek/workspace-1/builds/1234">mtojek /=
@@ -106,19 +109,21 @@ doe / my-workspace-3 / #5678</a></p></li>
106109

107110
<li><p><a href=3D"http://test.com/@jack/workwork/builds/774">jack / workwor=
108111
k / #774</a></p></li>
109-
</ul>
112+
</ul></li>
110113

111-
<p><strong>Bobby First Template</strong>@<strong></strong> failed 1 time:</=
112-
p>
114+
<li><p><strong>bobby-template-version-2</strong> failed 1 time:</p>
113115

114116
<ul>
115117
<li><a href=3D"http://test.com/@ben/cool-workspace/builds/8888">ben / cool-=
116118
workspace / #8888</a><br>
117119
</li>
120+
</ul></li>
118121
</ul>
119122

120-
<p><strong>Bobby Second Template</strong>@<strong>bobby-template-version-1<=
121-
/strong> failed 3 times:</p>
123+
<p><strong>Bobby Second Template</strong></p>
124+
125+
<ul>
126+
<li><p><strong>bobby-template-version-1</strong> failed 3 times:</p>
122127

123128
<ul>
124129
<li><p><a href=3D"http://test.com/@daniellemaywood/workspace-9/builds/9234"=
@@ -129,17 +134,17 @@ doe / my-workspace-7 / #8678</a></p></li>
129134

130135
<li><p><a href=3D"http://test.com/@jack/workworkwork/builds/374">jack / wor=
131136
kworkwork / #374</a></p></li>
132-
</ul>
137+
</ul></li>
133138

134-
<p><strong>Bobby Second Template</strong>@<strong></strong> failed 2 times:=
135-
</p>
139+
<li><p><strong>bobby-template-version-2</strong> failed 2 times:</p>
136140

137141
<ul>
138142
<li><p><a href=3D"http://test.com/@ben/more-cool-workspace/builds/8878">ben=
139143
/ more-cool-workspace / #8878</a></p></li>
140144

141145
<li><p><a href=3D"http://test.com/@ben/less-cool-workspace/builds/8848">ben=
142146
/ less-cool-workspace / #8848</a></p></li>
147+
</ul></li>
143148
</ul>
144149

145150
<p>We recommend reviewing these issues to ensure future builds are successf=

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
}
5656
],
5757
"failed_count": 1,
58-
"template_version_count": "bobby-template-version-2"
58+
"template_version_name": "bobby-template-version-2"
5959
}
6060
]
6161
},
@@ -100,7 +100,7 @@
100100
}
101101
],
102102
"failed_count": 2,
103-
"template_version_count": "bobby-template-version-2"
103+
"template_version_name": "bobby-template-version-2"
104104
}
105105
]
106106
}
@@ -110,6 +110,6 @@
110110
},
111111
"title": "Failed workspace builds report",
112112
"title_markdown": "Failed workspace builds report",
113-
"body": "The following templates have had build failures over the last week:\n\nBobby First Template failed to build 4/55 times\nBobby Second Template failed to build 5/50 times\n\nReport:\n\nBobby First Template@bobby-template-version-1 failed 3 times:\n\nmtojek / workspace-1 / #1234 (http://test.com/@mtojek/workspace-1/builds/1234)\njohndoe / my-workspace-3 / #5678 (http://test.com/@johndoe/my-workspace-3/builds/5678)\njack / workwork / #774 (http://test.com/@jack/workwork/builds/774)\n\nBobby First Template@ failed 1 time:\n\nben / cool-workspace / #8888 (http://test.com/@ben/cool-workspace/builds/8888)\n\nBobby Second Template@bobby-template-version-1 failed 3 times:\n\ndaniellemaywood / workspace-9 / #9234 (http://test.com/@daniellemaywood/workspace-9/builds/9234)\njohndoe / my-workspace-7 / #8678 (http://test.com/@johndoe/my-workspace-7/builds/8678)\njack / workworkwork / #374 (http://test.com/@jack/workworkwork/builds/374)\n\nBobby Second Template@ failed 2 times:\n\nben / more-cool-workspace / #8878 (http://test.com/@ben/more-cool-workspace/builds/8878)\nben / less-cool-workspace / #8848 (http://test.com/@ben/less-cool-workspace/builds/8848)\n\nWe recommend reviewing these issues to ensure future builds are successful.",
114-
"body_markdown": "The following templates have had build failures over the last week:\n\n- **Bobby First Template** failed to build 4/55 times\n\n- **Bobby Second Template** failed to build 5/50 times\n\n\n**Report:**\n\n\n**Bobby First Template**@**bobby-template-version-1** failed 3 times:\n\n* [mtojek / workspace-1 / #1234](http://test.com/@mtojek/workspace-1/builds/1234)\n\n* [johndoe / my-workspace-3 / #5678](http://test.com/@johndoe/my-workspace-3/builds/5678)\n\n* [jack / workwork / #774](http://test.com/@jack/workwork/builds/774)\n\n\n**Bobby First Template**@**\u003cno value\u003e** failed 1 time:\n\n* [ben / cool-workspace / #8888](http://test.com/@ben/cool-workspace/builds/8888)\n\n\n\n\n**Bobby Second Template**@**bobby-template-version-1** failed 3 times:\n\n* [daniellemaywood / workspace-9 / #9234](http://test.com/@daniellemaywood/workspace-9/builds/9234)\n\n* [johndoe / my-workspace-7 / #8678](http://test.com/@johndoe/my-workspace-7/builds/8678)\n\n* [jack / workworkwork / #374](http://test.com/@jack/workworkwork/builds/374)\n\n\n**Bobby Second Template**@**\u003cno value\u003e** failed 2 times:\n\n* [ben / more-cool-workspace / #8878](http://test.com/@ben/more-cool-workspace/builds/8878)\n\n* [ben / less-cool-workspace / #8848](http://test.com/@ben/less-cool-workspace/builds/8848)\n\n\n\n\nWe recommend reviewing these issues to ensure future builds are successful."
113+
"body": "The following templates have had build failures over the last week:\n\nBobby First Template failed to build 4/55 times\nBobby Second Template failed to build 5/50 times\n\nReport:\n\nBobby First Template\n\nbobby-template-version-1 failed 3 times:\n mtojek / workspace-1 / #1234 (http://test.com/@mtojek/workspace-1/builds/1234)\n johndoe / my-workspace-3 / #5678 (http://test.com/@johndoe/my-workspace-3/builds/5678)\n jack / workwork / #774 (http://test.com/@jack/workwork/builds/774)\nbobby-template-version-2 failed 1 time:\n ben / cool-workspace / #8888 (http://test.com/@ben/cool-workspace/builds/8888)\n\n\nBobby Second Template\n\nbobby-template-version-1 failed 3 times:\n daniellemaywood / workspace-9 / #9234 (http://test.com/@daniellemaywood/workspace-9/builds/9234)\n johndoe / my-workspace-7 / #8678 (http://test.com/@johndoe/my-workspace-7/builds/8678)\n jack / workworkwork / #374 (http://test.com/@jack/workworkwork/builds/374)\nbobby-template-version-2 failed 2 times:\n ben / more-cool-workspace / #8878 (http://test.com/@ben/more-cool-workspace/builds/8878)\n ben / less-cool-workspace / #8848 (http://test.com/@ben/less-cool-workspace/builds/8848)\n\n\nWe recommend reviewing these issues to ensure future builds are successful.",
114+
"body_markdown": "The following templates have had build failures over the last week:\n\n- **Bobby First Template** failed to build 4/55 times\n\n- **Bobby Second Template** failed to build 5/50 times\n\n\n**Report:**\n\n**Bobby First Template**\n\n- **bobby-template-version-1** failed 3 times:\n\n - [mtojek / workspace-1 / #1234](http://test.com/@mtojek/workspace-1/builds/1234)\n\n - [johndoe / my-workspace-3 / #5678](http://test.com/@johndoe/my-workspace-3/builds/5678)\n\n - [jack / workwork / #774](http://test.com/@jack/workwork/builds/774)\n\n\n- **bobby-template-version-2** failed 1 time:\n\n - [ben / cool-workspace / #8888](http://test.com/@ben/cool-workspace/builds/8888)\n\n\n\n**Bobby Second Template**\n\n- **bobby-template-version-1** failed 3 times:\n\n - [daniellemaywood / workspace-9 / #9234](http://test.com/@daniellemaywood/workspace-9/builds/9234)\n\n - [johndoe / my-workspace-7 / #8678](http://test.com/@johndoe/my-workspace-7/builds/8678)\n\n - [jack / workworkwork / #374](http://test.com/@jack/workworkwork/builds/374)\n\n\n- **bobby-template-version-2** failed 2 times:\n\n - [ben / more-cool-workspace / #8878](http://test.com/@ben/more-cool-workspace/builds/8878)\n\n - [ben / less-cool-workspace / #8848](http://test.com/@ben/less-cool-workspace/builds/8848)\n\n\n\n\nWe recommend reviewing these issues to ensure future builds are successful."
115115
}

0 commit comments

Comments
 (0)