From ccd239c940c035ab3c70dfe21f0bd953cc5263dd Mon Sep 17 00:00:00 2001 From: kpacha Date: Wed, 3 Apr 2019 14:52:06 +0200 Subject: [PATCH 01/12] krakend upgraded to 0.9.0 --- Gopkg.lock | 7 +++---- Gopkg.toml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index e6879577..6d0ec701 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -186,8 +186,7 @@ revision = "46b83f115c746a2b24642a54a3bd4ae594172d3e" [[projects]] - branch = "master" - digest = "1:37fd271430ca67e13c42db3394547c268713ff87da6f2a3281e22912bb0d0603" + digest = "1:46e33223aaeed161865d6329a408c5c2e4e836e44a282089bccfbcaf7cbdef79" name = "github.com/devopsfaith/krakend" packages = [ "config", @@ -206,7 +205,8 @@ "transport/http/server", ] pruneopts = "" - revision = "9220724f382ad02af53b5627a9a3c4b323fa230b" + revision = "3d1455d44d39584429282f364ca0720f68b78525" + version = "0.9.0" [[projects]] branch = "master" @@ -1269,7 +1269,6 @@ analyzer-name = "dep" analyzer-version = 1 input-imports = [ - "github.com/clbanning/mxj", "github.com/devopsfaith/bloomfilter/krakend", "github.com/devopsfaith/krakend-cel", "github.com/devopsfaith/krakend-circuitbreaker/gobreaker/proxy", diff --git a/Gopkg.toml b/Gopkg.toml index fa4be713..d5c5ae5a 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -16,7 +16,7 @@ version = "3.3.12" [[override]] - branch = "master" + version = "0.9.0" name = "github.com/devopsfaith/krakend" [[override]] From 672dcc1d0273d26a561e60f435fedffb9c7f39f0 Mon Sep 17 00:00:00 2001 From: kpacha Date: Wed, 3 Apr 2019 15:12:08 +0200 Subject: [PATCH 02/12] krakend components updated --- Gopkg.lock | 30 +++++++++++++++--------------- Gopkg.toml | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 6d0ec701..bfcb1628 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -179,11 +179,11 @@ [[projects]] branch = "master" - digest = "1:e1c847baa7c0bbecc452f2321c4ddb2cfb2c48a38ac726d2a5eb954c1d0d4297" + digest = "1:eaf17b84fcf35436fcde8935f72589c6a3705d13532370687c8502315c1b643d" name = "github.com/devopsfaith/flatmap" packages = ["tree"] pruneopts = "" - revision = "46b83f115c746a2b24642a54a3bd4ae594172d3e" + revision = "8d71d61e07ac04dcb1661ae30e22893a66439981" [[projects]] digest = "1:46e33223aaeed161865d6329a408c5c2e4e836e44a282089bccfbcaf7cbdef79" @@ -231,20 +231,20 @@ revision = "673caf8e355a808f10f27dc76fb6abf1a5079a41" [[projects]] - branch = "master" - digest = "1:94ddaa594e4395b22e67a220933e260663dff57e7fb55d88643cd36d16ae1d69" + digest = "1:5d525e158a2fa5f7058eb5f6b44beddb869641a353cf09bf799e39eb80672f88" name = "github.com/devopsfaith/krakend-cobra" packages = ["."] pruneopts = "" - revision = "38d113ba86e99af08dbf4b1e9e510f522fc5d56e" + revision = "3f056666a23e2a9707bc72a86a748392730ec6b6" + version = "0.9.0" [[projects]] branch = "master" - digest = "1:277d2dc17bb667ec0de7651938125bec5c4ebd1079e0de8143a733327547835e" + digest = "1:95590893db00360367156745b87b10079f4f60fb68d0ac362aa861ae9d72e111" name = "github.com/devopsfaith/krakend-consul" packages = ["."] pruneopts = "" - revision = "2da968420b5dc2560af3a137489a38230d8117e0" + revision = "7623a4da32a11026b8e6a6d8092049d57708eae6" [[projects]] digest = "1:fc61e61898c78455700e0bf3d6e86478073254488c3391f0716ad37a2144a5a6" @@ -267,11 +267,11 @@ [[projects]] branch = "master" - digest = "1:5300adfe557c762cfd230b914970c3b76d05914cbd0a3cb6398aeb2143f7ba21" + digest = "1:858cee200bd94dd3cdb3afc06ad09ab71ca37198f906cbe9a2fd0ccdcbcc5e8d" name = "github.com/devopsfaith/krakend-flexibleconfig" packages = ["."] pruneopts = "" - revision = "73b987ab20487385218e02964eede4c4fa26a204" + revision = "23f2ca20e5db2f92d39d5dc539d64529b40907a0" [[projects]] branch = "master" @@ -321,11 +321,11 @@ [[projects]] branch = "master" - digest = "1:d97fd5fc1b4e2db5edfd5ccf202e085d7a75229c12ff0f21a60c6a71be61b2e6" + digest = "1:f415d5187117a470bef2174e1d31e0602a8bb7d77195a435254fa4168b6bd3a5" name = "github.com/devopsfaith/krakend-jsonschema" packages = ["."] pruneopts = "" - revision = "895abb7764a92f5ad265184b54f926889f74d7f8" + revision = "5705a5015d7ab77614b408b39024a97ed997badc" [[projects]] branch = "master" @@ -407,22 +407,22 @@ [[projects]] branch = "master" - digest = "1:aaa5ac483bf864d91545b0e79655a504bd24cf6f294a9a1a31c9e8e46cfa2a59" + digest = "1:98772bc7bd74a25894b96167122ac52c433e2c5ba83b6c2e6c98c20330ec514b" name = "github.com/devopsfaith/krakend-usage" packages = [ ".", "client", ] pruneopts = "" - revision = "9ac996de433fb194bcdb7a55359960e2f2d2517a" + revision = "476779c0a36c241aaa50bd22a4e3bf54705b78b7" [[projects]] branch = "master" - digest = "1:a50f898ee62c6473005cdc2e00753debe069b94bb4bbf143447754fa90a01cd9" + digest = "1:4810d92e2fbdfc3693f2d47d7d5bccddb904c44999db369e25c43a1052232874" name = "github.com/devopsfaith/krakend-viper" packages = ["."] pruneopts = "" - revision = "3abc4134a773578643b46aa11431f72cc6d41e8a" + revision = "67993681c36c160991b404094fc1d615796a75ea" [[projects]] digest = "1:01f84c46e656f5cd11bebcd357b40af62a42e000125d3a70121182a022f867d0" diff --git a/Gopkg.toml b/Gopkg.toml index d5c5ae5a..d23b64cf 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -60,7 +60,7 @@ name = "github.com/devopsfaith/krakend-circuitbreaker" [[constraint]] - branch = "master" + version = "0.9.0" name = "github.com/devopsfaith/krakend-cobra" [[constraint]] From 784cb9a17cf3f94ab3820353e28f0cc4fc5277cf Mon Sep 17 00:00:00 2001 From: kpacha Date: Wed, 3 Apr 2019 15:17:10 +0200 Subject: [PATCH 03/12] version 0.9.0 bumped --- Makefile | 2 +- tests/fixtures/specs/backend_301.json | 2 +- tests/fixtures/specs/backend_302.json | 2 +- tests/fixtures/specs/backend_303.json | 2 +- tests/fixtures/specs/backend_307.json | 2 +- tests/fixtures/specs/backend_404.json | 2 +- tests/fixtures/specs/cel-1.json | 2 +- tests/fixtures/specs/cel-2.json | 2 +- tests/fixtures/specs/cel-3.json | 2 +- tests/fixtures/specs/cel-4.json | 2 +- tests/fixtures/specs/cel-5.json | 2 +- tests/fixtures/specs/cel-6.json | 2 +- tests/fixtures/specs/cel-7.json | 2 +- tests/fixtures/specs/collection.json | 2 +- tests/fixtures/specs/detail_error.json | 2 +- tests/fixtures/specs/flatmap_1.json | 2 +- tests/fixtures/specs/jwt_1.json | 2 +- tests/fixtures/specs/jwt_2.json | 2 +- tests/fixtures/specs/jwt_3.json | 2 +- tests/fixtures/specs/jwt_4.json | 2 +- tests/fixtures/specs/negotitate_json.json | 2 +- tests/fixtures/specs/negotitate_plain.json | 2 +- tests/fixtures/specs/no-op.json | 2 +- tests/fixtures/specs/param_forwarding_1.json | 2 +- tests/fixtures/specs/param_forwarding_2.json | 2 +- tests/fixtures/specs/param_forwarding_3.json | 2 +- tests/fixtures/specs/query_forwarding_1.json | 2 +- tests/fixtures/specs/query_forwarding_2.json | 2 +- tests/fixtures/specs/query_forwarding_3.json | 2 +- tests/fixtures/specs/router_401_1.json | 2 +- tests/fixtures/specs/router_404.json | 2 +- tests/fixtures/specs/router_405.json | 2 +- tests/fixtures/specs/rss.json | 2 +- tests/fixtures/specs/sequential_1.json | 2 +- tests/fixtures/specs/sequential_2.json | 2 +- tests/fixtures/specs/static.json | 2 +- tests/fixtures/specs/timeout.json | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Makefile b/Makefile index f3fd2007..e4e5ea55 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ BIN_NAME :=krakend DEP_VERSION=0.5.0 OS := $(shell uname | tr '[:upper:]' '[:lower:]') -VERSION := 0.8.0 +VERSION := 0.9.0 PKGNAME := krakend LICENSE := Apache 2.0 VENDOR= diff --git a/tests/fixtures/specs/backend_301.json b/tests/fixtures/specs/backend_301.json index 5111b228..81a1fdaa 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 0.8.0\"]},\"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 0.9.0\"]},\"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 dfced4f9..bafc0fae 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 0.8.0\"]},\"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 0.9.0\"]},\"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 b7d99a31..b4f9aeb1 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 0.8.0\"]},\"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 0.9.0\"]},\"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 7b6879db..387477fd 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 0.8.0\"]},\"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 0.9.0\"]},\"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/backend_404.json b/tests/fixtures/specs/backend_404.json index 72bf9f68..92d1bcc0 100644 --- a/tests/fixtures/specs/backend_404.json +++ b/tests/fixtures/specs/backend_404.json @@ -12,4 +12,4 @@ "X-Krakend-Completed": "false" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/cel-1.json b/tests/fixtures/specs/cel-1.json index 93ad6e10..0d62e0c6 100644 --- a/tests/fixtures/specs/cel-1.json +++ b/tests/fixtures/specs/cel-1.json @@ -14,4 +14,4 @@ "Cache-Control": "" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/cel-2.json b/tests/fixtures/specs/cel-2.json index 8660e461..4ce46048 100644 --- a/tests/fixtures/specs/cel-2.json +++ b/tests/fixtures/specs/cel-2.json @@ -12,4 +12,4 @@ "X-Krakend-Completed": "" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/cel-3.json b/tests/fixtures/specs/cel-3.json index 3313fa5b..e632cfa2 100644 --- a/tests/fixtures/specs/cel-3.json +++ b/tests/fixtures/specs/cel-3.json @@ -15,4 +15,4 @@ "Cache-Control": "" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/cel-4.json b/tests/fixtures/specs/cel-4.json index f6a0b243..abebb404 100644 --- a/tests/fixtures/specs/cel-4.json +++ b/tests/fixtures/specs/cel-4.json @@ -15,4 +15,4 @@ "Cache-Control": "" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/cel-5.json b/tests/fixtures/specs/cel-5.json index 004b7ce7..04cbcce8 100644 --- a/tests/fixtures/specs/cel-5.json +++ b/tests/fixtures/specs/cel-5.json @@ -15,4 +15,4 @@ "X-Krakend-Completed": "true" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/cel-6.json b/tests/fixtures/specs/cel-6.json index dbbc275b..6a150884 100644 --- a/tests/fixtures/specs/cel-6.json +++ b/tests/fixtures/specs/cel-6.json @@ -14,4 +14,4 @@ "Cache-Control": "" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/cel-7.json b/tests/fixtures/specs/cel-7.json index e16b0951..25715704 100644 --- a/tests/fixtures/specs/cel-7.json +++ b/tests/fixtures/specs/cel-7.json @@ -15,4 +15,4 @@ "X-Krakend-Completed": "true" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/collection.json b/tests/fixtures/specs/collection.json index 9c15bb2d..c007e6b0 100644 --- a/tests/fixtures/specs/collection.json +++ b/tests/fixtures/specs/collection.json @@ -12,4 +12,4 @@ "X-Krakend-Completed": "true" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/detail_error.json b/tests/fixtures/specs/detail_error.json index be5e3815..3cd5c3f4 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 0.8.0\"]},\"path\":\"/param_forwarding/\",\"query\":{}}", + "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 0.9.0\"]},\"path\":\"/param_forwarding/\",\"query\":{}}", "header": { "content-type": "application/json; charset=utf-8", "Cache-Control": "", diff --git a/tests/fixtures/specs/flatmap_1.json b/tests/fixtures/specs/flatmap_1.json index 84cade74..e75809c1 100644 --- a/tests/fixtures/specs/flatmap_1.json +++ b/tests/fixtures/specs/flatmap_1.json @@ -12,4 +12,4 @@ "X-Krakend-Completed": "true" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/jwt_1.json b/tests/fixtures/specs/jwt_1.json index af8de2da..54e2b5b2 100644 --- a/tests/fixtures/specs/jwt_1.json +++ b/tests/fixtures/specs/jwt_1.json @@ -15,4 +15,4 @@ "X-Krakend-Completed": "" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/jwt_2.json b/tests/fixtures/specs/jwt_2.json index c4529ec5..2c4f147b 100644 --- a/tests/fixtures/specs/jwt_2.json +++ b/tests/fixtures/specs/jwt_2.json @@ -15,4 +15,4 @@ "X-Krakend-Completed": "" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/jwt_3.json b/tests/fixtures/specs/jwt_3.json index 0d4af2f7..0eb3c2f4 100644 --- a/tests/fixtures/specs/jwt_3.json +++ b/tests/fixtures/specs/jwt_3.json @@ -15,4 +15,4 @@ "X-Krakend-Completed": "true" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/jwt_4.json b/tests/fixtures/specs/jwt_4.json index 87e8bf75..fe9db562 100644 --- a/tests/fixtures/specs/jwt_4.json +++ b/tests/fixtures/specs/jwt_4.json @@ -12,4 +12,4 @@ "X-Krakend-Completed": "" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/negotitate_json.json b/tests/fixtures/specs/negotitate_json.json index 5e4c3f95..d9d7cf72 100644 --- a/tests/fixtures/specs/negotitate_json.json +++ b/tests/fixtures/specs/negotitate_json.json @@ -15,4 +15,4 @@ "X-Krakend-Completed": "true" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/negotitate_plain.json b/tests/fixtures/specs/negotitate_plain.json index 4c86ad1d..67aef670 100644 --- a/tests/fixtures/specs/negotitate_plain.json +++ b/tests/fixtures/specs/negotitate_plain.json @@ -15,4 +15,4 @@ "X-Krakend-Completed": "true" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/no-op.json b/tests/fixtures/specs/no-op.json index ce658001..d2015346 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 0.8.0\"]},\"path\":\"/param_forwarding/\",\"query\":{}}\n", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Content-Length\":[\"0\"],\"User-Agent\":[\"KrakenD Version 0.9.0\"]},\"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 58ce1dc6..2089cd27 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 0.8.0\"],\"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 0.9.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_2.json b/tests/fixtures/specs/param_forwarding_2.json index 0872c079..c04302e2 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\":[\"KrakenD Version 0.8.0\"],\"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\":[\"KrakenD Version 0.9.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 935b65a6..c27c73e2 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 0.8.0\"],\"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 0.9.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/query_forwarding_1.json b/tests/fixtures/specs/query_forwarding_1.json index 6a6c7a8f..14d0f471 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 0.8.0\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"],\"b\":[\"2\"]}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 0.9.0\"]},\"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 2f232234..2f71d6e8 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 0.8.0\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"],\"b\":[\"2\",\"3\"]}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 0.9.0\"]},\"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 3bae5cb8..968bbe47 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 0.8.0\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"]}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 0.9.0\"]},\"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/router_401_1.json b/tests/fixtures/specs/router_401_1.json index 6fd6e42d..dc5e864e 100644 --- a/tests/fixtures/specs/router_401_1.json +++ b/tests/fixtures/specs/router_401_1.json @@ -12,4 +12,4 @@ "X-Krakend-Completed": "" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/router_404.json b/tests/fixtures/specs/router_404.json index 22ebed9d..4cc82659 100644 --- a/tests/fixtures/specs/router_404.json +++ b/tests/fixtures/specs/router_404.json @@ -12,4 +12,4 @@ "X-Krakend-Completed": "false" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/router_405.json b/tests/fixtures/specs/router_405.json index 27ea6aaf..9f803598 100644 --- a/tests/fixtures/specs/router_405.json +++ b/tests/fixtures/specs/router_405.json @@ -12,4 +12,4 @@ "X-Krakend-Completed": "" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/rss.json b/tests/fixtures/specs/rss.json index 512ac132..b7a11903 100644 --- a/tests/fixtures/specs/rss.json +++ b/tests/fixtures/specs/rss.json @@ -12,4 +12,4 @@ "X-Krakend-Completed": "true" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/sequential_1.json b/tests/fixtures/specs/sequential_1.json index d0309a79..e4a69c33 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 0.8.0\"]},\"path\":\"/param_forwarding/42\",\"query\":{}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 0.9.0\"]},\"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/sequential_2.json b/tests/fixtures/specs/sequential_2.json index 46b10a08..b0af58bf 100644 --- a/tests/fixtures/specs/sequential_2.json +++ b/tests/fixtures/specs/sequential_2.json @@ -12,4 +12,4 @@ "X-Krakend-Completed": "false" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/static.json b/tests/fixtures/specs/static.json index 9cd2bf2e..2f5d5f59 100644 --- a/tests/fixtures/specs/static.json +++ b/tests/fixtures/specs/static.json @@ -12,4 +12,4 @@ "X-Krakend-Completed": "true" } } -} \ No newline at end of file +} diff --git a/tests/fixtures/specs/timeout.json b/tests/fixtures/specs/timeout.json index b04b994d..47aaff3c 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 0.8.0\"]},\"path\":\"/param_forwarding/123\",\"query\":{}}}", + "body": "{\"first\":{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 0.9.0\"]},\"path\":\"/param_forwarding/123\",\"query\":{}}}", "header": { "content-type": "application/json; charset=utf-8", "Cache-Control": "", From 628440d24c40b67293650e641fe3f1f6d0ed442b Mon Sep 17 00:00:00 2001 From: kpacha Date: Wed, 3 Apr 2019 15:46:57 +0200 Subject: [PATCH 04/12] amqp module added --- Gopkg.lock | 20 ++++++++++++++++++++ Gopkg.toml | 4 ++++ backend_factory.go | 9 ++++++++- executor.go | 2 +- 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index bfcb1628..5b0c360b 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -208,6 +208,14 @@ revision = "3d1455d44d39584429282f364ca0720f68b78525" version = "0.9.0" +[[projects]] + branch = "master" + digest = "1:1af37481e59dc90681ed6ca751067fe596a92a7b5fed7fcabd9d17a22d4f3d49" + name = "github.com/devopsfaith/krakend-amqp" + packages = ["."] + pruneopts = "" + revision = "5f14dc177694b928d133f79475692b4b14442651" + [[projects]] branch = "master" digest = "1:f72487139b7433059c268ec65e4863320af887db0df5798f10626753238831da" @@ -890,6 +898,17 @@ revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7" version = "v1.0.0" +[[projects]] + branch = "master" + digest = "1:7cfabfbca44cd91fef8dd89119c5dfdcdc0466c26d5b7c5ad35e965e01fca1c4" + name = "github.com/streadway/amqp" + packages = [ + ".", + "internal/proto", + ] + pruneopts = "" + revision = "16ed540749f64417a42006ad795b01c0f5d4677a" + [[projects]] branch = "master" digest = "1:c25738de77424e193ec4a05e0be75e83d0671d83c122959da27879e86b1122c9" @@ -1270,6 +1289,7 @@ analyzer-version = 1 input-imports = [ "github.com/devopsfaith/bloomfilter/krakend", + "github.com/devopsfaith/krakend-amqp", "github.com/devopsfaith/krakend-cel", "github.com/devopsfaith/krakend-circuitbreaker/gobreaker/proxy", "github.com/devopsfaith/krakend-cobra", diff --git a/Gopkg.toml b/Gopkg.toml index d23b64cf..7cdb3647 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -79,6 +79,10 @@ branch = "master" name = "github.com/devopsfaith/krakend-httpcache" +[[constraint]] + branch = "master" + name = "github.com/devopsfaith/krakend-amqp" + [[constraint]] version = "0.7.0" name = "github.com/devopsfaith/krakend-martian" diff --git a/backend_factory.go b/backend_factory.go index 786e0d4b..ad8e977f 100644 --- a/backend_factory.go +++ b/backend_factory.go @@ -1,6 +1,9 @@ package krakend import ( + "context" + + amqp "github.com/devopsfaith/krakend-amqp" cel "github.com/devopsfaith/krakend-cel" cb "github.com/devopsfaith/krakend-circuitbreaker/gobreaker/proxy" httpcache "github.com/devopsfaith/krakend-httpcache" @@ -17,12 +20,15 @@ import ( // NewBackendFactory creates a BackendFactory by stacking all the available middlewares: // - oauth2 client credentials +// - http cache // - martian +// - amqp +// - cel // - rate-limit // - circuit breaker // - metrics collector // - opencensus collector -func NewBackendFactory(logger logging.Logger, metricCollector *metrics.Metrics) proxy.BackendFactory { +func NewBackendFactory(ctx context.Context, logger logging.Logger, metricCollector *metrics.Metrics) proxy.BackendFactory { requestExecutorFactory := func(cfg *config.Backend) client.HTTPRequestExecutor { var clientFactory client.HTTPClientFactory if _, ok := cfg.ExtraConfig[oauth2client.Namespace]; ok { @@ -33,6 +39,7 @@ func NewBackendFactory(logger logging.Logger, metricCollector *metrics.Metrics) return opencensus.HTTPRequestExecutor(clientFactory) } backendFactory := martian.NewConfiguredBackendFactory(logger, requestExecutorFactory) + backendFactory = amqp.NewBackendFactory(ctx, logger, backendFactory) backendFactory = cel.BackendFactory(logger, backendFactory) backendFactory = juju.BackendFactory(backendFactory) backendFactory = cb.BackendFactory(backendFactory, logger) diff --git a/executor.go b/executor.go index 59c2c88d..2d27ab07 100644 --- a/executor.go +++ b/executor.go @@ -101,7 +101,7 @@ func NewExecutor(ctx context.Context) cmd.Executor { // setup the krakend router routerFactory := router.NewFactory(router.Config{ Engine: NewEngine(cfg, logger), - ProxyFactory: NewProxyFactory(logger, NewBackendFactory(logger, metricCollector), metricCollector), + ProxyFactory: NewProxyFactory(logger, NewBackendFactory(ctx, logger, metricCollector), metricCollector), Middlewares: []gin.HandlerFunc{}, Logger: logger, HandlerFactory: NewHandlerFactory(logger, metricCollector, tokenRejecterFactory), From 13c4ba0c6e86eb6d500006b2f4649ad320e6bdf4 Mon Sep 17 00:00:00 2001 From: kpacha Date: Thu, 4 Apr 2019 12:23:53 +0200 Subject: [PATCH 05/12] krakend revision fixed --- Gopkg.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 5b0c360b..e40dbe98 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -186,7 +186,7 @@ revision = "8d71d61e07ac04dcb1661ae30e22893a66439981" [[projects]] - digest = "1:46e33223aaeed161865d6329a408c5c2e4e836e44a282089bccfbcaf7cbdef79" + digest = "1:3a96a760ff7759f3a78e17c219b5938ed48c91cd623128ff8c1caff56cdf5fdf" name = "github.com/devopsfaith/krakend" packages = [ "config", @@ -205,7 +205,7 @@ "transport/http/server", ] pruneopts = "" - revision = "3d1455d44d39584429282f364ca0720f68b78525" + revision = "1d20c1916774358fb9a86726f1e9633e133c5b90" version = "0.9.0" [[projects]] From 09c2e50950297dbf992f49af14013682ea874996 Mon Sep 17 00:00:00 2001 From: kpacha Date: Thu, 4 Apr 2019 13:00:31 +0200 Subject: [PATCH 06/12] martian module updated --- Gopkg.lock | 7 ++++--- Gopkg.toml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index e40dbe98..a436d656 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -344,15 +344,15 @@ revision = "17f4745d3502bb8f8efbc0a21d6b60fdb0dc08d5" [[projects]] - digest = "1:7bfe9387115ea3322aa4081536b9bf41f9743d53e1be36dd877bbadc686ed19c" + digest = "1:72ac234b9591ddb102e2abab6d65e2f14f7f8866c152d3629b00600002528eb7" name = "github.com/devopsfaith/krakend-martian" packages = [ ".", "register", ] pruneopts = "" - revision = "12579ad047c6528547fcac36277c3d5e9b53681b" - version = "0.7.0" + revision = "0a6d74d55365d04077ab745a72b04da3a4e6aa87" + version = "0.9.0" [[projects]] digest = "1:f18105f7b6118cd3bb56706c70cd3d945880fd3f0782393e2c793e9d10846b78" @@ -534,6 +534,7 @@ "mitm", "parse", "proxyutil", + "status", "verify", ] pruneopts = "" diff --git a/Gopkg.toml b/Gopkg.toml index 7cdb3647..a49d0645 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -84,7 +84,7 @@ name = "github.com/devopsfaith/krakend-amqp" [[constraint]] - version = "0.7.0" + version = "0.9.0" name = "github.com/devopsfaith/krakend-martian" [[constraint]] From cf88c9cf3f4d4a422cfccbf7c1e498518f00e070 Mon Sep 17 00:00:00 2001 From: kpacha Date: Thu, 4 Apr 2019 13:04:47 +0200 Subject: [PATCH 07/12] flexibleconfig module updated --- Gopkg.lock | 2 +- Gopkg.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index a436d656..c944d664 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -274,12 +274,12 @@ revision = "bd645943ff8ce2135252caafa42abc34f2c14a7d" [[projects]] - branch = "master" digest = "1:858cee200bd94dd3cdb3afc06ad09ab71ca37198f906cbe9a2fd0ccdcbcc5e8d" name = "github.com/devopsfaith/krakend-flexibleconfig" packages = ["."] pruneopts = "" revision = "23f2ca20e5db2f92d39d5dc539d64529b40907a0" + version = "0.9.0" [[projects]] branch = "master" diff --git a/Gopkg.toml b/Gopkg.toml index a49d0645..042e28b5 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -36,7 +36,7 @@ name = "github.com/devopsfaith/krakend-cel" [[constraint]] - branch = "master" + version = "0.9.0" name = "github.com/devopsfaith/krakend-flexibleconfig" [[constraint]] From 796fb3a559fd8e42e508d9bf66508f5554b40f2c Mon Sep 17 00:00:00 2001 From: kpacha Date: Thu, 4 Apr 2019 13:08:06 +0200 Subject: [PATCH 08/12] ratelimit module updated --- Gopkg.lock | 6 +++--- Gopkg.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index c944d664..6a9641e9 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -392,7 +392,7 @@ version = "0.7.1" [[projects]] - digest = "1:39d892061aa095f73bdbdd3a1e73ba767f3f477ca9e17917a77284d1d03f235c" + digest = "1:2c4af650abc25a23b66a671f81dbaae0b6f32bd0ec771807b758d3e373e7755b" name = "github.com/devopsfaith/krakend-ratelimit" packages = [ ".", @@ -402,8 +402,8 @@ "juju/router/gin", ] pruneopts = "" - revision = "d783f44e834aa91930971d39145b52a182b107ca" - version = "0.8.0" + revision = "d63774e96e822849beb444823db7e22e5289fab6" + version = "0.9.0" [[projects]] digest = "1:bd8e054d035e2e20c076b549dcec18deb1ed1051b8a2eebe719fb10610088482" diff --git a/Gopkg.toml b/Gopkg.toml index 042e28b5..b6661359 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -96,7 +96,7 @@ name = "github.com/devopsfaith/krakend-oauth2-clientcredentials" [[constraint]] - version = "0.8.0" + version = "0.9.0" name = "github.com/devopsfaith/krakend-ratelimit" [[constraint]] From 889af6b435c9bddef3dadb7cfc41ec8c6558e57f Mon Sep 17 00:00:00 2001 From: kpacha Date: Thu, 4 Apr 2019 13:17:40 +0200 Subject: [PATCH 09/12] do not change the already published signatures --- backend_factory.go | 7 ++++++- executor.go | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/backend_factory.go b/backend_factory.go index ad8e977f..a5a2dfb4 100644 --- a/backend_factory.go +++ b/backend_factory.go @@ -28,7 +28,12 @@ import ( // - circuit breaker // - metrics collector // - opencensus collector -func NewBackendFactory(ctx context.Context, logger logging.Logger, metricCollector *metrics.Metrics) proxy.BackendFactory { +func NewBackendFactory(logger logging.Logger, metricCollector *metrics.Metrics) proxy.BackendFactory { + return NewBackendFactoryWithContext(context.Background(), logger, metricCollector) +} + +// NewBackendFactory creates a BackendFactory by stacking all the available middlewares and injecting the received context +func NewBackendFactoryWithContext(ctx context.Context, logger logging.Logger, metricCollector *metrics.Metrics) proxy.BackendFactory { requestExecutorFactory := func(cfg *config.Backend) client.HTTPRequestExecutor { var clientFactory client.HTTPClientFactory if _, ok := cfg.ExtraConfig[oauth2client.Namespace]; ok { diff --git a/executor.go b/executor.go index 2d27ab07..4b8cbef7 100644 --- a/executor.go +++ b/executor.go @@ -101,7 +101,7 @@ func NewExecutor(ctx context.Context) cmd.Executor { // setup the krakend router routerFactory := router.NewFactory(router.Config{ Engine: NewEngine(cfg, logger), - ProxyFactory: NewProxyFactory(logger, NewBackendFactory(ctx, logger, metricCollector), metricCollector), + ProxyFactory: NewProxyFactory(logger, NewBackendFactoryWithContext(ctx, logger, metricCollector), metricCollector), Middlewares: []gin.HandlerFunc{}, Logger: logger, HandlerFactory: NewHandlerFactory(logger, metricCollector, tokenRejecterFactory), From f074553bda4f2e8a795c7d562e94d073eb8327d0 Mon Sep 17 00:00:00 2001 From: kpacha Date: Thu, 4 Apr 2019 14:36:25 +0200 Subject: [PATCH 10/12] cel module updated --- Gopkg.lock | 12 ++++++------ Gopkg.toml | 2 +- tests/fixtures/specs/cel-1.json | 3 ++- tests/fixtures/specs/cel-2.json | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 6a9641e9..ccf14008 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -217,15 +217,15 @@ revision = "5f14dc177694b928d133f79475692b4b14442651" [[projects]] - branch = "master" - digest = "1:f72487139b7433059c268ec65e4863320af887db0df5798f10626753238831da" + digest = "1:2adc20b97785d34a8ed824444f4968c3074025800c96420a66292d0180aefb72" name = "github.com/devopsfaith/krakend-cel" packages = [ ".", "internal", ] pruneopts = "" - revision = "01f717a7cafad9e7bd36044c6d81639cd2804d3f" + revision = "4ab152faf99c6769e435471c42bc12b74cd2e812" + version = "0.9.0" [[projects]] branch = "master" @@ -497,7 +497,7 @@ version = "v1.2.0" [[projects]] - digest = "1:c9f76c2577fde45c9642e1b03491cf6b3aacff2e4b969beb071c96911c5f34fc" + digest = "1:7e37047a3d592e947b32e27270549e5924d8946ab65558d611f226fb5b79b60e" name = "github.com/google/cel-go" packages = [ "cel", @@ -518,8 +518,8 @@ "parser/gen", ] pruneopts = "" - revision = "81d826ac4515a47311b5e8734449e3a6ac7afceb" - version = "v0.1.0" + revision = "2c29ff3f5d3d7856e562e821214cc9c77657b853" + version = "v0.2.0" [[projects]] digest = "1:59c8099a5a8f449331e7bf2d17086bbd4f320f1f8f6a1a75a5d4d145bd6ad865" diff --git a/Gopkg.toml b/Gopkg.toml index b6661359..820e8314 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -32,7 +32,7 @@ version = "1.2.0" [[constraint]] - branch = "master" + version = "0.9.0" name = "github.com/devopsfaith/krakend-cel" [[constraint]] diff --git a/tests/fixtures/specs/cel-1.json b/tests/fixtures/specs/cel-1.json index 0d62e0c6..f400c886 100644 --- a/tests/fixtures/specs/cel-1.json +++ b/tests/fixtures/specs/cel-1.json @@ -11,7 +11,8 @@ "body": "", "header": { "content-type": "", - "Cache-Control": "" + "Cache-Control": "", + "X-Krakend-Completed": "false" } } } diff --git a/tests/fixtures/specs/cel-2.json b/tests/fixtures/specs/cel-2.json index 4ce46048..c295ebb4 100644 --- a/tests/fixtures/specs/cel-2.json +++ b/tests/fixtures/specs/cel-2.json @@ -9,7 +9,7 @@ "header": { "content-type": "", "Cache-Control": "", - "X-Krakend-Completed": "" + "X-Krakend-Completed": "false" } } } From 79cb04f3a332e2e39c11c9b91433215718bdfa78 Mon Sep 17 00:00:00 2001 From: kpacha Date: Thu, 4 Apr 2019 16:00:02 +0200 Subject: [PATCH 11/12] flexibleconfig update completed --- Gopkg.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index ccf14008..cefbc201 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -274,11 +274,11 @@ revision = "bd645943ff8ce2135252caafa42abc34f2c14a7d" [[projects]] - digest = "1:858cee200bd94dd3cdb3afc06ad09ab71ca37198f906cbe9a2fd0ccdcbcc5e8d" + digest = "1:41fc94c0a73201ef78b2722262f2814c033c65a65c2c17946e9e6f92f4e1d7a1" name = "github.com/devopsfaith/krakend-flexibleconfig" packages = ["."] pruneopts = "" - revision = "23f2ca20e5db2f92d39d5dc539d64529b40907a0" + revision = "465383e6f04aa4b3c5d27e75a02946dcebb5cc9e" version = "0.9.0" [[projects]] From 59ec3373a8642145841d495c059fc5eb8479d473 Mon Sep 17 00:00:00 2001 From: kpacha Date: Thu, 4 Apr 2019 16:36:20 +0200 Subject: [PATCH 12/12] flexibleconfig update completed --- Gopkg.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index cefbc201..2502ef31 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -274,11 +274,11 @@ revision = "bd645943ff8ce2135252caafa42abc34f2c14a7d" [[projects]] - digest = "1:41fc94c0a73201ef78b2722262f2814c033c65a65c2c17946e9e6f92f4e1d7a1" + digest = "1:dd8ebcf0bcc2c1a9d778f6bc19e9e4a20cec6dc0c8791605a46e333713c9514b" name = "github.com/devopsfaith/krakend-flexibleconfig" packages = ["."] pruneopts = "" - revision = "465383e6f04aa4b3c5d27e75a02946dcebb5cc9e" + revision = "f138bfee381ba2eb6501c5959577a3e1e0c8b850" version = "0.9.0" [[projects]]