diff --git a/Makefile b/Makefile index 14e800ac..0f0eafa3 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ BIN_NAME :=krakend OS := $(shell uname | tr '[:upper:]' '[:lower:]') -VERSION := 2.2.1 +VERSION := 2.3.0 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 DOCKER_WDIR := /tmp/fpm DOCKER_FPM := devopsfaith/fpm -GOLANG_VERSION := 1.20.1 +GOLANG_VERSION := 1.20.3 GLIBC_VERSION := $(shell sh find_glibc.sh) ALPINE_VERSION := 3.17 OS_TAG := diff --git a/tests/fixtures/specs/backend_301.json b/tests/fixtures/specs/backend_301.json index 301ce449..52397e5b 100644 --- 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.2.1\"],\"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.3.0\"],\"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 index 73024cc1..8b94e41e 100644 --- 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.2.1\"],\"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.3.0\"],\"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 index 2ad70ccb..dcfec609 100644 --- 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.2.1\"],\"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.3.0\"],\"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 index 5a41efd4..de60ae43 100644 --- 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.2.1\"],\"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.3.0\"],\"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 index 3dea99eb..e8ffc9da 100644 --- 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.2.1"], + "User-Agent":["KrakenD Version 2.3.0"], "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 index 07a7502a..4df76ce9 100644 --- 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.2.1\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.3.0\"],\"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.2.1"], + "X-Krakend": ["Version 2.3.0"], "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 index e7942c24..1da96a02 100644 --- 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.2.1"], + "User-Agent": ["KrakenD Version 2.3.0"], "X-Forwarded-Host": ["localhost:8080"] }, "path": "/param_forwarding/", diff --git a/tests/fixtures/specs/negotitate_plain.json b/tests/fixtures/specs/negotitate_plain.json index 7e7fc17a..60f15a5f 100644 --- a/tests/fixtures/specs/negotitate_plain.json +++ b/tests/fixtures/specs/negotitate_plain.json @@ -8,7 +8,7 @@ }, "out": { "status_code": 200, - "body": "user:\n -type: admin\n name: Elliot\n social:\n facebook: https://facebook.com\n twitter: https://twitter.com\n youtube: https://youtube.com\n", + "body": "user:\n -type: admin\n name: Elliot\n social:\n facebook: https://facebook.com\n twitter: https://twitter.com\n youtube: https://youtube.com\n", "header": { "content-type": ["application/x-yaml; charset=utf-8"], "Cache-Control": ["public, max-age=3600"], diff --git a/tests/fixtures/specs/no-op_1.json b/tests/fixtures/specs/no-op_1.json index cd60194c..544f1e1d 100644 --- 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.2.1\"],\"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.3.0\"],\"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 index 55024890..59694e5d 100644 --- 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.2.1\"],\"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.3.0\"],\"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 index 19151794..5916dc9a 100644 --- 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.2.1\"],\"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.3.0\"],\"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 index 779e1c3f..4b6e51ec 100644 --- 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.2.1\"],\"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.3.0\"],\"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 index a848b1e6..308de420 100644 --- 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.2.1"], + "User-Agent":["KrakenD Version 2.3.0"], "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 index a2e6ce6d..b3854baf 100644 --- 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.2.1\"],\"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.3.0\"],\"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 index 613a1828..01fb4aff 100644 --- 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.2.1\"],\"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.3.0\"],\"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 index a622d651..00150b8d 100644 --- 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.2.1\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"]}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.3.0\"],\"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 index 33f3c785..ce8f5a35 100644 --- 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.2.1\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/42\",\"query\":{}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.3.0\"],\"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 index f24e09b6..293fdd35 100644 --- 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.2.1\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/123\",\"query\":{}}}", + "body": "{\"first\":{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.3.0\"],\"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 index 498425b6..2f2db297 100644 --- a/tests/fixtures/specs/xml_2.json +++ b/tests/fixtures/specs/xml_2.json @@ -5,7 +5,7 @@ }, "out": { "status_code": 200, - "body": "42gziphttp://127.0.0.1:8081/param_forwardingKrakenD Version 2.2.1localhost:8080/param_forwarding/", + "body": "42gziphttp://127.0.0.1:8081/param_forwardingKrakenD Version 2.3.0localhost:8080/param_forwarding/", "header": { "content-type": ["application/xml"], "Cache-Control": ["public, max-age=3600"],