Use modern base64

CHANGES.md

@@ -1,3 +1,9 @@
+### v0.12.3
+
+- Add missing dependency on Base64 and port to >=3.0.0 interface (@avsm)
+- Adapt to crunch.3.0.0 interface (@hannesm)
+- Use non-deprecated Yojson types in 1.7.0 and higher (@avsm)
+
 ### 0.12.2 (2019-01-18)
 
 - Support the latest GitHub and Atd bindings (>=2.0.0) (@avsm)

Dockerfile

@@ -4,7 +4,7 @@ RUN sudo apk add --no-cache tzdata aspcud gmp-dev perl libev-dev m4
 ENV OPAMERRLOGLEN=0 OPAMYES=1
 
 RUN git -C /home/opam/opam-repository fetch origin && \
-    git -C /home/opam/opam-repository reset da99aec5e0ecc83bd86926b620eff45b99c82c26 --hard && \
+    git -C /home/opam/opam-repository reset b01a2e4e1ac2fb545d593ad40bc95b4a78dec9e2 --hard && \
     opam update -u
 
 RUN opam install alcotest lwt conf-libev inotify
@@ -33,7 +33,7 @@ RUN opam install datakit -ytv
 RUN sudo cp $(opam config exec -- which datakit) /usr/bin/datakit && \
     sudo cp $(opam config exec -- which datakit-mount) /usr/bin/datakit-mount
 
-FROM alpine:3.8
+FROM alpine:3.9
 RUN apk add --no-cache libev gmp tzdata ca-certificates git openssh-client bash
 EXPOSE 5640
 ENTRYPOINT ["/usr/bin/datakit"]

Dockerfile.bridge-local-git

@@ -8,7 +8,7 @@ RUN opam update --dev && opam upgrade
 RUN opam install datakit-bridge-local-git -tyv
 RUN sudo cp $(opam config exec -- which datakit-bridge-local-git) /usr/bin/
 
-FROM alpine:3.8
+FROM alpine:3.9
 RUN apk add --no-cache libev gmp tzdata ca-certificates
 ENTRYPOINT ["/usr/bin/datakit-bridge-local-git"]
 COPY --from=0 /usr/bin/datakit-bridge-local-git /usr/bin/datakit-bridge-local-git

Dockerfile.ci

@@ -4,7 +4,7 @@ RUN sudo apk add --no-cache tzdata aspcud gmp-dev perl libev-dev m4
 ENV OPAMERRLOGLEN=0 OPAMYES=1
 
 RUN git -C /home/opam/opam-repository fetch origin && \
-    git -C /home/opam/opam-repository reset da99aec5e0ecc83bd86926b620eff45b99c82c26 --hard && \
+    git -C /home/opam/opam-repository reset b01a2e4e1ac2fb545d593ad40bc95b4a78dec9e2 --hard && \
     opam update -u
 
 RUN opam install alcotest lwt conf-libev inotify

Dockerfile.client

@@ -4,7 +4,7 @@ RUN sudo apk add --no-cache tzdata aspcud gmp-dev perl libev-dev m4
 ENV OPAMERRLOGLEN=0 OPAMYES=1
 
 RUN git -C /home/opam/opam-repository fetch origin && \
-    git -C /home/opam/opam-repository reset da99aec5e0ecc83bd86926b620eff45b99c82c26 --hard && \
+    git -C /home/opam/opam-repository reset b01a2e4e1ac2fb545d593ad40bc95b4a78dec9e2 --hard && \
     opam update -u
 
 RUN opam install alcotest lwt conf-libev inotify

Dockerfile.github

@@ -4,7 +4,7 @@ RUN sudo apk add --no-cache tzdata aspcud gmp-dev perl libev-dev m4
 ENV OPAMERRLOGLEN=0 OPAMYES=1
 
 RUN git -C /home/opam/opam-repository fetch origin && \
-    git -C /home/opam/opam-repository reset da99aec5e0ecc83bd86926b620eff45b99c82c26 --hard && \
+    git -C /home/opam/opam-repository reset b01a2e4e1ac2fb545d593ad40bc95b4a78dec9e2 --hard && \
     opam update -u
 
 RUN opam install alcotest lwt conf-libev inotify tls
@@ -32,7 +32,7 @@ RUN opam install datakit-bridge-github -ytv
 
 RUN sudo cp $(opam config exec -- which datakit-bridge-github) /usr/bin/
 
-FROM alpine:3.8
+FROM alpine:3.9
 RUN apk add --no-cache libev gmp tzdata ca-certificates
 EXPOSE 5640
 EXPOSE 5641

ci/src/cI_output.ml

@@ -20,7 +20,7 @@ let logs = snd
 let status t = CI_result.status (result t)
 let descr t = CI_result.descr (result t)
 
-let rec json_of_logs : logs -> Yojson.Basic.json = function
+let rec json_of_logs : logs -> Yojson.Basic.t = function
   | Empty -> `Null
   | Live x ->
     `Assoc [

ci/src/cI_output.mli

@@ -23,7 +23,7 @@ val equal : string t -> string t -> bool
 (** [equal a b] is [true] iff [a] and [b] are equal for the purposes of saving the output metadata to disk.
     i.e. they have the same JSON representation. *)
 
-val json_of : string t -> Yojson.Basic.json
-val of_json : Yojson.Basic.json -> string t
+val json_of : string t -> Yojson.Basic.t
+val of_json : Yojson.Basic.t -> string t
 
 val pp : 'a Fmt.t -> 'a t Fmt.t

ci/src/cI_result.mli

@@ -10,5 +10,5 @@ val pp: 'a Fmt.t -> 'a t Fmt.t
 val v : [< `Success | `Pending | `Failure] -> string -> string t
 val status : _ t -> [> `Success | `Pending | `Failure]
 val descr : string t -> string
-val json_of : string t -> Yojson.Basic.json
-val of_json : Yojson.Basic.json -> string t
+val json_of : string t -> Yojson.Basic.t
+val of_json : Yojson.Basic.t -> string t

ci/src/cI_static.mli

@@ -2,4 +2,3 @@ val read : string -> string option
 
 (* to avoid warning 32 *)
 val file_list: string list
-val size: string -> int64 option

ci/src/cI_web_utils.ml

@@ -190,7 +190,7 @@ module Auth = struct
     if Sys.file_exists passwd_file then (
       load_local_users passwd_file >|= fun db -> `Configured db
     ) else (
-      let token = B64.(encode ~alphabet:uri_safe_alphabet) (Nocrypto.Rng.generate 24 |> Cstruct.to_string) in
+      let token = Base64.(encode_string ~alphabet:uri_safe_alphabet) (Nocrypto.Rng.generate 24 |> Cstruct.to_string) in
       let setup_url = Uri.with_path web_ui ("/auth/intro/" ^ token) in
       Log.app (fun f -> f ">>> Configure the CI by visiting@\n%a" Uri.pp_hum setup_url);
       Lwt.return (`Config_token token)
@@ -444,7 +444,7 @@ class virtual resource_with_session t =
     method private session rd =
       let generate_new_session () =
         Log.info (fun f -> f "Generating new session");
-        let csrf_token = B64.encode (Nocrypto.Rng.generate 16 |> Cstruct.to_string) in
+        let csrf_token = Base64.encode_string (Nocrypto.Rng.generate 16 |> Cstruct.to_string) in
         let value = { Session_data.csrf_token; username = None; login_redirect = None; attrs = Auth.empty_attrs } in
         self#session_set (Session_data.to_string value) rd >>= fun () ->
         Lwt.return value

ci/tests/test_utils.ml

@@ -265,7 +265,7 @@ let strip_times log =
   Str.global_replace re_timestamp "" log
 
 module Json = struct
-  type t = Yojson.Basic.json
+  type t = Yojson.Basic.t
   let pp f v = Yojson.Basic.pretty_print f v
   let equal = (=)
 end

datakit-ci.opam

@@ -38,6 +38,8 @@ depends: [
   "irmin-unix" {with-test & >= "1.2.0"}
   "alcotest" {with-test}
   "cohttp-lwt-unix" {>= "1.0.0"}
+  "base64" {>="3.1.0"}
+  "yojson" {>="1.7.0"}
 ]
 build: [
   ["dune" "build" "-p" name "-j" jobs]