lookup users on canceled builds notifications

thatportugueseguy · thatportugueseguy · commit cda40fde19f7 · 2025-02-04T12:44:49.000Z
diff --git a/lib/action.ml b/lib/action.ml
@@ -359,7 +359,7 @@ module Action (Github_api : Api.Github) (Slack_api : Api.Slack) (Buildkite_api :
     | Status n ->
       let%lwt channels = partition_status ctx n in
       let%lwt slack_user_id =
-        match Util.Build.is_failed_build n with
+        match Util.Build.is_failed_build n || Util.Build.is_canceled_build n with
         | false -> Lwt.return_none
         | true ->
           let email = n.commit.commit.author.email in
diff --git a/lib/slack.ml b/lib/slack.ml
@@ -342,10 +342,10 @@ let generate_status_notification ?slack_user_id ?failed_steps (cfg : Config_t.co
       s
   in
   let author_mention =
-    match is_failed_build_notification, slack_user_id, channel with
-    | true, None, _ | true, _, Status_notification.User _ -> author.email
-    | _, Some id, Channel _ -> sprintf "<@%s>" (Slack_user_id.project id)
-    | _ -> ""
+    match Build.(is_failed_build n || is_canceled_build n), slack_user_id, channel with
+    | true, None, Channel _ -> author.email
+    | true, Some id, Channel _ -> sprintf "<@%s>" (Slack_user_id.project id)
+    | true, _, User _ | false, _, _ -> ""
   in
   let commit_info = [ sprintf "*Commit*: `<%s|%s>` %s" html_url (git_short_sha_hash sha) author_mention ] in
   let branches_info =
diff --git a/test/slack_payloads.expected b/test/slack_payloads.expected
@@ -529,7 +529,7 @@ will notify #longest-a1
 will notify #failed-builds
 {
   "channel": "failed-builds",
-  "text": "<https://buildkite.com/ahrefs/pipeline2|[buildkite/pipeline2]>: Build <https://buildkite.com/ahrefs/pipeline2/builds/181734|#​181734> canceled by author (7 minutes, 29 seconds) for \"<https://github.com/ahrefs/monorepo/commit/7e0a933e9c71b4ca107680ca958ca1888d5e479b|c1 message>\" author@ahrefs.com",
+  "text": "<https://buildkite.com/ahrefs/pipeline2|[buildkite/pipeline2]>: Build <https://buildkite.com/ahrefs/pipeline2/builds/181734|#​181734> canceled by author (7 minutes, 29 seconds) for \"<https://github.com/ahrefs/monorepo/commit/7e0a933e9c71b4ca107680ca958ca1888d5e479b|c1 message>\" <@id[author@ahrefs.com]>",
   "attachments": [
     {
       "fallback": null,
@@ -544,7 +544,7 @@ will notify #failed-builds
 will notify #failed-builds
 {
   "channel": "failed-builds",
-  "text": "<https://buildkite.com/ahrefs/pipeline2|[buildkite/pipeline2]>: Build <https://buildkite.com/ahrefs/pipeline2/builds/181734|#​181734> canceled by author (7 minutes, 29 seconds) for \"<https://github.com/ahrefs/monorepo/commit/7e0a933e9c71b4ca107680ca958ca1888d5e479b|c1 message>\" author@ahrefs.com",
+  "text": "<https://buildkite.com/ahrefs/pipeline2|[buildkite/pipeline2]>: Build <https://buildkite.com/ahrefs/pipeline2/builds/181734|#​181734> canceled by author (7 minutes, 29 seconds) for \"<https://github.com/ahrefs/monorepo/commit/7e0a933e9c71b4ca107680ca958ca1888d5e479b|c1 message>\" <@id[author@ahrefs.com]>",
   "attachments": [
     {
       "fallback": null,
@@ -559,7 +559,7 @@ will notify #failed-builds
 will notify #failed-builds
 {
   "channel": "failed-builds",
-  "text": "<https://buildkite.com/ahrefs/pipeline2|[buildkite/pipeline2]>: Build <https://buildkite.com/ahrefs/pipeline2/builds/181734|#​181734> canceled by author (7 minutes, 29 seconds) for \"<https://github.com/ahrefs/monorepo/commit/7e0a933e9c71b4ca107680ca958ca1888d5e479b|c1 message>\" author@ahrefs.com",
+  "text": "<https://buildkite.com/ahrefs/pipeline2|[buildkite/pipeline2]>: Build <https://buildkite.com/ahrefs/pipeline2/builds/181734|#​181734> canceled by author (7 minutes, 29 seconds) for \"<https://github.com/ahrefs/monorepo/commit/7e0a933e9c71b4ca107680ca958ca1888d5e479b|c1 message>\" <@id[author@ahrefs.com]>",
   "attachments": [
     {
       "fallback": null,

Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ will notify #longest-a1`
`529`	`529`	`will notify #failed-builds`
`530`	`530`	`{`
`531`	`531`	`"channel": "failed-builds",`
`532`		`- "text": "<https://buildkite.com/ahrefs/pipeline2\|[buildkite/pipeline2]>: Build <https://buildkite.com/ahrefs/pipeline2/builds/181734\|#181734> canceled by author (7 minutes, 29 seconds) for \"<https://github.com/ahrefs/monorepo/commit/7e0a933e9c71b4ca107680ca958ca1888d5e479b\|c1 message>\" author@ahrefs.com",`
	`532`	`+ "text": "<https://buildkite.com/ahrefs/pipeline2\|[buildkite/pipeline2]>: Build <https://buildkite.com/ahrefs/pipeline2/builds/181734\|#181734> canceled by author (7 minutes, 29 seconds) for \"<https://github.com/ahrefs/monorepo/commit/7e0a933e9c71b4ca107680ca958ca1888d5e479b\|c1 message>\" <@id[author@ahrefs.com]>",`
`533`	`533`	`"attachments": [`
`534`	`534`	`{`
`535`	`535`	`"fallback": null,`
`@@ -544,7 +544,7 @@ will notify #failed-builds`
`544`	`544`	`will notify #failed-builds`
`545`	`545`	`{`
`546`	`546`	`"channel": "failed-builds",`
`547`		`- "text": "<https://buildkite.com/ahrefs/pipeline2\|[buildkite/pipeline2]>: Build <https://buildkite.com/ahrefs/pipeline2/builds/181734\|#181734> canceled by author (7 minutes, 29 seconds) for \"<https://github.com/ahrefs/monorepo/commit/7e0a933e9c71b4ca107680ca958ca1888d5e479b\|c1 message>\" author@ahrefs.com",`
	`547`	`+ "text": "<https://buildkite.com/ahrefs/pipeline2\|[buildkite/pipeline2]>: Build <https://buildkite.com/ahrefs/pipeline2/builds/181734\|#181734> canceled by author (7 minutes, 29 seconds) for \"<https://github.com/ahrefs/monorepo/commit/7e0a933e9c71b4ca107680ca958ca1888d5e479b\|c1 message>\" <@id[author@ahrefs.com]>",`
`548`	`548`	`"attachments": [`
`549`	`549`	`{`
`550`	`550`	`"fallback": null,`
`@@ -559,7 +559,7 @@ will notify #failed-builds`
`559`	`559`	`will notify #failed-builds`
`560`	`560`	`{`
`561`	`561`	`"channel": "failed-builds",`
`562`		`- "text": "<https://buildkite.com/ahrefs/pipeline2\|[buildkite/pipeline2]>: Build <https://buildkite.com/ahrefs/pipeline2/builds/181734\|#181734> canceled by author (7 minutes, 29 seconds) for \"<https://github.com/ahrefs/monorepo/commit/7e0a933e9c71b4ca107680ca958ca1888d5e479b\|c1 message>\" author@ahrefs.com",`
	`562`	`+ "text": "<https://buildkite.com/ahrefs/pipeline2\|[buildkite/pipeline2]>: Build <https://buildkite.com/ahrefs/pipeline2/builds/181734\|#181734> canceled by author (7 minutes, 29 seconds) for \"<https://github.com/ahrefs/monorepo/commit/7e0a933e9c71b4ca107680ca958ca1888d5e479b\|c1 message>\" <@id[author@ahrefs.com]>",`
`563`	`563`	`"attachments": [`
`564`	`564`	`{`
`565`	`565`	`"fallback": null,`