Skip to content

Commit

Permalink
Merge pull request #814 from krakend/dev-2.5
Browse files Browse the repository at this point in the history
Bump version 2.5.0
  • Loading branch information
taik0 authored Nov 9, 2023
2 parents 55c751c + 281cf27 commit 3fdc5dd
Show file tree
Hide file tree
Showing 24 changed files with 74 additions and 933 deletions.
4 changes: 2 additions & 2 deletions .github/label-commenter-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ labels:
- It does not use the issue template
- It's unrelated to the project (e.g., related to one of its libraries)
- It does not follow the technical philosophy of the project
- Violates our [Code of Conduct](https://github.com/krakendio/.github/blob/main/CODE_OF_CONDUCT.md)
- Violates our [Code of Conduct](https://github.com/krakend/.github/blob/main/CODE_OF_CONDUCT.md)
- It's about KrakenD Enterprise functionalities (contact [Enterprise support](https://www.krakend.io/support/) instead)
You can still make an edit or leave additional comments that lead to reopening this issue.
Expand All @@ -34,7 +34,7 @@ labels:
- Contains insufficient details, it's unclear for the reviewer, or it's impossible to move forward without a lot of interaction
- It's unrelated to the project (e.g., related to one of its libraries)
- It does not follow the philosophy of the project
- Violates our [Code of Conduct](https://github.com/krakendio/.github/blob/main/CODE_OF_CONDUCT.md)
- Violates our [Code of Conduct](https://github.com/krakend/.github/blob/main/CODE_OF_CONDUCT.md)
You can still make an edit or leave additional comments that lead to reopening this issue.
action: close
Expand Down
7 changes: 3 additions & 4 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.4.6
VERSION := 2.5.0
SCHEMA_VERSION := $(shell echo "${VERSION}" | cut -d '.' -f 1,2)
GIT_COMMIT := $(shell git rev-parse --short=7 HEAD)
PKGNAME := krakend
Expand All @@ -20,7 +20,7 @@ DESC := High performance API gateway. Aggregate, filter, manipulate and add midd
MAINTAINER := Daniel Ortiz <dortiz@krakend.io>
DOCKER_WDIR := /tmp/fpm
DOCKER_FPM := devopsfaith/fpm
GOLANG_VERSION := 1.20.10
GOLANG_VERSION := 1.20.11
GLIBC_VERSION := $(shell sh find_glibc.sh)
ALPINE_VERSION := 3.18
OS_TAG :=
Expand Down Expand Up @@ -58,8 +58,7 @@ build:
@go get .
@go build -ldflags="-X github.com/luraproject/lura/v2/core.KrakendVersion=${VERSION} \
-X github.com/luraproject/lura/v2/core.GoVersion=${GOLANG_VERSION} \
-X github.com/luraproject/lura/v2/core.GlibcVersion=${GLIBC_VERSION} ${EXTRA_LDFLAGS} \
-X github.com/krakendio/krakend-cobra/v2.SchemaURL=https://www.krakend.io/schema/v${SCHEMA_VERSION}/krakend.json" \
-X github.com/luraproject/lura/v2/core.GlibcVersion=${GLIBC_VERSION} ${EXTRA_LDFLAGS}" \
-o ${BIN_NAME} ./cmd/krakend-ce
@echo "You can now use ./${BIN_NAME}"

Expand Down
4 changes: 4 additions & 0 deletions executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ func (e *ExecutorBuilder) NewCmdExecutor(ctx context.Context) cmd.Executor {
logger.Info(fmt.Sprintf("Starting KrakenD v%s", core.KrakendVersion))
startReporter(ctx, logger, cfg)

if wd, err := os.Getwd(); err == nil {
logger.Info("Working directory is", wd)
}

if cfg.Plugin != nil {
e.PluginLoader.Load(cfg.Plugin.Folder, cfg.Plugin.Pattern, logger)
}
Expand Down
33 changes: 15 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
module github.com/krakendio/krakend-ce/v2

go 1.17
go 1.20

require (
github.com/gin-gonic/gin v1.9.1
github.com/go-contrib/uuid v1.2.0
github.com/krakendio/bloomfilter/v2 v2.0.4
github.com/krakendio/krakend-amqp/v2 v2.0.3
github.com/krakendio/krakend-amqp/v2 v2.1.0
github.com/krakendio/krakend-audit v0.0.3
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
github.com/krakendio/krakend-cobra/v2 v2.2.0
github.com/krakendio/krakend-cobra/v2 v2.3.0
github.com/krakendio/krakend-cors/v2 v2.0.1
github.com/krakendio/krakend-flexibleconfig/v2 v2.1.0
github.com/krakendio/krakend-flexibleconfig/v2 v2.2.0
github.com/krakendio/krakend-gelf/v2 v2.0.1
github.com/krakendio/krakend-gologging/v2 v2.0.3
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.3
github.com/krakendio/krakend-jose/v2 v2.2.2
github.com/krakendio/krakend-jose/v2 v2.3.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
Expand All @@ -29,12 +29,12 @@ require (
github.com/krakendio/krakend-oauth2-clientcredentials/v2 v2.0.1
github.com/krakendio/krakend-opencensus/v2 v2.1.0
github.com/krakendio/krakend-pubsub/v2 v2.0.1
github.com/krakendio/krakend-ratelimit/v3 v3.0.0
github.com/krakendio/krakend-ratelimit/v3 v3.1.0
github.com/krakendio/krakend-rss/v2 v2.0.1
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.1.0
github.com/luraproject/lura/v2 v2.3.0
github.com/luraproject/lura/v2 v2.4.0
github.com/xeipuuv/gojsonschema v1.2.1-0.20200424115421-065759f9c3d7
golang.org/x/sync v0.1.0
)
Expand Down Expand Up @@ -65,7 +65,7 @@ require (
github.com/DataDog/datadog-go v3.4.1+incompatible // indirect
github.com/DataDog/opencensus-go-exporter-datadog v0.0.0-20191210083620-6965a1cfed68 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.2.0 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
github.com/PuerkitoBio/goquery v1.5.1 // indirect
github.com/Shopify/sarama v1.34.1 // indirect
Expand All @@ -74,7 +74,6 @@ require (
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
github.com/armon/go-metrics v0.4.1 // 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.44.151 // indirect
github.com/aws/aws-sdk-go-v2 v1.17.1 // indirect
github.com/aws/aws-sdk-go-v2/config v1.18.3 // indirect
Expand Down Expand Up @@ -120,7 +119,7 @@ require (
github.com/google/cel-go v0.11.4 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/google/wire v0.5.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
Expand All @@ -144,8 +143,8 @@ require (
github.com/hashicorp/vault/api v1.8.2 // indirect
github.com/hashicorp/vault/sdk v0.6.1 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/huandu/xstrings v1.3.3 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/huandu/xstrings v1.4.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/influxdata/influxdb v1.9.7 // indirect
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
Expand All @@ -155,10 +154,10 @@ require (
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/juju/ratelimit v1.0.1 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
github.com/kpacha/opencensus-influxdb v0.0.0-20180520162117-1b490a38de4c // indirect
github.com/krakend/go-auth0 v1.0.0 // 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
Expand All @@ -179,7 +178,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/nats-io/nats-server/v2 v2.9.23 // indirect
github.com/nats-io/nats.go v1.28.0 // indirect
github.com/nats-io/nkeys v0.4.4 // indirect
github.com/nats-io/nkeys v0.4.6 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 // indirect
Expand All @@ -200,10 +199,10 @@ require (
github.com/rs/cors/wrapper/gin v0.0.0-20221003140808-fcebdb403f4d // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sony/gobreaker v0.4.1 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/cobra v1.1.3 // indirect
github.com/spf13/jwalterweatherman v1.0.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
Expand Down Expand Up @@ -255,5 +254,3 @@ require (
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
Loading

0 comments on commit 3fdc5dd

Please sign in to comment.