Merge pull request #631 from krakendio/dev-v2.1.3

Release v2.1.3
krakend · Nov 18, 2022 · 0418586 · 0418586
2 parents 77a6afd + d2eb3a7
commit 0418586
Show file tree

Hide file tree

Showing 21 changed files with 30 additions and 24 deletions.
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@
 
 BIN_NAME :=krakend
 OS := $(shell uname | tr '[:upper:]' '[:lower:]')
-VERSION := 2.1.2
+VERSION := 2.1.3
 GIT_COMMIT := $(shell git rev-parse --short=7 HEAD)
 PKGNAME := krakend
 LICENSE := Apache 2.0
@@ -19,7 +19,7 @@ DESC := High performance API gateway. Aggregate, filter, manipulate and add midd
 MAINTAINER := Daniel Ortiz <[email protected]>
 DOCKER_WDIR := /tmp/fpm
 DOCKER_FPM := devopsfaith/fpm
-GOLANG_VERSION := 1.19.2
+GOLANG_VERSION := 1.19.3
 GLIBC_VERSION := $(shell sh find_glibc.sh)
 ALPINE_VERSION := 3.16
 OS_TAG :=

diff --git a/go.mod b/go.mod
@@ -19,8 +19,8 @@ require (
  github.com/krakendio/krakend-httpsecure/v2 v2.0.1
  github.com/krakendio/krakend-influx/v2 v2.0.2
  github.com/krakendio/krakend-jose/v2 v2.0.5
- github.com/krakendio/krakend-jsonschema/v2 v2.0.2
- github.com/krakendio/krakend-lambda/v2 v2.0.2
+ github.com/krakendio/krakend-jsonschema/v2 v2.0.3
+ github.com/krakendio/krakend-lambda/v2 v2.0.3
  github.com/krakendio/krakend-logstash/v2 v2.0.1
  github.com/krakendio/krakend-lua/v2 v2.0.3
  github.com/krakendio/krakend-martian/v2 v2.0.2
@@ -33,7 +33,7 @@ require (
  github.com/krakendio/krakend-usage v0.0.0-20220607160923-9d7b69c9bf97
  github.com/krakendio/krakend-viper/v2 v2.0.1
  github.com/krakendio/krakend-xml/v2 v2.0.1
- github.com/luraproject/lura/v2 v2.2.1
+ github.com/luraproject/lura/v2 v2.2.2
  golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 )
 

diff --git a/go.sum b/go.sum
@@ -723,8 +723,12 @@ github.com/krakendio/krakend-jose/v2 v2.0.5 h1:K6LPJbIK0lTQjXBSaoEqJ/AE+XdzJ+xv2
 github.com/krakendio/krakend-jose/v2 v2.0.5/go.mod h1:PGAbTUHFcciVAfArcTipfbZEuyLWuYTs94sG6+Q08LQ=
 github.com/krakendio/krakend-jsonschema/v2 v2.0.2 h1:d98Q1xV9rouajcvP88hYji0asYfVTfso9iKhiTzNbIs=
 github.com/krakendio/krakend-jsonschema/v2 v2.0.2/go.mod h1:kBkeFba9IzwHCljcKAnlpoRD9kFQzTB/UxNe4PNa13A=
+github.com/krakendio/krakend-jsonschema/v2 v2.0.3 h1:5S2vZHRIYLN5Ii+af07nUkbrXPNp8g1tO20MIUJjWrY=
+github.com/krakendio/krakend-jsonschema/v2 v2.0.3/go.mod h1:kBkeFba9IzwHCljcKAnlpoRD9kFQzTB/UxNe4PNa13A=
 github.com/krakendio/krakend-lambda/v2 v2.0.2 h1:BBKflEzAfQw3pHNAVaBopPpGX0b2wt2ZSQjcNZlm4eM=
 github.com/krakendio/krakend-lambda/v2 v2.0.2/go.mod h1:LH9pjG19stIeLLmaE5YKgjvbGJ7Da1pHw9g7cPTTGSg=
+github.com/krakendio/krakend-lambda/v2 v2.0.3 h1:r4MoR5+5BFACmQ1iYjdhJjlJBev889q/CZkCmRL/sFA=
+github.com/krakendio/krakend-lambda/v2 v2.0.3/go.mod h1:LH9pjG19stIeLLmaE5YKgjvbGJ7Da1pHw9g7cPTTGSg=
 github.com/krakendio/krakend-logstash/v2 v2.0.1 h1:5IkbjFwILsZ0bRCcqtFgorGMJzyAMYTyyJywSdxbStk=
 github.com/krakendio/krakend-logstash/v2 v2.0.1/go.mod h1:buiQqKl5Dqv8qjzn4UT2G+bc6iFNYMrMRLK2AGGSaeU=
 github.com/krakendio/krakend-lua/v2 v2.0.2 h1:hRQWUcLhJf/O9isupXe5J/f4u369N7T8CufBXwOFUmM=
@@ -766,6 +770,8 @@ github.com/luraproject/lura/v2 v2.2.0 h1:/r6zrjoyptjpCBxJOba6jL+uXBamRkKU+z2aaRJ
 github.com/luraproject/lura/v2 v2.2.0/go.mod h1:lkKDcV0O3jEK7fX/gGI7/fbkrDUOMKRqe442Xa3KRPQ=
 github.com/luraproject/lura/v2 v2.2.1 h1:l1RJRtefgMJi4JLRjAccbMlQ5F4bxvD37U4QlI0t2CA=
 github.com/luraproject/lura/v2 v2.2.1/go.mod h1:lkKDcV0O3jEK7fX/gGI7/fbkrDUOMKRqe442Xa3KRPQ=
+github.com/luraproject/lura/v2 v2.2.2 h1:gcM6Km6tlR16XyXiLtD9CTYL/vRQoDo8uFgtIgg2fyA=
+github.com/luraproject/lura/v2 v2.2.2/go.mod h1:lkKDcV0O3jEK7fX/gGI7/fbkrDUOMKRqe442Xa3KRPQ=
 github.com/m4ns0ur/httpcache v0.0.0-20200426190423-1040e2e8823f h1:MBcrTbmCf7CZa9yAwcB7ArveQb9TPVy4zFnQGz/LiUU=
 github.com/m4ns0ur/httpcache v0.0.0-20200426190423-1040e2e8823f/go.mod h1:UawoqorwkpZ58qWiL+nVJM0Po7FrzAdCxYVh9GgTTaA=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=

diff --git a/tests/fixtures/specs/backend_301.json b/tests/fixtures/specs/backend_301.json
@@ -5,7 +5,7 @@
  },
  "out": {
  "status_code": 200,
- "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=301\"],\"User-Agent\":[\"KrakenD Version 2.1.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"301\"]}}",
+ "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=301\"],\"User-Agent\":[\"KrakenD Version 2.1.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"301\"]}}",
  "header": {
  "content-type": ["application/json; charset=utf-8"],
  "Cache-Control": ["public, max-age=3600"],

diff --git a/tests/fixtures/specs/backend_302.json b/tests/fixtures/specs/backend_302.json
@@ -5,7 +5,7 @@
  },
  "out": {
  "status_code": 200,
- "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=302\"],\"User-Agent\":[\"KrakenD Version 2.1.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"302\"]}}",
+ "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=302\"],\"User-Agent\":[\"KrakenD Version 2.1.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"302\"]}}",
  "header": {
  "content-type": ["application/json; charset=utf-8"],
  "Cache-Control": ["public, max-age=3600"],

diff --git a/tests/fixtures/specs/backend_303.json b/tests/fixtures/specs/backend_303.json
@@ -5,7 +5,7 @@
  },
  "out": {
  "status_code": 200,
- "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=303\"],\"User-Agent\":[\"KrakenD Version 2.1.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"303\"]}}",
+ "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=303\"],\"User-Agent\":[\"KrakenD Version 2.1.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"303\"]}}",
  "header": {
  "content-type": ["application/json; charset=utf-8"],
  "Cache-Control": ["public, max-age=3600"],

diff --git a/tests/fixtures/specs/backend_307.json b/tests/fixtures/specs/backend_307.json
@@ -5,7 +5,7 @@
  },
  "out": {
  "status_code": 200,
- "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=307\"],\"User-Agent\":[\"KrakenD Version 2.1.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"307\"]}}",
+ "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=307\"],\"User-Agent\":[\"KrakenD Version 2.1.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"307\"]}}",
  "header": {
  "content-type": ["application/json; charset=utf-8"],
  "Cache-Control": ["public, max-age=3600"],

diff --git a/tests/fixtures/specs/cel-7.json b/tests/fixtures/specs/cel-7.json
@@ -12,7 +12,7 @@
  "foo":42,
  "headers":{
  "Accept-Encoding":["gzip"],
- "User-Agent":["KrakenD Version 2.1.2"],
+ "User-Agent":["KrakenD Version 2.1.3"],
  "X-Forwarded-Host":["localhost:8080"]
  },
  "path":"/param_forwarding/ok/1234567890qwertyuio/foobar",

diff --git a/tests/fixtures/specs/cors_5.json b/tests/fixtures/specs/cors_5.json
@@ -9,12 +9,12 @@
  },
  "out": {
  "status_code": 200,
- "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.1.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}",
+ "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.1.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}",
  "header": {
  "content-type": ["application/json; charset=utf-8"],
  "Cache-Control": ["public, max-age=3600"],
  "X-Krakend-Completed": ["true"],
- "X-Krakend": ["Version 2.1.2"],
+ "X-Krakend": ["Version 2.1.3"],
  "Vary": ["Origin"],
  "Access-Control-Allow-Origin": ["*"],
  "Access-Control-Expose-Headers": ["Content-Length"]

diff --git a/tests/fixtures/specs/detail_error.json b/tests/fixtures/specs/detail_error.json
@@ -13,7 +13,7 @@
  "foo": 42,
  "headers": {
  "Accept-Encoding": ["gzip"],
- "User-Agent": ["KrakenD Version 2.1.2"],
+ "User-Agent": ["KrakenD Version 2.1.3"],
  "X-Forwarded-Host": ["localhost:8080"]
  },
  "path": "/param_forwarding/",

diff --git a/tests/fixtures/specs/no-op_1.json b/tests/fixtures/specs/no-op_1.json
@@ -5,7 +5,7 @@
  },
  "out": {
  "status_code": 200,
- "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Content-Length\":[\"0\"],\"User-Agent\":[\"KrakenD Version 2.1.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{}}\n",
+ "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Content-Length\":[\"0\"],\"User-Agent\":[\"KrakenD Version 2.1.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{}}\n",
  "header": {
  "content-type": ["application/json"],
  "Cache-Control": [""],

diff --git a/tests/fixtures/specs/param_forwarding_1.json b/tests/fixtures/specs/param_forwarding_1.json
@@ -10,7 +10,7 @@
  },
  "out": {
  "status_code": 200,
- "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"User-Agent\":[\"KrakenD Version 2.1.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}",
+ "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"User-Agent\":[\"KrakenD Version 2.1.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}",
  "header": {
  "content-type": ["application/json; charset=utf-8"],
  "Cache-Control": ["public, max-age=3600"],

diff --git a/tests/fixtures/specs/param_forwarding_2.json b/tests/fixtures/specs/param_forwarding_2.json
@@ -10,7 +10,7 @@
  },
  "out": {
  "status_code": 200,
- "body": "{\"foo\":42,\"headers\":{\"A-B-C\":[\"ignore\"],\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"User-Agent\":[\"Go-http-client/1.1\"],\"X-Forwarded-Host\":[\"localhost:8080\"],\"X-Forwarded-Via\":[\"KrakenD Version 2.1.2\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}",
+ "body": "{\"foo\":42,\"headers\":{\"A-B-C\":[\"ignore\"],\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"User-Agent\":[\"Go-http-client/1.1\"],\"X-Forwarded-Host\":[\"localhost:8080\"],\"X-Forwarded-Via\":[\"KrakenD Version 2.1.3\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}",
  "header": {
  "content-type": ["application/json; charset=utf-8"],
  "Cache-Control": ["public, max-age=3600"],

diff --git a/tests/fixtures/specs/param_forwarding_3.json b/tests/fixtures/specs/param_forwarding_3.json
@@ -10,7 +10,7 @@
  },
  "out": {
  "status_code": 200,
- "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"User-Agent\":[\"KrakenD Version 2.1.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}",
+ "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"User-Agent\":[\"KrakenD Version 2.1.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}",
  "header": {
  "content-type": ["application/json; charset=utf-8"],
  "Cache-Control": ["public, max-age=3600"],

diff --git a/tests/fixtures/specs/param_forwarding_4.json b/tests/fixtures/specs/param_forwarding_4.json
@@ -17,7 +17,7 @@
  "headers":{
  "Accept-Encoding":["gzip"],
  "Authorization":["bearer 123456"],
- "User-Agent":["KrakenD Version 2.1.2"],
+ "User-Agent":["KrakenD Version 2.1.3"],
  "X-Forwarded-Host":["localhost:8080"],
  "X-Y-Z":["true"]
  },

diff --git a/tests/fixtures/specs/query_forwarding_1.json b/tests/fixtures/specs/query_forwarding_1.json
@@ -8,7 +8,7 @@
  },
  "out": {
  "status_code": 200,
- "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.1.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"],\"b\":[\"2\"]}}",
+ "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.1.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"],\"b\":[\"2\"]}}",
  "header": {
  "content-type": ["application/json; charset=utf-8"],
  "Cache-Control": ["public, max-age=3600"],

diff --git a/tests/fixtures/specs/query_forwarding_2.json b/tests/fixtures/specs/query_forwarding_2.json
@@ -5,7 +5,7 @@
  },
  "out": {
  "status_code": 200,
- "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.1.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"],\"b\":[\"2\",\"3\"]}}",
+ "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.1.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"],\"b\":[\"2\",\"3\"]}}",
  "header": {
  "content-type": ["application/json; charset=utf-8"],
  "Cache-Control": ["public, max-age=3600"],

diff --git a/tests/fixtures/specs/query_forwarding_3.json b/tests/fixtures/specs/query_forwarding_3.json
@@ -5,7 +5,7 @@
  },
  "out": {
  "status_code": 200,
- "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.1.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"]}}",
+ "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.1.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"]}}",
  "header": {
  "content-type": ["application/json; charset=utf-8"],
  "Cache-Control": ["public, max-age=3600"],

diff --git a/tests/fixtures/specs/sequential_1.json b/tests/fixtures/specs/sequential_1.json
@@ -5,7 +5,7 @@
  },
  "out": {
  "status_code": 200,
- "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.1.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/42\",\"query\":{}}",
+ "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.1.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/42\",\"query\":{}}",
  "header": {
  "content-type": ["application/json; charset=utf-8"],
  "Cache-Control": ["public, max-age=3600"],

diff --git a/tests/fixtures/specs/timeout.json b/tests/fixtures/specs/timeout.json
@@ -5,7 +5,7 @@
  },
  "out": {
  "status_code": 200,
- "body": "{\"first\":{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.1.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/123\",\"query\":{}}}",
+ "body": "{\"first\":{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.1.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/123\",\"query\":{}}}",
  "header": {
  "content-type": ["application/json; charset=utf-8"],
  "Cache-Control": [""],

diff --git a/tests/fixtures/specs/xml_2.json b/tests/fixtures/specs/xml_2.json
@@ -5,7 +5,7 @@
  },
  "out": {
  "status_code": 200,
- "body": "<doc><foo>42</foo><headers><Accept-Encoding>gzip</Accept-Encoding><Referer>http://127.0.0.1:8081/param_forwarding</Referer><User-Agent>KrakenD Version 2.1.2</User-Agent><X-Forwarded-Host>localhost:8080</X-Forwarded-Host></headers><path>/param_forwarding/</path><query/></doc>",
+ "body": "<doc><foo>42</foo><headers><Accept-Encoding>gzip</Accept-Encoding><Referer>http://127.0.0.1:8081/param_forwarding</Referer><User-Agent>KrakenD Version 2.1.3</User-Agent><X-Forwarded-Host>localhost:8080</X-Forwarded-Host></headers><path>/param_forwarding/</path><query/></doc>",
  "header": {
  "content-type": ["application/xml"],
  "Cache-Control": ["public, max-age=3600"],