Merge pull request #183 from EmileTrotignon/error-log-in-notification-fixes

EmileTrotignon · web-flow · commit cb15ebd97558 · 2025-02-24T18:05:45.000+01:00
Error log in notification fixes
diff --git a/lib/action.ml b/lib/action.ml
@@ -322,7 +322,7 @@ module Action (Github_api : Api.Github) (Slack_api : Api.Slack) (Buildkite_api :
     | Error e -> Lwt.return_error e
     | Ok build ->
       let failed_jobs = Util.Build.filter_failed_jobs build.jobs in
-      let%lwt logs_or_errors = Lwt_list.map_p (get_job_log_name_and_content ~ctx n) failed_jobs in
+      let%lwt logs_or_errors = Lwt_list.map_s (get_job_log_name_and_content ~ctx n) failed_jobs in
       Lwt.return_ok
       @@ List.filter_map
            (function
@@ -387,7 +387,6 @@ module Action (Github_api : Api.Github) (Slack_api : Api.Slack) (Buildkite_api :
              let%lwt failed_steps = new_failed_steps ~get_build:(Buildkite_api.get_build ~ctx) n repo_state in
              Lwt.return_some failed_steps
          in
-
          let%lwt job_log =
            match cfg.include_logs_in_notifs with
            | false -> Lwt.return []
@@ -447,11 +446,10 @@ module Action (Github_api : Api.Github) (Slack_api : Api.Slack) (Buildkite_api :
         (match handler with
         | None -> Lwt.return_unit
         | Some handler ->
-          (try%lwt
-             match%lwt handler res with
-             | Result.Error e -> handler_error e
-             | Ok () -> Lwt.return_unit
-           with exn -> handler_error (Printexc.to_string exn)))
+          (match%lwt handler res with
+          | Result.Error e -> handler_error e
+          | Ok () -> Lwt.return_unit
+          | exception exn -> handler_error (Printexc.to_string exn)))
       | Ok None -> Lwt.return_unit
       | Error e -> action_error e
     in
diff --git a/lib/api_remote.ml b/lib/api_remote.ml
@@ -256,7 +256,7 @@ module Slack : Api.Slack = struct
     | Ok { Slack_t.upload_url; file_id } ->
       (match%lwt post_file_content ~upload_url ~filename:name ~content with
       | Error e -> Lwt.return_error e
-      | Ok () -> Lwt.return_ok ({ id = file_id; title } : Slack_t.file_v2))
+      | Ok () -> Lwt.return_ok ({ id = file_id; title } : Slack_t.file))
 
   let complete_upload_external ~(ctx : Context.t) ?channel_id ?thread_ts ?initial_comment files =
     let name = "complete_upload_external" in
diff --git a/lib/slack.atd b/lib/slack.atd
@@ -171,29 +171,22 @@ type upload_url_res = {
   file_id: string;
 }
 
-type file_v2 = {
+type file = {
   id: string;
   ?title: string nullable;
 }
 
-type files_v2 = file_v2 list
+type files = file list
 
 type complete_upload_external_req = {
-  files: files_v2;
+  files: files;
   ?channel_id: channel_id nullable;
   ?thread_ts: timestamp nullable;
   ?initial_comment: string nullable;
 }
 
-type complete_upload_external_file_res = {
-  url_private: string;
-  url_private_download: string;
-  permalink: string;
-  permalink_public: string;
-}
-
 type complete_upload_external_res = {
-  files: files_v2;
+  files: files;
 }
 
 type join_channel_req = {
diff --git a/lib/slack.ml b/lib/slack.ml
@@ -438,17 +438,17 @@ let generate_status_notification ?slack_user_id ?failed_steps ~(job_log : (strin
   let handler =
     match job_log with
     | [] -> None
-    | _ :: _ when is_failed_build_notification ->
+    | _ :: _ when Status_notification.is_user channel ->
       let files =
         job_log
         |> List.map (fun (job_name, job_log) ->
                { name = job_name; title = None; alt_txt = None; content = reply_of_log job_log })
       in
       Some
-        (fun (upload_file : file:file_req -> (unit, string) result Lwt.t) (res : Slack_t.post_message_res) ->
+        (fun (send_file : file:file_req -> (unit, string) result Lwt.t) (res : Slack_t.post_message_res) ->
           let ({ ts; channel; _ } : post_message_res) = res in
           let file = { files; channel_id = Some channel; initial_comment = None; thread_ts = Some ts } in
-          upload_file ~file)
+          send_file ~file)
     | _ -> None
   in
   make_message ~text:summary ~attachments:[ attachment ] ?handler
diff --git a/lib/util.ml b/lib/util.ml
@@ -342,9 +342,8 @@ module Build = struct
 
   let filter_failed_jobs jobs =
     List.filter_map
-      (fun (job : Buildkite_t.job_type) ->
-        match job with
-        | Script ({ state = Failed; _ } as job) | Trigger ({ state = Failed; _ } as job) -> Some job
+      (function
+        | Buildkite_t.Script ({ state = Failed; _ } as job) | Trigger ({ state = Failed; _ } as job) -> Some job
         | _ -> None)
       jobs
 end
