Merge pull request #19 from paulrbr-fl/dhall-1.33-compat

dhall: BREAKING CHANGE update dhall config for 1.33+ compatibility
fretlink · Aug 13, 2020 · f131496 · f131496
2 parents 25250c8 + d8c5e33
commit f131496
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ install:
 
   # Install ansible
   - nix-env -i python3 ansible ansible-lint
-  - nix-env -if ./dhall-1.26.1.nix
+  - nix-env -if ./dhall-1.34.0.nix
 
   # Check ansible version
   - ansible --version

diff --git a/dhall-1.26.1.nix → dhall-1.34.0.nix b/dhall-1.26.1.nix → dhall-1.34.0.nix
@@ -19,4 +19,4 @@ let
         '';
       };
 in
-  mkVersion "1.26.1" "0sl4r3mfairgd6kn26hs1r1lkh8rn992grd73078rhqf5w90ag05"
+  mkVersion "1.34.0" "0n64jkgbv7a3cmlv3gxpgc11p9b5w0k9nc0zm9am2pzmp6vm6b4n"
diff --git a/dhall/server/service/plugin/correlationId.dhall b/dhall/server/service/plugin/correlationId.dhall
@@ -2,22 +2,16 @@ let Plugin = ./Plugin.dhall
 
 let config = ./Config.dhall
 
-in    λ(generator : Optional Text)
-    →   { name =
-            "correlation-id"
+in  λ(generator : Optional Text) →
+        { name = "correlation-id"
         , config =
             config.CorrelationId
-            { header_name =
-                "X-correl"
-            , echo_downstream =
-                True
-            , generator =
-                Optional/fold
-                Text
-                generator
-                Text
-                (λ(t : Text) → t)
-                "uuid#counter"
-            }
+              { header_name = "X-correl"
+              , echo_downstream = True
+              , generator =
+                  merge
+                    { None = "uuid#counter", Some = λ(x : Text) → x }
+                    generator
+              }
         }
       : Plugin
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,4 +19,4 @@ let @@
             '';
           };
     in
-      mkVersion "1.26.1" "0sl4r3mfairgd6kn26hs1r1lkh8rn992grd73078rhqf5w90ag05"
+      mkVersion "1.34.0" "0n64jkgbv7a3cmlv3gxpgc11p9b5w0k9nc0zm9am2pzmp6vm6b4n"