diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index ded10b95..919762dc 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -11,12 +11,12 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: - go-version: 1.17 + go-version: 1.19 - name: Test run: make test diff --git a/Dockerfile b/Dockerfile index 8216069c..191db229 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG GOLANG_VERSION ARG ALPINE_VERSION FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as builder -RUN apk --no-cache add make gcc musl-dev binutils-gold +RUN apk --no-cache --virtual .build-deps add make gcc musl-dev binutils-gold COPY . /app WORKDIR /app diff --git a/Dockerfile-plugin-builder b/Dockerfile-plugin-builder new file mode 100644 index 00000000..38be8a07 --- /dev/null +++ b/Dockerfile-plugin-builder @@ -0,0 +1,5 @@ +ARG GOLANG_VERSION +ARG ALPINE_VERSION +FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} + +RUN apk --no-cache --virtual .build-deps add make gcc musl-dev binutils-gold diff --git a/Makefile b/Makefile index 5af9e1d8..06f9a5a4 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ BIN_NAME :=krakend OS := $(shell uname | tr '[:upper:]' '[:lower:]') -VERSION := 2.1.0 +VERSION := 2.1.1 GIT_COMMIT := $(shell git rev-parse --short=7 HEAD) PKGNAME := krakend LICENSE := Apache 2.0 @@ -19,8 +19,8 @@ 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.19.1 -GLIBC_VERSION := $(shell sh find_glibc.sh) +GOLANG_VERSION := 1.19.2 +GLIBC_VERSION := $(shell bash find_glibc.sh) ALPINE_VERSION := 3.16 FPM_OPTS=-s dir -v $(VERSION) -n $(PKGNAME) \ @@ -73,6 +73,9 @@ build_on_docker: docker: docker build --no-cache --pull --build-arg GOLANG_VERSION=${GOLANG_VERSION} --build-arg ALPINE_VERSION=${ALPINE_VERSION} -t devopsfaith/krakend:${VERSION} . +docker-plugin-builder: + docker build --no-cache --pull --build-arg GOLANG_VERSION=${GOLANG_VERSION} --build-arg ALPINE_VERSION=${ALPINE_VERSION} -t devopsfaith/krakend-plugin-builder:${VERSION} -f Dockerfile-plugin-builder . + benchmark: @mkdir -p bench_res @touch bench_res/${GIT_COMMIT}.out diff --git a/executor.go b/executor.go index 19ff5bf1..f38124cf 100644 --- a/executor.go +++ b/executor.go @@ -190,7 +190,7 @@ func (e *ExecutorBuilder) NewCmdExecutor(ctx context.Context) cmd.Executor { Middlewares: e.Middlewares, Logger: logger, HandlerFactory: e.HandlerFactory.NewHandlerFactory(logger, metricCollector, tokenRejecterFactory), - RunServer: router.RunServerFunc(e.RunServerFactory.NewRunServer(logger, serverhttp.RunServer)), + RunServer: router.RunServerFunc(e.RunServerFactory.NewRunServer(logger, serverhttp.RunServerWithLoggerFactory(logger))), }) // start the engines diff --git a/find_glibc.sh b/find_glibc.sh index 3f33cc05..31284166 100755 --- a/find_glibc.sh +++ b/find_glibc.sh @@ -1,14 +1,21 @@ -#!/bin/sh +#!/bin/bash OS=$(uname) GLIBC=UNKNOWN-0.0.0 +function get_os_version { + source /etc/os-release + os_release="${NAME}-${VERSION_ID}" +} + case $OS in Linux*) if ldd --version 2>&1 | grep -i musl > /dev/null; then - GLIBC=MUSL-$(ldd --version 2>&1 | grep Version | cut -d" " -f2) + get_os_version + GLIBC="MUSL-$(ldd --version 2>&1 | grep Version | cut -d\ -f2)_($os_release)" else - GLIBC=GLIBC-$(ldd --version 2>&1 | grep ^ldd | awk '{print $(NF)}') + get_os_version + GLIBC="GLIBC-$(ldd --version 2>&1 | grep ^ldd | awk '{print $(NF)}')_($os_release)" fi ;; Darwin*) diff --git a/go.mod b/go.mod index 9522a14c..158d48fc 100644 --- a/go.mod +++ b/go.mod @@ -7,33 +7,33 @@ require ( github.com/go-contrib/uuid v1.2.0 github.com/krakendio/bloomfilter/v2 v2.0.2 github.com/krakendio/krakend-amqp/v2 v2.0.2 - github.com/krakendio/krakend-botdetector/v2 v2.0.2 + github.com/krakendio/krakend-botdetector/v2 v2.0.3 github.com/krakendio/krakend-cel/v2 v2.0.1 github.com/krakendio/krakend-circuitbreaker/v2 v2.0.1 - github.com/krakendio/krakend-cobra/v2 v2.0.6 + github.com/krakendio/krakend-cobra/v2 v2.0.7 github.com/krakendio/krakend-cors/v2 v2.0.1 github.com/krakendio/krakend-flexibleconfig/v2 v2.0.1 github.com/krakendio/krakend-gelf/v2 v2.0.1 github.com/krakendio/krakend-gologging/v2 v2.0.2 github.com/krakendio/krakend-httpcache/v2 v2.0.1 github.com/krakendio/krakend-httpsecure/v2 v2.0.1 - github.com/krakendio/krakend-influx/v2 v2.0.1 - github.com/krakendio/krakend-jose/v2 v2.0.4 - github.com/krakendio/krakend-jsonschema/v2 v2.0.1 - github.com/krakendio/krakend-lambda/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-logstash/v2 v2.0.1 - github.com/krakendio/krakend-lua/v2 v2.0.1 - github.com/krakendio/krakend-martian/v2 v2.0.1 + github.com/krakendio/krakend-lua/v2 v2.0.3 + github.com/krakendio/krakend-martian/v2 v2.0.2 github.com/krakendio/krakend-metrics/v2 v2.0.1 github.com/krakendio/krakend-oauth2-clientcredentials/v2 v2.0.1 github.com/krakendio/krakend-opencensus/v2 v2.0.1 github.com/krakendio/krakend-pubsub/v2 v2.0.1 - github.com/krakendio/krakend-ratelimit/v2 v2.0.3 + github.com/krakendio/krakend-ratelimit/v2 v2.0.4 github.com/krakendio/krakend-rss/v2 v2.0.1 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.1.0 + github.com/luraproject/lura/v2 v2.2.0 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c ) @@ -80,7 +80,7 @@ require ( github.com/armon/go-metrics v0.3.10 // indirect github.com/armon/go-radix v1.0.0 // indirect github.com/auth0-community/go-auth0 v1.0.0 // indirect - github.com/aws/aws-sdk-go v1.43.31 // indirect + github.com/aws/aws-sdk-go v1.44.24 // indirect github.com/aws/aws-sdk-go-v2 v1.16.2 // indirect github.com/aws/aws-sdk-go-v2/config v1.15.3 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.11.2 // indirect diff --git a/go.sum b/go.sum index a9e0f3fe..fb237c16 100644 --- a/go.sum +++ b/go.sum @@ -191,8 +191,9 @@ github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.37.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go v1.43.31 h1:yJZIr8nMV1hXjAvvOLUFqZRJcHV7udPQBfhJqawDzI0= github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.24 h1:3nOkwJBJLiGBmJKWp3z0utyXuBkxyGkRRwWjrTItJaY= +github.com/aws/aws-sdk-go v1.44.24/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go-v2 v1.16.2 h1:fqlCk6Iy3bnCumtrLz9r3mJ/2gUT0pJ0wLFVIdWh+JA= github.com/aws/aws-sdk-go-v2 v1.16.2/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1/go.mod h1:n8Bs1ElDD2wJ9kCRTczA83gYbBmjSwZp3umc6zF4EeM= @@ -690,22 +691,20 @@ github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/krakendio/bloomfilter/v2 v2.0.1 h1:orTtBUaN3Lm9/3hD4Gv53/0Q5gknsV5bBj+q5nHXkBc= -github.com/krakendio/bloomfilter/v2 v2.0.1/go.mod h1:4sa2zev27WRZgs1OIgHg2+OyruaZdHXmJS8Fz8vw50c= github.com/krakendio/bloomfilter/v2 v2.0.2 h1:zAysPVUNhxq6Y9E3/k0Lb0LfTZ0hjDLx7Heo17qB9Bk= github.com/krakendio/bloomfilter/v2 v2.0.2/go.mod h1:BH9pmOLLllSAvtjuwA2Ythd7RE3lQdNr1sHK3f2dJok= github.com/krakendio/flatmap v1.1.1 h1:rGBNVpBY0pMk6cLOwerVzoKY4HELnpu0xvqB231lOCQ= github.com/krakendio/flatmap v1.1.1/go.mod h1:KBuVkiH5BcBFRa5A1HdSHDn8a8LzsyRTKZArX0vqTbo= github.com/krakendio/krakend-amqp/v2 v2.0.2 h1:+HhAOkjYTL/6cLGooO4ZDwN0VI7L6MQcvJeSguGWZcY= github.com/krakendio/krakend-amqp/v2 v2.0.2/go.mod h1:p2iHCBKFOPjjzBkBtfiOzmGiZiXfMOeeo9bMa+6/hno= -github.com/krakendio/krakend-botdetector/v2 v2.0.2 h1:HspbLhEYYp2gbNZs1nLPoXGlAl/yRXrlu/CluVVAowk= -github.com/krakendio/krakend-botdetector/v2 v2.0.2/go.mod h1:5ss3VT0Tt61n362+vzPEggSWRJJ5FuOCzSJBFMbHTgI= +github.com/krakendio/krakend-botdetector/v2 v2.0.3 h1:Tn3nijjrahuw6K/rX8XE9jeL3GdXZ909iT5hBum2uB8= +github.com/krakendio/krakend-botdetector/v2 v2.0.3/go.mod h1:5ss3VT0Tt61n362+vzPEggSWRJJ5FuOCzSJBFMbHTgI= github.com/krakendio/krakend-cel/v2 v2.0.1 h1:7qRPelchTia94O7cY3fHSH8CUWxm9Z1KIztiFJGhC+I= github.com/krakendio/krakend-cel/v2 v2.0.1/go.mod h1:TuOf89sSyRkpQWjSoEOTDjWpWDJlUccSF2i58QBmfSA= github.com/krakendio/krakend-circuitbreaker/v2 v2.0.1 h1:rX5TAbdQa+mISIULDxYdviR7/7yOYCjSimuaXJHFrUA= github.com/krakendio/krakend-circuitbreaker/v2 v2.0.1/go.mod h1:PCbRQGfUOToK2Uw48gm9rZ8Mzb4qLGZnX4876Fu9CpQ= -github.com/krakendio/krakend-cobra/v2 v2.0.6 h1:V+pNWlvsHEWybmZZciT2lgaN9ffB+0Cm1HsOF9bLjKc= -github.com/krakendio/krakend-cobra/v2 v2.0.6/go.mod h1:dz2oFSD97YLSB/PN2qDodRoPm5mka4aqLU/sbiw4LPs= +github.com/krakendio/krakend-cobra/v2 v2.0.7 h1:zC9aYVEHuLnwSn5G1cotF03U2r3uG68zIb4R0OANP/8= +github.com/krakendio/krakend-cobra/v2 v2.0.7/go.mod h1:D55LazsfTNJ4szcrw6jSG8DyANn/Ww8Kslc8jmxPSfk= github.com/krakendio/krakend-cors/v2 v2.0.1 h1:asHWMDW94Bp9SIP1zV9nhOhqAMXyOSxTftpvfBTlhms= github.com/krakendio/krakend-cors/v2 v2.0.1/go.mod h1:aqvOcxK4JuhB9rLfcsENz4EeX3QQqsPhc+imeeG5H2E= github.com/krakendio/krakend-flexibleconfig/v2 v2.0.1 h1:Z8O8ndVWQa3MnufSLZaA3Cl+Hm1AIW/j4ZAkxjD7cVQ= @@ -718,20 +717,22 @@ github.com/krakendio/krakend-httpcache/v2 v2.0.1 h1:dq5Q5DepcNntpWKKI5FfsGTHj8R6 github.com/krakendio/krakend-httpcache/v2 v2.0.1/go.mod h1:Ksxkhwr7jZi6jnILHSg05rwQr5ITfULjC7Gh883gLzo= github.com/krakendio/krakend-httpsecure/v2 v2.0.1 h1:f7ABi96wOHrtMwaIOeC2TZGK1Tkod3Ptvk6yFEFs+dM= github.com/krakendio/krakend-httpsecure/v2 v2.0.1/go.mod h1:skh2WjGLgU0pAFLZx66om5Uzea9UGm7HHzUukevOZFo= -github.com/krakendio/krakend-influx/v2 v2.0.1 h1:rah1Y7xhPCkMScCjFCeXlC0QX7zUMORxmu6jtfNLVKE= -github.com/krakendio/krakend-influx/v2 v2.0.1/go.mod h1:XhnMPw7p0UPVK3Y/oB9q8k0kLWkmHX80NjMMMZwsbBs= -github.com/krakendio/krakend-jose/v2 v2.0.4 h1:GbBwaJDC64JyFnni/Em8AUA3TEYl798Sc1R1VSlEp64= -github.com/krakendio/krakend-jose/v2 v2.0.4/go.mod h1:PGAbTUHFcciVAfArcTipfbZEuyLWuYTs94sG6+Q08LQ= -github.com/krakendio/krakend-jsonschema/v2 v2.0.1 h1:JMBxcO0REm/mFpbvjjBtU6azuYdzSXay6QQDmlrw1gM= -github.com/krakendio/krakend-jsonschema/v2 v2.0.1/go.mod h1:kBkeFba9IzwHCljcKAnlpoRD9kFQzTB/UxNe4PNa13A= -github.com/krakendio/krakend-lambda/v2 v2.0.1 h1:a6TVjzBO2aQYesH3x+sPrL+aR80rNku7AMoN5ZWj1Yg= -github.com/krakendio/krakend-lambda/v2 v2.0.1/go.mod h1:TNB9D7LRILovCiPDM0eSMl+mUz8ouhtNB7DxhtvHWTQ= +github.com/krakendio/krakend-influx/v2 v2.0.2 h1:eKexINBvJv5R2FbBVxjKiAgza3lPzmWO0te5CatxiGg= +github.com/krakendio/krakend-influx/v2 v2.0.2/go.mod h1:XhnMPw7p0UPVK3Y/oB9q8k0kLWkmHX80NjMMMZwsbBs= +github.com/krakendio/krakend-jose/v2 v2.0.5 h1:K6LPJbIK0lTQjXBSaoEqJ/AE+XdzJ+xv2osXKEHIYtU= +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-lambda/v2 v2.0.2 h1:BBKflEzAfQw3pHNAVaBopPpGX0b2wt2ZSQjcNZlm4eM= +github.com/krakendio/krakend-lambda/v2 v2.0.2/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.1 h1:YWikCRfLnrynT1zYF71/DprUEZ9cRthojt0Ya/idHJg= -github.com/krakendio/krakend-lua/v2 v2.0.1/go.mod h1:bgDFJrZCJcKe+sQ/GrPqwiCGKgkUeYe1GEXQmPke2jg= -github.com/krakendio/krakend-martian/v2 v2.0.1 h1:x1tpVcDkJs44KFwsjtZZxUxxkypqIr79HahO+QOEmjA= -github.com/krakendio/krakend-martian/v2 v2.0.1/go.mod h1:s24L895PD96CHANADEWcmL+A5mwJ7HnKpVQbJCN9sWE= +github.com/krakendio/krakend-lua/v2 v2.0.2 h1:hRQWUcLhJf/O9isupXe5J/f4u369N7T8CufBXwOFUmM= +github.com/krakendio/krakend-lua/v2 v2.0.2/go.mod h1:MeC0lyDyuuG1h2wyIgHmOZEKmxG630ExS/Mpa5/7Xso= +github.com/krakendio/krakend-lua/v2 v2.0.3 h1:7edoN8DH71SWe1RIubzumWF5Iuxoi4AwX85wZtxmTzo= +github.com/krakendio/krakend-lua/v2 v2.0.3/go.mod h1:MeC0lyDyuuG1h2wyIgHmOZEKmxG630ExS/Mpa5/7Xso= +github.com/krakendio/krakend-martian/v2 v2.0.2 h1:jUbrRfVY9TjPGk6Tnf7pvR76OMEB7DI9NMibU1DBsEo= +github.com/krakendio/krakend-martian/v2 v2.0.2/go.mod h1:CJ0r8fwPNHXObclDqjR2iuUrT21PRg31SPFVXhdBlHM= github.com/krakendio/krakend-metrics/v2 v2.0.1 h1:BFGsbw/Qghfw0OD2+fFRcyavuHWwp78KAnAw9gyzpzQ= github.com/krakendio/krakend-metrics/v2 v2.0.1/go.mod h1:FI79Wv/v1Eq/5jHqOav8dL5jGwNxoG7pTxfJ8GfRUL0= github.com/krakendio/krakend-oauth2-clientcredentials/v2 v2.0.1 h1:eC5Nj5KWfI0iO9l8PQ2TYln0MbkmTdvaHqWCz80LUzM= @@ -742,6 +743,8 @@ github.com/krakendio/krakend-pubsub/v2 v2.0.1 h1:vuk2oUzgEBUz1aSO+n8C/GagkUvwI/Z github.com/krakendio/krakend-pubsub/v2 v2.0.1/go.mod h1:gf6xDIfnS1OBA7ckD+2ybrTSRP2c6/OOA0bJrRSotnE= github.com/krakendio/krakend-ratelimit/v2 v2.0.3 h1:8J3kxWcbTKbdn3VG2FyxFg31ePfRyLVgOdlXM6l2guI= github.com/krakendio/krakend-ratelimit/v2 v2.0.3/go.mod h1:fm4qNMlZ/FEVGRmP4FGZ8FE3I13J/rwSPwNtGMM4BZs= +github.com/krakendio/krakend-ratelimit/v2 v2.0.4 h1:nDO3GieLejn274w3LBhHp12PcP2S0udZMfpw3iqUQoc= +github.com/krakendio/krakend-ratelimit/v2 v2.0.4/go.mod h1:fm4qNMlZ/FEVGRmP4FGZ8FE3I13J/rwSPwNtGMM4BZs= github.com/krakendio/krakend-rss/v2 v2.0.1 h1:PMmgqUMhMNAyGS6xiTLpUJ/IeWGQ5QOCo8GJ6l9tvSo= github.com/krakendio/krakend-rss/v2 v2.0.1/go.mod h1:qDWMJMgZJ0b94uPboqeJY/XlG4sKRsxGyfjGuu8FPPY= github.com/krakendio/krakend-usage v0.0.0-20220607160923-9d7b69c9bf97 h1:fxpOhDQIdP6Lrf6f66o2VYzANY2ZxVTq1+RYabKnWdI= @@ -759,8 +762,8 @@ github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/luraproject/lura/v2 v2.1.0 h1:y5H8HXGhna0EvzrNN1nPo6v6hmftd/aVcHqrQs3f5Z4= -github.com/luraproject/lura/v2 v2.1.0/go.mod h1:lkKDcV0O3jEK7fX/gGI7/fbkrDUOMKRqe442Xa3KRPQ= +github.com/luraproject/lura/v2 v2.2.0 h1:/r6zrjoyptjpCBxJOba6jL+uXBamRkKU+z2aaRJrlS4= +github.com/luraproject/lura/v2 v2.2.0/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 index 3fa1fe54..ae842244 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.1.0\"],\"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.1\"],\"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 402a5556..519a2f94 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.1.0\"],\"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.1\"],\"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 0b222b88..e341f82a 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.1.0\"],\"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.1\"],\"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 18306b6e..6ec6a7b5 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.1.0\"],\"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.1\"],\"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 9a37aee7..5e83fb59 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.1.0"], + "User-Agent":["KrakenD Version 2.1.1"], "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 3656d055..a9eb8a6a 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.1.0\"],\"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.1\"],\"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.0"], + "X-Krakend": ["Version 2.1.1"], "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 bf5c0c26..94892bb3 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.1.0"], + "User-Agent": ["KrakenD Version 2.1.1"], "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 index 2434861c..5e1f2251 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.1.0\"],\"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.1\"],\"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 f4ce604f..1d5c3cb2 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.1.0\"],\"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.1\"],\"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 ea9cb4f8..8d0bc708 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.1.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\":[\"Go-http-client/1.1\"],\"X-Forwarded-Host\":[\"localhost:8080\"],\"X-Forwarded-Via\":[\"KrakenD Version 2.1.1\"],\"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 52299850..842ab9b7 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.1.0\"],\"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.1\"],\"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 de898fde..b8f550d7 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 2.1.0\"],\"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\"],\"Content-Length\":[\"0\"],\"User-Agent\":[\"KrakenD Version 2.1.1\"],\"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/query_forwarding_1.json b/tests/fixtures/specs/query_forwarding_1.json index c7577a8b..1f03467e 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.1.0\"],\"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.1\"],\"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 0fb5ab83..6707c85f 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.1.0\"],\"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.1\"],\"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 7f2047ef..7055115c 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.1.0\"],\"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.1\"],\"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 8ecff464..de476db5 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.1.0\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/42\",\"query\":{}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.1.1\"],\"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 373672e0..35d27372 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.1.0\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/123\",\"query\":{}}}", + "body": "{\"first\":{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.1.1\"],\"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 d19ca07f..d0971758 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.1.0localhost:8080/param_forwarding/", + "body": "42gziphttp://127.0.0.1:8081/param_forwardingKrakenD Version 2.1.1localhost:8080/param_forwarding/", "header": { "content-type": ["application/xml"], "Cache-Control": ["public, max-age=3600"],