aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorpaulrbr-fl <43074087+paulrbr-fl@users.noreply.github.com>2020-08-13 17:54:24 +0200
committerGitHub <noreply@github.com>2020-08-13 17:54:24 +0200
commitf131496c3e23d30c30dd597ab734b0f771f4a4d9 (patch)
tree034b7aabaecd61229985c3346a75e4496f89743e
parent25250c8c24a3c0b32c92eee5552ad7156115f03c (diff)
parentd8c5e33f6015e3f17aaf5fd290b1834e6e6c1049 (diff)
downloadansible-kong-app-f131496c3e23d30c30dd597ab734b0f771f4a4d9.tar.gz
ansible-kong-app-f131496c3e23d30c30dd597ab734b0f771f4a4d9.tar.zst
ansible-kong-app-f131496c3e23d30c30dd597ab734b0f771f4a4d9.zip
Merge pull request #19 from paulrbr-fl/dhall-1.33-compatv0.31
dhall: BREAKING CHANGE update dhall config for 1.33+ compatibility
-rw-r--r--.travis.yml2
-rw-r--r--dhall-1.34.0.nix (renamed from dhall-1.26.1.nix)2
-rw-r--r--dhall/server/service/plugin/correlationId.dhall24
3 files changed, 11 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml
index 14ab868..99c10c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ install:
14 14
15 # Install ansible 15 # Install ansible
16 - nix-env -i python3 ansible ansible-lint 16 - nix-env -i python3 ansible ansible-lint
17 - nix-env -if ./dhall-1.26.1.nix 17 - nix-env -if ./dhall-1.34.0.nix
18 18
19 # Check ansible version 19 # Check ansible version
20 - ansible --version 20 - ansible --version
diff --git a/dhall-1.26.1.nix b/dhall-1.34.0.nix
index 918a528..a70d201 100644
--- a/dhall-1.26.1.nix
+++ b/dhall-1.34.0.nix
@@ -19,4 +19,4 @@ let
19 ''; 19 '';
20 }; 20 };
21in 21in
22 mkVersion "1.26.1" "0sl4r3mfairgd6kn26hs1r1lkh8rn992grd73078rhqf5w90ag05" 22 mkVersion "1.34.0" "0n64jkgbv7a3cmlv3gxpgc11p9b5w0k9nc0zm9am2pzmp6vm6b4n"
diff --git a/dhall/server/service/plugin/correlationId.dhall b/dhall/server/service/plugin/correlationId.dhall
index d5d5928..41c5720 100644
--- a/dhall/server/service/plugin/correlationId.dhall
+++ b/dhall/server/service/plugin/correlationId.dhall
@@ -2,22 +2,16 @@ let Plugin = ./Plugin.dhall
2 2
3let config = ./Config.dhall 3let config = ./Config.dhall
4 4
5in λ(generator : Optional Text) 5in λ(generator : Optional Text) →
6 → { name = 6 { name = "correlation-id"
7 "correlation-id"
8 , config = 7 , config =
9 config.CorrelationId 8 config.CorrelationId
10 { header_name = 9 { header_name = "X-correl"
11 "X-correl" 10 , echo_downstream = True
12 , echo_downstream = 11 , generator =
13 True 12 merge
14 , generator = 13 { None = "uuid#counter", Some = λ(x : Text) → x }
15 Optional/fold 14 generator
16 Text 15 }
17 generator
18 Text
19 (λ(t : Text) → t)
20 "uuid#counter"
21 }
22 } 16 }
23 : Plugin 17 : Plugin