diff options
author | paulrbr-fl <43074087+paulrbr-fl@users.noreply.github.com> | 2019-04-26 20:48:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-26 20:48:05 +0200 |
commit | 42bbd0c742544050218b898a45d4d5bb6d3177f3 (patch) | |
tree | 0883606ca59c0a688c86b29cfde540b0e341db59 /dhall | |
parent | d663610913fab7252d481664172be9e44f607764 (diff) | |
parent | 331e852ca9f795818b7dcbb85d782dfff32c4ea2 (diff) | |
download | ansible-kong-app-42bbd0c742544050218b898a45d4d5bb6d3177f3.tar.gz ansible-kong-app-42bbd0c742544050218b898a45d4d5bb6d3177f3.tar.zst ansible-kong-app-42bbd0c742544050218b898a45d4d5bb6d3177f3.zip |
Merge pull request #14 from paulrbr-fl/upgrade-dhall-versionv0.8
dhall(upgrade): upgrade code to be compatible with dhall 1.21.0
Diffstat (limited to 'dhall')
-rw-r--r-- | dhall/server/service/plugin/CorrelationId.dhall | 16 | ||||
-rw-r--r-- | dhall/server/service/plugin/mkIPRestriction.dhall | 16 | ||||
-rw-r--r-- | dhall/server/service/plugin/mkRequestTermination.dhall | 34 | ||||
-rw-r--r-- | dhall/server/service/plugin/mkRequestTransformer.dhall | 16 |
4 files changed, 41 insertions, 41 deletions
diff --git a/dhall/server/service/plugin/CorrelationId.dhall b/dhall/server/service/plugin/CorrelationId.dhall index d96bfc9..655cd8d 100644 --- a/dhall/server/service/plugin/CorrelationId.dhall +++ b/dhall/server/service/plugin/CorrelationId.dhall | |||
@@ -1,11 +1,11 @@ | |||
1 | let Plugin = ./Plugin.dhall | 1 | let Plugin = ./Plugin.dhall |
2 | 2 | ||
3 | in let config = constructors ./Config.dhall | 3 | let config = ./Config.dhall |
4 | 4 | ||
5 | in { name = | 5 | in { name = |
6 | "correlation-id" | 6 | "correlation-id" |
7 | , config = | 7 | , config = |
8 | config.CorrelationId | 8 | config.CorrelationId |
9 | { header_name = "X-correl", echo_downstream = True } | 9 | { header_name = "X-correl", echo_downstream = True } |
10 | } | 10 | } |
11 | : Plugin | 11 | : Plugin |
diff --git a/dhall/server/service/plugin/mkIPRestriction.dhall b/dhall/server/service/plugin/mkIPRestriction.dhall index f803769..a27e5d9 100644 --- a/dhall/server/service/plugin/mkIPRestriction.dhall +++ b/dhall/server/service/plugin/mkIPRestriction.dhall | |||
@@ -1,11 +1,11 @@ | |||
1 | let Plugin = ./Plugin.dhall | 1 | let Plugin = ./Plugin.dhall |
2 | 2 | ||
3 | in let config = constructors ./Config.dhall | 3 | let config = ./Config.dhall |
4 | 4 | ||
5 | in λ(whiteList : Text) | 5 | in λ(whiteList : Text) |
6 | → { name = | 6 | → { name = |
7 | "ip-restriction" | 7 | "ip-restriction" |
8 | , config = | 8 | , config = |
9 | config.IPRestriction { whitelist = whiteList } | 9 | config.IPRestriction { whitelist = whiteList } |
10 | } | 10 | } |
11 | : Plugin | 11 | : Plugin |
diff --git a/dhall/server/service/plugin/mkRequestTermination.dhall b/dhall/server/service/plugin/mkRequestTermination.dhall index aff538f..1d047d7 100644 --- a/dhall/server/service/plugin/mkRequestTermination.dhall +++ b/dhall/server/service/plugin/mkRequestTermination.dhall | |||
@@ -1,20 +1,20 @@ | |||
1 | let Plugin = ./Plugin.dhall | 1 | let Plugin = ./Plugin.dhall |
2 | 2 | ||
3 | in let config = constructors ./Config.dhall | 3 | let config = ./Config.dhall |
4 | 4 | ||
5 | in λ(statusCode : Natural) | 5 | in λ(statusCode : Natural) |
6 | → λ(contentType : Text) | 6 | → λ(contentType : Text) |
7 | → λ(body : Text) | 7 | → λ(body : Text) |
8 | → { name = | 8 | → { name = |
9 | "request-termination" | 9 | "request-termination" |
10 | , config = | 10 | , config = |
11 | config.RequestTermination | 11 | config.RequestTermination |
12 | { status_code = | 12 | { status_code = |
13 | statusCode | 13 | statusCode |
14 | , content_type = | 14 | , content_type = |
15 | contentType | 15 | contentType |
16 | , body = | 16 | , body = |
17 | body | 17 | body |
18 | } | 18 | } |
19 | } | 19 | } |
20 | : Plugin | 20 | : Plugin |
diff --git a/dhall/server/service/plugin/mkRequestTransformer.dhall b/dhall/server/service/plugin/mkRequestTransformer.dhall index 1d8d608..488ecdd 100644 --- a/dhall/server/service/plugin/mkRequestTransformer.dhall +++ b/dhall/server/service/plugin/mkRequestTransformer.dhall | |||
@@ -1,11 +1,11 @@ | |||
1 | let Plugin = ./Plugin.dhall | 1 | let Plugin = ./Plugin.dhall |
2 | 2 | ||
3 | in let config = constructors ./Config.dhall | 3 | let config = ./Config.dhall |
4 | 4 | ||
5 | in λ(header : Text) | 5 | in λ(header : Text) |
6 | → { name = | 6 | → { name = |
7 | "request-transformer" | 7 | "request-transformer" |
8 | , config = | 8 | , config = |
9 | config.RequestTransformer { add = { headers = [ header ] } } | 9 | config.RequestTransformer { add = { headers = [ header ] } } |
10 | } | 10 | } |
11 | : Plugin \ No newline at end of file | 11 | : Plugin |