diff options
author | paulrbr-fl <43074087+paulrbr-fl@users.noreply.github.com> | 2019-04-04 13:40:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-04 13:40:09 +0200 |
commit | f3304d462d69fbd1466172c3c7cf445eed19f25f (patch) | |
tree | 90eb429062eeb2aa660965848270cbd30497ff05 /dhall/server/service | |
parent | 66401fc939cd73628561d4832c3e219f0b44d8de (diff) | |
parent | 00cd817342d7dbbb4cc35edb1bd80c97b91ed41b (diff) | |
download | ansible-kong-app-f3304d462d69fbd1466172c3c7cf445eed19f25f.tar.gz ansible-kong-app-f3304d462d69fbd1466172c3c7cf445eed19f25f.tar.zst ansible-kong-app-f3304d462d69fbd1466172c3c7cf445eed19f25f.zip |
Merge pull request #10 from paulrbr-fl/fix-dhall-config-for-kong-upgradev0.6
dhall(fix): fix for generated configuration for Kong 1.x upgrade
Diffstat (limited to 'dhall/server/service')
-rw-r--r-- | dhall/server/service/plugin/Config.dhall | 10 | ||||
-rw-r--r-- | dhall/server/service/plugin/mkRequestTransformer.dhall | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/dhall/server/service/plugin/Config.dhall b/dhall/server/service/plugin/Config.dhall index 73a333f..d54436b 100644 --- a/dhall/server/service/plugin/Config.dhall +++ b/dhall/server/service/plugin/Config.dhall | |||
@@ -1,9 +1,9 @@ | |||
1 | < CorrelationId : | 1 | < CorrelationId : |
2 | { header_name : Text, echo_downstream : Bool } | 2 | { header_name : Text, echo_downstream : Bool } |
3 | | RequestTransformer : | 3 | | RequestTransformer : |
4 | { `add.headers` : Text } | 4 | { add : { headers : List Text } } |
5 | | RequestTermination : | 5 | | RequestTermination : |
6 | { status_code : Natural, content_type : Text, body : Text } | 6 | { status_code : Natural, content_type : Text, body : Text } |
7 | | IPRestriction : | 7 | | IPRestriction : |
8 | { whitelist : Text } | 8 | { whitelist : Text } |
9 | > | 9 | > \ No newline at end of file |
diff --git a/dhall/server/service/plugin/mkRequestTransformer.dhall b/dhall/server/service/plugin/mkRequestTransformer.dhall index 90789c8..1d8d608 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 | in let config = constructors ./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 | 11 | : Plugin \ No newline at end of file |