use the new notification sending interface throughout the codebase

Author: yasunariw

lib/action.ml

@@ -152,41 +152,29 @@ module Action (Github_api : Api.Github) (Slack_api : Api.Slack) = struct
     let cfg = Context.get_config_exn ctx in
     match req with
     | Github.Push n ->
-      partition_push cfg n |> List.map ~f:(fun (webhook, n) -> webhook, generate_push_notification n) |> Lwt.return
-    | Pull_request n ->
-      partition_pr cfg n |> List.map ~f:(fun webhook -> webhook, generate_pull_request_notification n) |> Lwt.return
-    | PR_review n ->
-      partition_pr_review cfg n |> List.map ~f:(fun webhook -> webhook, generate_pr_review_notification n) |> Lwt.return
+      partition_push cfg n |> List.map ~f:(fun (channel, n) -> generate_push_notification n channel) |> Lwt.return
+    | Pull_request n -> partition_pr cfg n |> List.map ~f:(generate_pull_request_notification n) |> Lwt.return
+    | PR_review n -> partition_pr_review cfg n |> List.map ~f:(generate_pr_review_notification n) |> Lwt.return
     | PR_review_comment n ->
-      partition_pr_review_comment cfg n
-      |> List.map ~f:(fun webhook -> webhook, generate_pr_review_comment_notification n)
-      |> Lwt.return
-    | Issue n ->
-      partition_issue cfg n |> List.map ~f:(fun webhook -> webhook, generate_issue_notification n) |> Lwt.return
+      partition_pr_review_comment cfg n |> List.map ~f:(generate_pr_review_comment_notification n) |> Lwt.return
+    | Issue n -> partition_issue cfg n |> List.map ~f:(generate_issue_notification n) |> Lwt.return
     | Issue_comment n ->
-      partition_issue_comment cfg n
-      |> List.map ~f:(fun webhook -> webhook, generate_issue_comment_notification n)
-      |> Lwt.return
+      partition_issue_comment cfg n |> List.map ~f:(generate_issue_comment_notification n) |> Lwt.return
     | Commit_comment n ->
-      let%lwt webhooks, api_commit = partition_commit_comment ctx n in
-      let%lwt notif = generate_commit_comment_notification api_commit n in
-      let notifs = List.map ~f:(fun webhook -> webhook, notif) webhooks in
+      let%lwt channels, api_commit = partition_commit_comment ctx n in
+      let notifs = List.map ~f:(generate_commit_comment_notification api_commit n) channels in
       Lwt.return notifs
     | Status n ->
-      let%lwt webhooks = partition_status ctx n in
-      let notifs = List.map ~f:(fun webhook -> webhook, generate_status_notification cfg n) webhooks in
+      let%lwt channels = partition_status ctx n in
+      let notifs = List.map ~f:(generate_status_notification cfg n) channels in
       Lwt.return notifs
     | _ -> Lwt.return []
 
   let send_notifications (ctx : Context.t) notifications =
-    let notify (chan, msg) =
-      match Context.hook_of_channel ctx chan with
-      | None -> Printf.ksprintf action_error "webhook not defined for Slack channel '%s'" chan
-      | Some url ->
-        ( match%lwt Slack_api.send_notification ~chan ~msg ~url with
-        | Ok () -> Lwt.return_unit
-        | Error e -> action_error e
-        )
+    let notify (msg : Slack_t.post_message_req) =
+      match%lwt Slack_api.send_notification ~ctx ~msg with
+      | Ok () -> Lwt.return_unit
+      | Error e -> action_error e
     in
     Lwt_list.iter_s notify notifications
 

lib/slack.ml

@@ -5,10 +5,6 @@ open Common
 open Github_j
 open Slack_j
 
-let log = Log.from "slack"
-
-type channel_hook = string
-
 let empty_attachments =
   {
     mrkdwn_in = None;
@@ -37,7 +33,7 @@ let show_labels = function
   | (labels : label list) ->
     Some (sprintf "Labels: %s" @@ String.concat ~sep:", " (List.map ~f:(fun x -> x.name) labels))
 
-let generate_pull_request_notification notification =
+let generate_pull_request_notification notification channel =
   let { action; number; sender; pull_request; repository } = notification in
   let ({ body; title; html_url; labels; _ } : pull_request) = pull_request in
   let action, body =
@@ -57,6 +53,7 @@ let generate_pull_request_notification notification =
          action sender.login)
   in
   {
+    channel;
     text = None;
     attachments =
       Some
@@ -73,7 +70,7 @@ let generate_pull_request_notification notification =
     blocks = None;
   }
 
-let generate_pr_review_notification notification =
+let generate_pr_review_notification notification channel =
   let { action; sender; pull_request; review; repository } = notification in
   let ({ number; title; html_url; _ } : pull_request) = pull_request in
   let action_str =
@@ -96,6 +93,7 @@ let generate_pr_review_notification notification =
          action_str number html_url title)
   in
   {
+    channel;
     text = None;
     attachments =
       Some
@@ -112,7 +110,7 @@ let generate_pr_review_notification notification =
     blocks = None;
   }
 
-let generate_pr_review_comment_notification notification =
+let generate_pr_review_comment_notification notification channel =
   let { action; pull_request; sender; comment; repository } = notification in
   let ({ number; title; html_url; _ } : pull_request) = pull_request in
   let action_str =
@@ -134,6 +132,7 @@ let generate_pr_review_comment_notification notification =
     | Some a -> Some (sprintf "New comment by %s in <%s|%s>" sender.login comment.html_url a)
   in
   {
+    channel;
     text = None;
     attachments =
       Some
@@ -151,7 +150,7 @@ let generate_pr_review_comment_notification notification =
     blocks = None;
   }
 
-let generate_issue_notification notification =
+let generate_issue_notification notification channel =
   let ({ action; sender; issue; repository } : issue_notification) = notification in
   let { number; body; title; html_url; labels; _ } = issue in
   let action, body =
@@ -171,6 +170,7 @@ let generate_issue_notification notification =
          sender.login)
   in
   {
+    channel;
     text = None;
     attachments =
       Some
@@ -187,7 +187,7 @@ let generate_issue_notification notification =
     blocks = None;
   }
 
-let generate_issue_comment_notification notification =
+let generate_issue_comment_notification notification channel =
   let { action; issue; sender; comment; repository } = notification in
   let { number; title; _ } = issue in
   let action_str =
@@ -205,6 +205,7 @@ let generate_issue_comment_notification notification =
          action_str number issue.html_url title)
   in
   {
+    channel;
     text = None;
     attachments =
       Some
@@ -223,7 +224,7 @@ let generate_issue_comment_notification notification =
 
 let git_short_sha_hash hash = String.sub ~pos:0 ~len:8 hash
 
-let generate_push_notification notification =
+let generate_push_notification notification channel =
   let { sender; created; deleted; forced; compare; commits; repository; _ } = notification in
   let commits_branch = Github.commits_branch_of_ref notification.ref in
   let tree_url = String.concat ~sep:"/" [ repository.url; "tree"; Uri.pct_encode commits_branch ] in
@@ -247,6 +248,7 @@ let generate_push_notification notification =
       sprintf "`<%s|%s>` %s - %s" url (git_short_sha_hash id) title author.name)
   in
   {
+    channel;
     text = Some title;
     attachments =
       Some
@@ -262,7 +264,7 @@ let generate_push_notification notification =
     blocks = None;
   }
 
-let generate_status_notification (cfg : Config_t.config) (notification : status_notification) =
+let generate_status_notification (cfg : Config_t.config) (notification : status_notification) channel =
   let { commit; state; description; target_url; context; repository; _ } = notification in
   let ({ commit : inner_commit; sha; author; html_url; _ } : status_commit) = commit in
   let ({ message; _ } : inner_commit) = commit in
@@ -324,9 +326,9 @@ let generate_status_notification (cfg : Config_t.config) (notification : status_
       fields = Some [ { title = None; value = String.concat ~sep:"\n" @@ List.concat [ commit_info; branches_info ] } ];
     }
   in
-  { text = None; attachments = Some [ attachment ]; blocks = None }
+  { channel; text = None; attachments = Some [ attachment ]; blocks = None }
 
-let generate_commit_comment_notification api_commit notification =
+let generate_commit_comment_notification api_commit notification channel =
   let { commit; _ } = api_commit in
   let { sender; comment; repository; _ } = notification in
   let commit_id =
@@ -355,5 +357,4 @@ let generate_commit_comment_notification api_commit notification =
       text = Some (mrkdwn_of_markdown comment.body);
     }
   in
-  let notifs = { text = None; attachments = Some [ attachment ]; blocks = None } in
-  Lwt.return notifs
+  { channel; text = None; attachments = Some [ attachment ]; blocks = None }

src/monorobot.ml

@@ -43,14 +43,17 @@ let check_gh_action file json config secrets state =
         )
     )
 
-let check_slack_action url file =
+let check_slack_action file secrets =
   let data = Stdio.In_channel.read_all file in
-  let chan = Printf.sprintf "webhook %s" url in
+  let ctx = Context.make ~secrets_filepath:secrets () in
   match Slack_j.post_message_req_of_string data with
   | exception exn -> log#error ~exn "unable to parse notification"
   | msg ->
+  match Context.refresh_secrets ctx with
+  | Error e -> log#error "%s" e
+  | Ok ctx ->
     Lwt_main.run
-      ( match%lwt Api_remote.Slack.send_notification ~chan ~msg ~url with
+      ( match%lwt Api_remote.Slack.send_notification ~ctx ~msg with
       | Error e ->
         log#error "%s" e;
         Lwt.return_unit
@@ -86,13 +89,9 @@ let gh_payload =
   let doc = "path to a JSON file containing a github webhook payload" in
   Arg.(required & pos 0 (some file) None & info [] ~docv:"GH_PAYLOAD" ~doc)
 
-let slack_webhook_url =
-  let doc = "slack webhook url" in
-  Arg.(required & pos 0 (some string) None & info [] ~docv:"SLACK_WEBHOOK" ~doc)
-
 let slack_payload =
   let doc = "path to a JSON file containing a slack notification payload" in
-  Arg.(required & pos 1 (some file) None & info [] ~docv:"SLACK_PAYLOAD" ~doc)
+  Arg.(required & pos 0 (some file) None & info [] ~docv:"SLACK_PAYLOAD" ~doc)
 
 let json =
   let doc = "if set, will format output as json" in
@@ -113,9 +112,9 @@ let check_gh =
   term, info
 
 let check_slack =
-  let doc = "read a Slack notification from a file and send it to a webhook; used for testing" in
+  let doc = "read a Slack notification from a file and send it to a channel; used for testing" in
   let info = Term.info "check_slack" ~doc in
-  let term = Term.(const check_slack_action $ slack_webhook_url $ slack_payload) in
+  let term = Term.(const check_slack_action $ slack_payload $ secrets) in
   term, info
 
 let default_cmd =