Merge branch 'yasu/config-re2'

* yasu/config-re2:
  opam: - re
  test: update config regex to re2
  config: wrap match condition regex as re2
  github: use re2
  opam: add re2

Author: yasunariw

lib/common.ml

@@ -15,6 +15,14 @@ module StringMap = struct
   let unwrap = to_list
 end
 
+module Re2 = struct
+  include Re2
+
+  let wrap s = create_exn s
+
+  let unwrap = Re2.to_string
+end
+
 let fmt_error fmt = Printf.ksprintf (fun s -> Error s) fmt
 
 let first_line s =

lib/dune

@@ -1,7 +1,7 @@
 (library
  (name lib)
  (libraries atdgen atdgen-runtime base base64 base.caml biniou cstruct curl curl.lwt
-   devkit devkit.core extlib hex lwt lwt.unix nocrypto omd re stdio uri
+   devkit devkit.core extlib hex lwt lwt.unix nocrypto omd re2 stdio uri
    yojson)
  (preprocess
   (pps lwt_ppx)))

lib/github.ml

@@ -44,11 +44,16 @@ let is_main_merge_message ~msg:message ~branch (cfg : Config_t.config) =
       we should have already seen these commits on the feature branch but for some reason they are distinct:true
     *)
     let re =
-      Str.regexp (sprintf {|^Merge\( remote-tracking\)? branch '\(origin/\)?%s'\( of .+\)? into \(.+\)$|} main_branch)
+      Re2.create_exn
+        (sprintf {|^Merge(?: remote-tracking)? branch '(?:origin/)?%s'(?: of .+)? into (.+)$|} (Re2.escape main_branch))
     in
     let title = Common.first_line message in
-    let matched = Str.string_match re title 0 in
-    matched && (String.equal branch main_branch || String.equal branch (Str.matched_group 4 title))
+    begin
+      try
+        let other_branch = Re2.find_first_exn ~sub:(`Index 1) re title in
+        String.equal branch main_branch || String.equal branch other_branch
+      with Re2.Exceptions.Regex_match_failed _ -> false
+    end
   | _ -> false
 
 let modified_files_of_commit commit = List.concat [ commit.added; commit.removed; commit.modified ]
@@ -89,6 +94,8 @@ type gh_link =
   | Issue of repository * int
   | Commit of repository * commit_hash
 
+let gh_re = Re2.create_exn {|^(.*)/(.+)/(.+)/(commit|pull|issues)/([a-z0-9]+)/?$|}
+
 (** `gh_link_of_string s` parses a URL string `s` to try to match a supported
     GitHub link type, generating repository endpoints if necessary *)
 let gh_link_of_string url_str =
@@ -100,18 +107,12 @@ let gh_link_of_string url_str =
   let custom_api_base ?(scheme = "https") base owner name =
     sprintf "%s://%s/api/v3/repos/%s/%s" scheme base owner name
   in
-  let re = Re.Str.regexp {|^\(.*\)/\(.+\)/\(.+\)/\(commit\|pull\|issues\)/\([a-z0-9]+\)/?$|} in
   match Uri.host url with
   | None -> None
   | Some host ->
-  match Re.Str.string_match re path 0 with
-  | false -> None
-  | true ->
-    let base = host ^ Re.Str.matched_group 1 path in
-    let owner = Re.Str.matched_group 2 path in
-    let name = Re.Str.matched_group 3 path in
-    let link_type = Re.Str.matched_group 4 path in
-    let item = Re.Str.matched_group 5 path in
+  match Re2.find_submatches_exn gh_re path with
+  | [| _; prefix; Some owner; Some name; Some link_type; Some item |] ->
+    let base = Option.value_map prefix ~default:host ~f:(fun p -> String.concat [ host; p ]) in
     let scheme = Uri.scheme url in
     let html_base, api_base =
       if String.is_suffix base ~suffix:"github.com" then gh_com_html_base owner name, gh_com_api_base owner name
@@ -137,3 +138,4 @@ let gh_link_of_string url_str =
         | _ -> None
       with _ -> None
     end
+  | _ | (exception Re2.Exceptions.Regex_match_failed _) -> None

lib/rule.atd

@@ -1,3 +1,5 @@
+type regex = string wrap <ocaml module="Common.Re2">
+
 (* Text fields from the GitHub payload that can be used in a condition *)
 type comparable_field = [
 | Context <json name="context">
@@ -8,7 +10,7 @@ type comparable_field = [
 (* Checks whether a payload field matches the provided regex pattern *)
 type match_condition = {
   field : comparable_field;
-  re : string; (* expects a regex pattern *)
+  re : regex;
 }
 
 (* Specifies additional conditions the payload must meet for the status rule to match *)

lib/rule.ml

@@ -21,10 +21,7 @@ module Status = struct
         | Target_url -> notification.target_url
       in
       let rec match_condition = function
-        | Match { field; re } ->
-          value_of_field field
-          |> Option.map ~f:(fun f -> Re.Str.string_match (Re.Str.regexp_case_fold re) f 0)
-          |> Option.value ~default:false
+        | Match { field; re } -> value_of_field field |> Option.map ~f:(Re2.matches re) |> Option.value ~default:false
         | All_of conditions -> List.for_all conditions ~f:match_condition
         | One_of conditions -> List.exists conditions ~f:match_condition
         | Not condition -> not @@ match_condition condition

monorobot.opam

@@ -22,7 +22,7 @@ depends: [
  "lwt"
  "lwt_ppx"
  "nocrypto"
- "re"
+ "re2"
  "stdio"
  "uri"
  "ocamlformat" {dev}

test/monorobot.json

@@ -11,7 +11,7 @@
                 "when": {
                     "match": {
                         "field": "description",
-                        "re": "^\\(Build #[0-9]+ canceled by .+\\|Failed (exit status 255)\\)$"
+                        "re": "^(Build #[0-9]+ canceled by .+|Failed \\(exit status 255\\))$"
                     }
                 },
                 "policy": "ignore"