PRO-557 #72 REFACTOR Update libraries

code/.ocamlformat

@@ -1,4 +1,4 @@
-version=0.26.2
+version=0.27.0
 profile = default
 break-cases = fit-or-vertical
 break-fun-decl = fit-or-vertical

code/hll.conf

@@ -22,7 +22,7 @@ fmt = ["logs.fmt"]
 ipaddr = ["ipaddr.unix"]
 logs = ["logs.cli"]
 mirage-crypto-rng = ["mirage-crypto-rng.unix"]
-mtime = ["mtime.clock.os"]
+mtime = ["mtime.clock"]
 ocaml-compiler-libs = ["compiler-libs.common", "ocaml-compiler-libs.common", "ocaml-compiler-libs.shadow"]
 ppx_deriving = ["ppx_deriving.show", "ppx_deriving.eq", "ppx_deriving.ord", "ppx_deriving.make"]
 sedlex = ["sedlex.ppx"]

code/pds.conf

@@ -54,7 +54,18 @@ deps = ["abb_intf", "abb_channel", "abb_future_combinators"]
 
 [src.abb_dns]
 install = true
-deps = ["abb_future_combinators", "abb_intf", "abb_io", "cstruct", "dns-client", "dns-client.resolvconf", "logs", "mirage-crypto-rng.unix", "mtime", "mtime.clock.os"]
+deps = [
+     "abb_future_combinators",
+     "abb_intf",
+     "abb_io",
+     "cstruct",
+     "dns-client",
+     "dns-client.resolvconf",
+     "logs",
+     "mirage-crypto-rng.unix",
+     "mtime",
+     "mtime.clock"
+]
 
 [src.abb_flow]
 install = true
@@ -117,19 +128,54 @@ build = false
 
 [src.abb_scheduler_kqueue.selector.freebsd]
 build = true
-deps = ["abb_fut", "abb_intf", "abb_thread_pool", "containers", "iter", "kqueue", "mtime.clock.os", "ppx_deriving", "ppx_deriving.ord", "unix"]
+deps = [
+     "abb_fut",
+     "abb_intf",
+     "abb_thread_pool",
+     "containers",
+     "iter",
+     "kqueue",
+     "mtime",
+     "mtime.clock",
+     "ppx_deriving",
+     "ppx_deriving.ord",
+     "unix"
+]
 
 [src.abb_scheduler_kqueue.selector.linux]
 build = true
-deps = ["abb_fut", "abb_intf", "abb_thread_pool", "containers", "iter", "kqueue", "mtime.clock.os", "ppx_deriving", "ppx_deriving.ord", "unix"]
+deps = [
+     "abb_fut",
+     "abb_intf",
+     "abb_thread_pool",
+     "containers",
+     "iter",
+     "kqueue",
+     "mtime",
+     "mtime.clock",
+     "ppx_deriving",
+     "ppx_deriving.ord",
+     "unix"
+]
 
 [src.abb_scheduler_nyi]
 install = false
 deps = ["abb_intf", "abb_fut"]
 
 [src.abb_scheduler_select]
 install = true
-deps = ["abb_fut", "abb_intf", "abb_thread_pool", "containers", "iter", "mtime.clock.os", "ppx_deriving", "ppx_deriving.ord", "unix"]
+deps = [
+     "abb_fut",
+     "abb_intf",
+     "abb_thread_pool",
+     "containers",
+     "iter",
+     "mtime",
+     "mtime.clock",
+     "ppx_deriving",
+     "ppx_deriving.ord",
+     "unix"
+]
 
 [src.abb_service_local]
 install = true
@@ -187,7 +233,17 @@ deps = ["abb", "abb_tls"]
 
 [src.brtl]
 install = true
-deps = ["abb_intf", "abbs", "cohttp_abb", "hmap", "logs", "snabela", "uri", "uuidm", "yojson"]
+deps = [
+     "abb_intf",
+     "abbs",
+     "cohttp_abb",
+     "hmap",
+     "logs",
+     "ouuid",
+     "snabela",
+     "uri",
+     "yojson"
+]
 
 [src.brtl_ep]
 install = true
@@ -200,7 +256,19 @@ deps = ["abb", "brtl", "brtl_mw_log", "containers", "logs", "logs.fmt"]
 
 [src.brtl_js]
 install = true
-deps = ["abb_js", "furi", "js_of_ocaml", "js_of_ocaml-ppx", "js_of_ocaml-tyxml", "ppx_deriving", "ppx_deriving.ord", "react", "reactiveData", "uri", "uuidm"]
+deps = [
+     "abb_js",
+     "furi",
+     "js_of_ocaml",
+     "js_of_ocaml-ppx",
+     "js_of_ocaml-tyxml",
+     "ouuid",
+     "ppx_deriving",
+     "ppx_deriving.ord",
+     "react",
+     "reactiveData",
+     "uri",
+]
 
 [src.brtl_js2]
 install = true
@@ -419,6 +487,10 @@ install = false
 type = "exec"
 deps = ["ctypes", "ctypes.foreign", "ctypes.stubs", "otls_bindings"]
 
+[src.ouuid]
+install = false
+deps = ["uuidm"]
+
 [src.pds_excise]
 type = "exec"
 project_type = "third-party"
@@ -523,6 +595,7 @@ deps = [
   "lua_pattern",
   "mirage-crypto-pk",
   "mirage-crypto-rng.unix",
+  "ouuid",
   "path_glob",
   "pgsql_pagination",
   "pgsql_pool",
@@ -553,7 +626,6 @@ deps = [
   "terrat_work_manifest3",
   "terratc_intf",
   "tsort",
-  "uuidm",
   "x509",
 ]
 
@@ -796,7 +868,7 @@ deps = ["oth", "abb_fut", "abb_channel", "abb_service_local"]
 deps = ["unix", "oth", "abb_thread_pool"]
 
 [tests.abb_time]
-deps = ["unix", "mtime.clock.os", "oth", "abb_time"]
+deps = ["unix", "mtime", "mtime.clock", "oth", "abb_time"]
 
 [tests.abb_tls]
 deps = ["containers", "uri", "abb_scheduler_select", "abb_tls", "cohttp_abb"]

code/src/brtl/brtl_ctx.ml

@@ -16,7 +16,7 @@ let create remote_addr request =
     body = ();
     response = ();
     remote_addr;
-    token = Uuidm.(to_string ~upper:false (v `V4));
+    token = Ouuid.(to_string ~upper:false (v4 ()));
   }
 
 let uri t =

code/src/brtl_js/brtl_js.ml

@@ -230,7 +230,7 @@ module Router_output = struct
     | Some mtch ->
         let with_cleanup = ref None in
         let prev_match = ref mtch in
-        let id = Uuidm.to_string (Uuidm.v `V4) in
+        let id = Ouuid.to_string (Ouuid.v4 ()) in
         let iter =
           React.S.fmap
             (fun uri ->

code/src/ouuid/ouuid.ml

@@ -0,0 +1,3 @@
+let v4 = Uuidm.v4_gen (Random.State.make_self_init ())
+let to_string = Uuidm.to_string
+let of_string = Uuidm.of_string

code/src/ouuid/ouuid.mli

@@ -0,0 +1,3 @@
+val v4 : unit -> Uuidm.t
+val to_string : ?upper:bool -> Uuidm.t -> string
+val of_string : ?pos:int -> string -> Uuidm.t option

code/src/terrat/terrat_evaluator3.ml

@@ -1760,8 +1760,8 @@ module Make (S : S) = struct
               let deny =
                 CCList.filter
                   (fun Terrat_access_control.R.Deny.
-                         { change_match = { Terrat_change_match3.Dirspace_config.dirspace; _ }; _ } ->
-                    not (Dirspace_map.mem dirspace superapproved))
+                         { change_match = { Terrat_change_match3.Dirspace_config.dirspace; _ }; _ }
+                     -> not (Dirspace_map.mem dirspace superapproved))
                   deny
               in
               Abb.Future.return (Ok Terrat_access_control.R.{ pass; deny })
@@ -2424,7 +2424,8 @@ module Make (S : S) = struct
                                _;
                              };
                            _;
-                         } ->
+                         }
+                       ->
                       autoplan
                       && ((not (S.Pull_request.is_draft_pr pull_request)) || autoplan_draft_pr))
                     working_set_matches
@@ -2440,7 +2441,8 @@ module Make (S : S) = struct
                            Terrat_change_match3.Dirspace_config.when_modified =
                              { Terrat_base_repo_config_v1.When_modified.autoapply; _ };
                            _;
-                         } -> autoapply)
+                         }
+                       -> autoapply)
                     working_set_matches
                 in
                 Abb.Future.return
@@ -2596,7 +2598,8 @@ module Make (S : S) = struct
         Abb.Future.return
           (Ok
              (CCList.map
-                (fun Terrat_change.{ Dirspaceflow.dirspace = Dirspace.{ dir; workspace }; workflow } ->
+                (fun Terrat_change.{ Dirspaceflow.dirspace = Dirspace.{ dir; workspace }; workflow }
+                   ->
                   Terrat_api_components.Work_manifest_dir.
                     {
                       path = dir;
@@ -2807,12 +2810,12 @@ module Make (S : S) = struct
               Abb.Future.return
                 (Error
                    (`Clone
-                     ( {
-                         state with
-                         State.st = St.Waiting_for_work_manifest_run;
-                         work_manifest_id = Some self.Wm.id;
-                       },
-                       states_of_work_manifests work_manifests ))))
+                      ( {
+                          state with
+                          State.st = St.Waiting_for_work_manifest_run;
+                          work_manifest_id = Some self.Wm.id;
+                        },
+                        states_of_work_manifests work_manifests ))))
       | St.Initial, None, Some work_manifest_id -> (
           Logs.info (fun m ->
               m
@@ -2852,8 +2855,8 @@ module Make (S : S) = struct
                       Abb.Future.return
                         (Error
                            (`Clone
-                             ( { state with State.st = St.Waiting_for_work_manifest_initiate },
-                               states )))
+                              ( { state with State.st = St.Waiting_for_work_manifest_initiate },
+                                states )))
                   | _ :: _, _ -> assert false))
           | Some { Wm.id; state = state'; _ } ->
               Logs.err (fun m ->
@@ -2898,7 +2901,7 @@ module Make (S : S) = struct
               Abb.Future.return
                 (Error
                    (`Yield
-                     { state with State.st = St.Waiting_for_work_manifest_initiate; input = None }))
+                      { state with State.st = St.Waiting_for_work_manifest_initiate; input = None }))
           | Some { Wm.id; state = state'; _ } ->
               Logs.err (fun m ->
                   m
@@ -2951,11 +2954,11 @@ module Make (S : S) = struct
       | ( St.Waiting_for_work_manifest_initiate,
           Some
             (I.Work_manifest_initiate
-              {
-                encryption_key;
-                initiate = { Terrat_api_components.Work_manifest_initiate.run_id; sha };
-                p;
-              }),
+               {
+                 encryption_key;
+                 initiate = { Terrat_api_components.Work_manifest_initiate.run_id; sha };
+                 p;
+               }),
           Some work_manifest_id ) -> (
           Logs.info (fun m ->
               m
@@ -2978,12 +2981,12 @@ module Make (S : S) = struct
                   Abb.Future.return
                     (Error
                        (`Yield
-                         {
-                           state with
-                           State.st = St.Waiting_for_work_manifest_result;
-                           output = None;
-                           input = None;
-                         }))
+                          {
+                            state with
+                            State.st = St.Waiting_for_work_manifest_result;
+                            output = None;
+                            input = None;
+                          }))
               | None -> Abb.Future.return (Error (`Noop state)))
           | Some { Wm.id; state = Wm.State.Aborted; _ } ->
               Logs.info (fun m ->
@@ -3243,7 +3246,7 @@ module Make (S : S) = struct
         (Cstruct.to_string
            (Mirage_crypto.Hash.SHA256.hmac
               ~key:encryption_key
-              (Cstruct.of_string (Uuidm.to_string id))))
+              (Cstruct.of_string (Ouuid.to_string id))))
 
     let generate_index_work_manifest_initiate ctx state encryption_key run_id sha work_manifest =
       let module Wm = Terrat_work_manifest3 in
@@ -3618,7 +3621,8 @@ module Make (S : S) = struct
                 branch_ref,
                 working_branch_ref,
                 matches,
-                access_control_results ) ->
+                access_control_results )
+            ->
       let { Terrat_access_control.R.pass = passed_dirspaces; deny = denied_dirspaces } =
         access_control_results
       in
@@ -3732,7 +3736,8 @@ module Make (S : S) = struct
                 branch_ref,
                 working_branch_ref,
                 matches,
-                access_control_results ) ->
+                access_control_results )
+            ->
       let { Terrat_access_control.R.pass = passed_dirspaces; deny = denied_dirspaces } =
         access_control_results
       in
@@ -5498,7 +5503,7 @@ module Make (S : S) = struct
           | [] -> Abb.Future.return (Error (`Noop state))
           | self :: needed_runs ->
               let f (account, repo) =
-                let request_id = Uuidm.to_string (Uuidm.v `V4) in
+                let request_id = Ouuid.to_string (Ouuid.v4 ()) in
                 Logs.info (fun m ->
                     m
                       "EVALUATOR : %s : DRIFT : request_id=%s : account=%s : repo=%s"
@@ -6250,7 +6255,7 @@ module Make (S : S) = struct
          example when emitting a value or running a work manifest.  So we always
          create a new request ID before resuming a run, ensuring it gets a
          unique value. *)
-      let request_id' = Uuidm.to_string (Uuidm.v `V4) in
+      let request_id' = Ouuid.to_string (Ouuid.v4 ()) in
       Abbs_future_combinators.with_finally
         (fun () ->
           Logs.info (fun m ->
@@ -6283,7 +6288,7 @@ module Make (S : S) = struct
                  immediately resumed from where they left off. *)
               Abbs_future_combinators.List.iter
                 ~f:(fun state ->
-                  let request_id = Uuidm.to_string (Uuidm.v `V4) in
+                  let request_id = Ouuid.to_string (Ouuid.v4 ()) in
                   Logs.info (fun m ->
                       m "EVALUATOR : %s : CLONE : request_id=%s" state.State.request_id request_id);
                   let state = { state with State.request_id; input = None; output = None } in