Skip to content

Commit

Permalink
Merge pull request #710 from krakendio/dev-v2.3.0
Browse files Browse the repository at this point in the history
v2.3.0
  • Loading branch information
taik0 authored Apr 20, 2023
2 parents 2a9ba3a + 11a4ed6 commit a715dfd
Show file tree
Hide file tree
Showing 28 changed files with 104 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.19
go-version: "1.20"

- name: Test
run: make test
10 changes: 10 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ jobs:
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
- name: Build and push KrakenD plugin builder (Alpine)
id: container-build
uses: docker/build-push-action@v2
with:
context: .
Expand All @@ -52,6 +53,7 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
- name: Build and push KrakenD plugin builder (Linux generic)
id: container-build-linux-generic
uses: docker/build-push-action@v2
with:
context: .
Expand All @@ -61,6 +63,14 @@ jobs:
push: true
tags: ${{ steps.meta-linux-generic.outputs.tags }}
labels: ${{ steps.meta-linux-generic.outputs.labels }}
- name: Install cosign
uses: sigstore/[email protected]
- name: Sign image (Alpine)
run: |
cosign sign -y "docker.io/krakend/builder@${{ steps.container-build.outputs.digest }}"
- name: Sign image (Linux generic)
run: |
cosign sign -y "docker.io/krakend/builder@${{ steps.container-build-linux-generic.outputs.digest }}"
generate:
name: Create release-artifacts
runs-on: ubuntu-20.04
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

BIN_NAME :=krakend
OS := $(shell uname | tr '[:upper:]' '[:lower:]')
VERSION := 2.2.1
VERSION := 2.3.0
GIT_COMMIT := $(shell git rev-parse --short=7 HEAD)
PKGNAME := krakend
LICENSE := Apache 2.0
Expand All @@ -19,7 +19,7 @@ DESC := High performance API gateway. Aggregate, filter, manipulate and add midd
MAINTAINER := Daniel Ortiz <[email protected]>
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 :=
Expand Down
2 changes: 1 addition & 1 deletion backend_factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func NewBackendFactory(logger logging.Logger, metricCollector *metrics.Metrics)
return NewBackendFactoryWithContext(context.Background(), logger, metricCollector)
}

// NewBackendFactory creates a BackendFactory by stacking all the available middlewares and injecting the received context
// NewBackendFactoryWithContext 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 {
clientFactory := client.NewHTTPClient
Expand Down
4 changes: 4 additions & 0 deletions executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@ func (e *ExecutorBuilder) NewCmdExecutor(ctx context.Context) cmd.Executor {

metricCollector := e.MetricsAndTracesRegister.Register(ctx, cfg, logger)

// Initializes the global cache for the JWK clients if enabled in the config
if err := jose.SetGlobalCacher(logger, cfg.ExtraConfig); err != nil && err != jose.ErrNoValidatorCfg {
logger.Error("[SERVICE: JOSE]", err.Error())
}
tokenRejecterFactory, err := e.TokenRejecterFactory.NewTokenRejecter(
ctx,
cfg,
Expand Down
2 changes: 1 addition & 1 deletion find_glibc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ Darwin*)
;;
esac

echo $GLIBC
echo "$GLIBC"
34 changes: 19 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ module github.com/krakendio/krakend-ce/v2
go 1.17

require (
github.com/gin-gonic/gin v1.8.2
github.com/gin-gonic/gin v1.9.0
github.com/go-contrib/uuid v1.2.0
github.com/krakendio/bloomfilter/v2 v2.0.4
github.com/krakendio/krakend-amqp/v2 v2.0.0-20230322130405-efe28779b805
github.com/krakendio/krakend-audit v0.0.1
github.com/krakendio/krakend-amqp/v2 v2.0.3
github.com/krakendio/krakend-audit v0.0.2
github.com/krakendio/krakend-botdetector/v2 v2.1.0
github.com/krakendio/krakend-cel/v2 v2.0.1
github.com/krakendio/krakend-circuitbreaker/v2 v2.0.1
Expand All @@ -19,11 +19,11 @@ require (
github.com/krakendio/krakend-httpcache/v2 v2.0.3
github.com/krakendio/krakend-httpsecure/v2 v2.0.1
github.com/krakendio/krakend-influx/v2 v2.0.2
github.com/krakendio/krakend-jose/v2 v2.1.0
github.com/krakendio/krakend-jose/v2 v2.2.0
github.com/krakendio/krakend-jsonschema/v2 v2.0.3
github.com/krakendio/krakend-lambda/v2 v2.0.3
github.com/krakendio/krakend-logstash/v2 v2.0.1
github.com/krakendio/krakend-lua/v2 v2.0.3
github.com/krakendio/krakend-lua/v2 v2.0.4
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
Expand All @@ -34,7 +34,7 @@ require (
github.com/krakendio/krakend-usage/v2 v2.0.0
github.com/krakendio/krakend-viper/v2 v2.0.1
github.com/krakendio/krakend-xml/v2 v2.0.1
github.com/luraproject/lura/v2 v2.2.4
github.com/luraproject/lura/v2 v2.2.6
github.com/xeipuuv/gojsonschema v1.2.1-0.20200424115421-065759f9c3d7
golang.org/x/sync v0.1.0
)
Expand Down Expand Up @@ -70,7 +70,6 @@ require (
github.com/PuerkitoBio/goquery v1.5.1 // indirect
github.com/Shopify/sarama v1.34.1 // indirect
github.com/alecthomas/chroma v0.6.3 // indirect
github.com/alexeyco/binder v0.0.0-20180729220023-2a21303f588a // indirect
github.com/andybalholm/cascadia v1.1.0 // indirect
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
github.com/armon/go-metrics v0.4.1 // indirect
Expand All @@ -93,10 +92,12 @@ require (
github.com/aws/aws-sdk-go-v2/service/sts v1.17.5 // indirect
github.com/aws/smithy-go v1.13.4 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bytedance/sonic v1.8.0 // indirect
github.com/catalinc/hashcash v0.0.0-20161205220751-e6bc29ff4de9 // indirect
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
github.com/clbanning/mxj v1.8.4 // indirect
github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
Expand All @@ -107,10 +108,10 @@ require (
github.com/fatih/color v1.13.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/go-playground/validator/v10 v10.11.1 // indirect
github.com/goccy/go-json v0.9.11 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.11.2 // indirect
github.com/goccy/go-json v0.10.0 // indirect
github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
Expand Down Expand Up @@ -155,7 +156,9 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/juju/ratelimit v1.0.1 // indirect
github.com/klauspost/compress v1.15.6 // indirect
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
github.com/kpacha/opencensus-influxdb v0.0.0-20180520162117-1b490a38de4c // indirect
github.com/krakendio/binder v0.0.0-20230413105421-1bbe94e65f45 // indirect
github.com/krakendio/flatmap v1.1.1 // indirect
github.com/krakendio/httpcache v0.0.0-20221129153752-65a87a5c2bc5 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
Expand Down Expand Up @@ -215,8 +218,9 @@ require (
github.com/tmthrgd/go-hex v0.0.0-20180828131331-d1fb3dbb16a1 // indirect
github.com/tmthrgd/go-memset v0.0.0-20180828131805-6f4e59bf1e1d // indirect
github.com/tmthrgd/go-popcount v0.0.0-20180111143836-3918361d3e97 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/uber/jaeger-client-go v2.28.0+incompatible // indirect
github.com/ugorji/go/codec v1.2.7 // indirect
github.com/ugorji/go/codec v1.2.9 // indirect
github.com/unrolled/secure v0.0.0-20180918153822-f340ee86eb8b // indirect
github.com/valyala/fastrand v1.1.0 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
Expand All @@ -229,7 +233,8 @@ require (
gocloud.dev/pubsub/natspubsub v0.25.0 // indirect
gocloud.dev/pubsub/rabbitpubsub v0.25.0 // indirect
gocloud.dev/secrets/hashivault v0.28.0 // indirect
golang.org/x/crypto v0.3.0 // indirect
golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/mod v0.6.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/oauth2 v0.2.0 // indirect
Expand All @@ -247,8 +252,7 @@ require (
gopkg.in/ini.v1 v1.66.6 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/auth0-community/go-auth0 v1.0.0 => github.com/devopsfaith/go-auth0 v0.0.0-20220422124632-a1358a81b559

replace github.com/alexeyco/binder v0.0.0-20180729220023-2a21303f588a => github.com/kpacha/binder v0.0.0-20220707194437-6013d1173c4d
Loading

0 comments on commit a715dfd

Please sign in to comment.