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

Skip to content

Commit 382e689

Browse files
DanielleMaywoodDanielleMaywood
committed
test: workspace ID is present in builds
1 parent 16af318 commit 382e689

File tree

4 files changed

+37
-31
lines changed

4 files changed

+37
-31
lines changed

‎coderd/database/queries.sql.go

Lines changed: 7 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/workspacebuilds.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ SELECT
213213
tv.name AS template_version_name,
214214
u.username AS workspace_owner_username,
215215
w.name AS workspace_name,
216+
w.id AS workspace_id,
216217
wb.build_number AS workspace_build_number
217218
FROM
218219
workspace_build_with_user AS wb

‎coderd/notifications/reports/generator.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ func buildDataForReportFailedWorkspaceBuilds(reports []adminReport) map[string]a
249249
{
250250
"workspace_owner_username": failedBuild.WorkspaceOwnerUsername,
251251
"workspace_name": failedBuild.WorkspaceName,
252+
"workspace_id": failedBuild.WorkspaceID,
252253
"build_number": failedBuild.WorkspaceBuildNumber,
253254
},
254255
},
@@ -267,6 +268,7 @@ func buildDataForReportFailedWorkspaceBuilds(reports []adminReport) map[string]a
267268
builds = append(builds, map[string]any{
268269
"workspace_owner_username": failedBuild.WorkspaceOwnerUsername,
269270
"workspace_name": failedBuild.WorkspaceName,
271+
"workspace_id": failedBuild.WorkspaceID,
270272
"build_number": failedBuild.WorkspaceBuildNumber,
271273
})
272274
tv["failed_builds"] = builds

‎coderd/notifications/reports/generator_internal_test.go

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -231,15 +231,15 @@ func TestReportFailedWorkspaceBuilds(t *testing.T) {
231231
"versions": []map[string]any{
232232
{
233233
"failed_builds": []map[string]any{
234-
{"build_number": int32(7), "workspace_name": w3.Name, "workspace_owner_username": user1.Username},
235-
{"build_number": int32(1), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
234+
{"build_number": int32(7), "workspace_name": w3.Name, "workspace_id": w3.ID, "workspace_owner_username": user1.Username},
235+
{"build_number": int32(1), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
236236
},
237237
"failed_count": 2,
238238
"template_version_name": t1v1.Name,
239239
},
240240
{
241241
"failed_builds": []map[string]any{
242-
{"build_number": int32(3), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
242+
{"build_number": int32(3), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
243243
},
244244
"failed_count": 1,
245245
"template_version_name": t1v2.Name,
@@ -254,15 +254,15 @@ func TestReportFailedWorkspaceBuilds(t *testing.T) {
254254
"versions": []map[string]any{
255255
{
256256
"failed_builds": []map[string]any{
257-
{"build_number": int32(8), "workspace_name": w4.Name, "workspace_owner_username": user2.Username},
257+
{"build_number": int32(8), "workspace_name": w4.Name, "workspace_id": w4.ID, "workspace_owner_username": user2.Username},
258258
},
259259
"failed_count": 1,
260260
"template_version_name": t2v1.Name,
261261
},
262262
{
263263
"failed_builds": []map[string]any{
264-
{"build_number": int32(6), "workspace_name": w2.Name, "workspace_owner_username": user2.Username},
265-
{"build_number": int32(5), "workspace_name": w2.Name, "workspace_owner_username": user2.Username},
264+
{"build_number": int32(6), "workspace_name": w2.Name, "workspace_id": w2.ID, "workspace_owner_username": user2.Username},
265+
{"build_number": int32(5), "workspace_name": w2.Name, "workspace_id": w2.ID, "workspace_owner_username": user2.Username},
266266
},
267267
"failed_count": 2,
268268
"template_version_name": t2v2.Name,
@@ -319,7 +319,7 @@ func TestReportFailedWorkspaceBuilds(t *testing.T) {
319319
"versions": []map[string]any{
320320
{
321321
"failed_builds": []map[string]any{
322-
{"build_number": int32(77), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
322+
{"build_number": int32(77), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
323323
},
324324
"failed_count": 1,
325325
"template_version_name": t1v2.Name,
@@ -412,32 +412,32 @@ func TestReportFailedWorkspaceBuilds(t *testing.T) {
412412
"versions": []map[string]any{
413413
{
414414
"failed_builds": []map[string]any{
415-
{"build_number": int32(23), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
416-
{"build_number": int32(22), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
417-
{"build_number": int32(21), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
418-
{"build_number": int32(20), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
419-
{"build_number": int32(19), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
420-
{"build_number": int32(18), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
421-
{"build_number": int32(17), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
422-
{"build_number": int32(16), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
423-
{"build_number": int32(15), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
424-
{"build_number": int32(14), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
415+
{"build_number": int32(23), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
416+
{"build_number": int32(22), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
417+
{"build_number": int32(21), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
418+
{"build_number": int32(20), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
419+
{"build_number": int32(19), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
420+
{"build_number": int32(18), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
421+
{"build_number": int32(17), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
422+
{"build_number": int32(16), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
423+
{"build_number": int32(15), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
424+
{"build_number": int32(14), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
425425
},
426426
"failed_count": 23,
427427
"template_version_name": t1v1.Name,
428428
},
429429
{
430430
"failed_builds": []map[string]any{
431-
{"build_number": int32(123), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
432-
{"build_number": int32(122), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
433-
{"build_number": int32(121), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
434-
{"build_number": int32(120), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
435-
{"build_number": int32(119), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
436-
{"build_number": int32(118), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
437-
{"build_number": int32(117), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
438-
{"build_number": int32(116), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
439-
{"build_number": int32(115), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
440-
{"build_number": int32(114), "workspace_name": w1.Name, "workspace_owner_username": user1.Username},
431+
{"build_number": int32(123), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
432+
{"build_number": int32(122), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
433+
{"build_number": int32(121), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
434+
{"build_number": int32(120), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
435+
{"build_number": int32(119), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
436+
{"build_number": int32(118), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
437+
{"build_number": int32(117), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
438+
{"build_number": int32(116), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
439+
{"build_number": int32(115), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
440+
{"build_number": int32(114), "workspace_name": w1.Name, "workspace_id": w1.ID, "workspace_owner_username": user1.Username},
441441
},
442442
"failed_count": 23,
443443
"template_version_name": t1v2.Name,

0 commit comments

Comments
 (0)