diff --git a/Makefile b/Makefile index 553d1175..eef6793d 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ BIN_NAME :=krakend OS := $(shell uname | tr '[:upper:]' '[:lower:]') -VERSION := 1.1.0 +VERSION := 1.1.1 PKGNAME := krakend LICENSE := Apache 2.0 VENDOR= diff --git a/go.mod b/go.mod index 29c3b366..ac00c908 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/dancannon/gorethink v4.0.0+incompatible // indirect github.com/denisenkom/go-mssqldb v0.0.0-20190121005146-b04fd42d9952 // indirect github.com/devopsfaith/bloomfilter v0.0.0-20190317200532-4687d0b9aa2a - github.com/devopsfaith/krakend v1.1.0 + github.com/devopsfaith/krakend v1.1.1 github.com/devopsfaith/krakend-amqp v1.1.0 github.com/devopsfaith/krakend-botdetector v0.0.0-20190711145323-c5fcb969addb github.com/devopsfaith/krakend-cel v0.0.0-20190502130550-d6872fd4f97e diff --git a/go.sum b/go.sum index 3db26d81..4921586c 100644 --- a/go.sum +++ b/go.sum @@ -199,6 +199,8 @@ github.com/devopsfaith/krakend v0.0.0-20190921111907-6ff3a6860ce0/go.mod h1:k7Xn github.com/devopsfaith/krakend v0.0.0-20190930092458-9e6fc3784eca/go.mod h1:k7XnDvnLPfAMLy8kykUydoViIg5LeCqRNCV5UK8DVdY= github.com/devopsfaith/krakend v1.1.0 h1:zBPKjf9LNS1BXO/sv6dacfHmDa5PrMiD68YTYfgOOjM= github.com/devopsfaith/krakend v1.1.0/go.mod h1:xM0O7nJcXuJWWL0PollS0NFBQLf1KJgA1BI2XAPgdmo= +github.com/devopsfaith/krakend v1.1.1 h1:nG624R4OOg2YEN1dDGZJ+dosk3GkPz2qBLLJhhJTtX4= +github.com/devopsfaith/krakend v1.1.1/go.mod h1:xM0O7nJcXuJWWL0PollS0NFBQLf1KJgA1BI2XAPgdmo= github.com/devopsfaith/krakend-amqp v0.0.0-20190315181526-5f14dc177694 h1:Tk+S9zvltFAq8x15F2xAyt/wwed0okbSTaPYRguKfzA= github.com/devopsfaith/krakend-amqp v0.0.0-20190315181526-5f14dc177694/go.mod h1:/c/BrN6w3Lqip/3WRcYprolGvfT+gLgSzdDrT9d2LUc= github.com/devopsfaith/krakend-amqp v1.1.0 h1:mWTfMUrRq6zj4w+N70HL/f5xhgclc95JbQHrg7whBGA= diff --git a/tests/fixtures/specs/backend_301.json b/tests/fixtures/specs/backend_301.json index 9aa546a6..4bbbd9cc 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 1.1.0\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"301\"]}}\n", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=301\"],\"User-Agent\":[\"KrakenD Version 1.1.1\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"301\"]}}\n", "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 f0045f84..9d2f19a9 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 1.1.0\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"302\"]}}\n", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=302\"],\"User-Agent\":[\"KrakenD Version 1.1.1\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"302\"]}}\n", "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 55f9ff52..c7feba77 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 1.1.0\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"303\"]}}\n", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=303\"],\"User-Agent\":[\"KrakenD Version 1.1.1\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"303\"]}}\n", "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 be4bcd1c..c7c0c214 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 1.1.0\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"307\"]}}\n", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=307\"],\"User-Agent\":[\"KrakenD Version 1.1.1\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"307\"]}}\n", "header": { "content-type": ["application/json; charset=utf-8"], "Cache-Control": ["public, max-age=3600"], diff --git a/tests/fixtures/specs/detail_error.json b/tests/fixtures/specs/detail_error.json index d2b04d78..d00a592a 100644 --- a/tests/fixtures/specs/detail_error.json +++ b/tests/fixtures/specs/detail_error.json @@ -5,7 +5,7 @@ }, "out": { "status_code": 200, - "body": "{\"error_backend_b\":{\"http_status_code\":404,\"http_body\":\"404 page not found\\n\"},\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 1.1.0\"]},\"path\":\"/param_forwarding/\",\"query\":{}}\n", + "body": "{\"error_backend_b\":{\"http_status_code\":404,\"http_body\":\"404 page not found\\n\"},\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 1.1.1\"]},\"path\":\"/param_forwarding/\",\"query\":{}}\n", "header": { "content-type": ["application/json; charset=utf-8"], "Cache-Control": [""], diff --git a/tests/fixtures/specs/no-op.json b/tests/fixtures/specs/no-op.json index 7a85788d..feffaa37 100644 --- a/tests/fixtures/specs/no-op.json +++ b/tests/fixtures/specs/no-op.json @@ -5,7 +5,7 @@ }, "out": { "status_code": 200, - "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Content-Length\":[\"0\"],\"User-Agent\":[\"KrakenD Version 1.1.0\"]},\"path\":\"/param_forwarding/\",\"query\":{}}\n", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Content-Length\":[\"0\"],\"User-Agent\":[\"KrakenD Version 1.1.1\"]},\"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 8ddf3740..44fb4eb6 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 1.1.0\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}\n", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"User-Agent\":[\"KrakenD Version 1.1.1\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}\n", "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 ef0ba274..45919be4 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-Via\":[\"KrakenD Version 1.1.0\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}\n", + "body": "{\"foo\":42,\"headers\":{\"A-B-C\":[\"ignore\"],\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"User-Agent\":[\"Go-http-client/1.1\"],\"X-Forwarded-Via\":[\"KrakenD Version 1.1.1\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}\n", "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 e71ab331..4b074028 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 1.1.0\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}\n", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"User-Agent\":[\"KrakenD Version 1.1.1\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}\n", "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 de4b1253..54a3c6bc 100644 --- a/tests/fixtures/specs/param_forwarding_4.json +++ b/tests/fixtures/specs/param_forwarding_4.json @@ -10,7 +10,7 @@ }, "out": { "status_code": 200, - "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"Content-Length\":[\"0\"],\"User-Agent\":[\"KrakenD Version 1.1.0\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}\n", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"Content-Length\":[\"0\"],\"User-Agent\":[\"KrakenD Version 1.1.1\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}\n", "header": { "content-type": ["application/json; charset=utf-8"], "Cache-Control": ["public, max-age=3600"], diff --git a/tests/fixtures/specs/query_forwarding_1.json b/tests/fixtures/specs/query_forwarding_1.json index e8fcdaa3..1304bebf 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 1.1.0\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"],\"b\":[\"2\"]}}\n", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 1.1.1\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"],\"b\":[\"2\"]}}\n", "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 617e53c9..4de5c00d 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 1.1.0\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"],\"b\":[\"2\",\"3\"]}}\n", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 1.1.1\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"],\"b\":[\"2\",\"3\"]}}\n", "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 8884ffad..8f943b9f 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 1.1.0\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"]}}\n", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 1.1.1\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"]}}\n", "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 170165bb..11a1ac6e 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 1.1.0\"]},\"path\":\"/param_forwarding/42\",\"query\":{}}\n", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 1.1.1\"]},\"path\":\"/param_forwarding/42\",\"query\":{}}\n", "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 54a9c2b2..7828f373 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 1.1.0\"]},\"path\":\"/param_forwarding/123\",\"query\":{}}}\n", + "body": "{\"first\":{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 1.1.1\"]},\"path\":\"/param_forwarding/123\",\"query\":{}}}\n", "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 f6e3c8a4..71410a64 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 1.1.0/param_forwarding/", + "body": "42gziphttp://127.0.0.1:8081/param_forwardingKrakenD Version 1.1.1/param_forwarding/", "header": { "content-type": ["application/xml"], "Cache-Control": ["public, max-age=3600"],