Skip to content

Commit

Permalink
Merge pull request #764 from krakendio/dev-2.4.3
Browse files Browse the repository at this point in the history
Dev 2.4.3
  • Loading branch information
kpacha authored Jul 27, 2023
2 parents 4665f3a + 632d051 commit ad15eb3
Show file tree
Hide file tree
Showing 20 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Dockerfile-builder-linux
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG GOLANG_VERSION
FROM golang:${GOLANG_VERSION}
FROM golang:${GOLANG_VERSION}-bullseye

RUN apt-get update && \
apt-get install -y gcc make gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

BIN_NAME :=krakend
OS := $(shell uname | tr '[:upper:]' '[:lower:]')
VERSION := 2.4.2
VERSION := 2.4.3
SCHEMA_VERSION := $(shell echo "${VERSION}" | cut -d '.' -f 1,2)
GIT_COMMIT := $(shell git rev-parse --short=7 HEAD)
PKGNAME := krakend
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/specs/backend_301.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.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.4.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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/specs/backend_302.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.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.4.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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/specs/backend_303.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.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.4.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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/specs/backend_307.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.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.4.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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/specs/cel-7.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"foo":42,
"headers":{
"Accept-Encoding":["gzip"],
"User-Agent":["KrakenD Version 2.4.2"],
"User-Agent":["KrakenD Version 2.4.3"],
"X-Forwarded-Host":["localhost:8080"]
},
"path":"/param_forwarding/ok/1234567890qwertyuio/foobar",
Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/specs/cors_5.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
},
"out": {
"status_code": 200,
"body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.4.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.4.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.4.2"],
"X-Krakend": ["Version 2.4.3"],
"Vary": ["Origin"],
"Access-Control-Allow-Origin": ["*"],
"Access-Control-Expose-Headers": ["Content-Length"]
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/specs/detail_error.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"foo": 42,
"headers": {
"Accept-Encoding": ["gzip"],
"User-Agent": ["KrakenD Version 2.4.2"],
"User-Agent": ["KrakenD Version 2.4.3"],
"X-Forwarded-Host": ["localhost:8080"]
},
"path": "/param_forwarding/",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/specs/no-op_1.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"out": {
"status_code": 200,
"body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Content-Length\":[\"0\"],\"User-Agent\":[\"KrakenD Version 2.4.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.4.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{}}\n",
"header": {
"content-type": ["application/json"],
"Cache-Control": [""],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/specs/param_forwarding_1.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"out": {
"status_code": 200,
"body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"User-Agent\":[\"KrakenD Version 2.4.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.4.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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/specs/param_forwarding_2.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.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.4.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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/specs/param_forwarding_3.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"out": {
"status_code": 200,
"body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"User-Agent\":[\"KrakenD Version 2.4.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.4.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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/specs/param_forwarding_4.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"headers":{
"Accept-Encoding":["gzip"],
"Authorization":["bearer 123456"],
"User-Agent":["KrakenD Version 2.4.2"],
"User-Agent":["KrakenD Version 2.4.3"],
"X-Forwarded-Host":["localhost:8080"],
"X-Y-Z":["true"]
},
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/specs/query_forwarding_1.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"out": {
"status_code": 200,
"body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.4.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.4.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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/specs/query_forwarding_2.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"out": {
"status_code": 200,
"body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.4.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.4.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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/specs/query_forwarding_3.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"out": {
"status_code": 200,
"body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.4.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.4.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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/specs/sequential_1.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"out": {
"status_code": 200,
"body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.4.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/42\",\"query\":{}}",
"body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.4.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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/specs/timeout.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"out": {
"status_code": 200,
"body": "{\"first\":{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.4.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/123\",\"query\":{}}}",
"body": "{\"first\":{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.4.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/123\",\"query\":{}}}",
"header": {
"content-type": ["application/json; charset=utf-8"],
"Cache-Control": [""],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/specs/xml_2.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.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.4.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"],
Expand Down

0 comments on commit ad15eb3

Please sign in to comment.