Skip to content

Commit

Permalink
Merge pull request #902 from krakend/dev-v2.7.0
Browse files Browse the repository at this point in the history
[WiP] Release v2.7.0
  • Loading branch information
kpacha authored Jul 18, 2024
2 parents c6a9789 + 584f429 commit 58d2c20
Show file tree
Hide file tree
Showing 24 changed files with 66 additions and 73 deletions.
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.6.3
VERSION := 2.7.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 <[email protected]>
DOCKER_WDIR := /tmp/fpm
DOCKER_FPM := devopsfaith/fpm
GOLANG_VERSION := 1.22.4
GOLANG_VERSION := 1.22.5
GLIBC_VERSION := $(shell sh find_glibc.sh)
ALPINE_VERSION := 3.19
OS_TAG :=
Expand Down
3 changes: 3 additions & 0 deletions executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import (
"github.com/luraproject/lura/v2/logging"
"github.com/luraproject/lura/v2/proxy"
router "github.com/luraproject/lura/v2/router/gin"
"github.com/luraproject/lura/v2/sd/dnssrv"
serverhttp "github.com/luraproject/lura/v2/transport/http/server"
server "github.com/luraproject/lura/v2/transport/http/server/plugin"
)
Expand Down Expand Up @@ -172,6 +173,8 @@ func (e *ExecutorBuilder) NewCmdExecutor(ctx context.Context) cmd.Executor {
logger.Info("Working directory is", wd)
}

dnssrv.SetTTL(cfg.DNSCacheTTL)

if cfg.Plugin != nil {
e.PluginLoaderWithContext.LoadWithContext(ctx, cfg.Plugin.Folder, cfg.Plugin.Pattern, logger)
}
Expand Down
25 changes: 12 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ require (
github.com/krakend/krakend-otel v0.5.0
github.com/krakendio/bloomfilter/v2 v2.0.4
github.com/krakendio/krakend-amqp/v2 v2.1.0
github.com/krakendio/krakend-audit v0.0.5
github.com/krakendio/krakend-audit v0.0.7
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.3.0
github.com/krakendio/krakend-cors/v2 v2.0.1
github.com/krakendio/krakend-cobra/v2 v2.4.0
github.com/krakendio/krakend-cors/v2 v2.1.1
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-httpsecure/v2 v2.1.0
github.com/krakendio/krakend-influx/v2 v2.0.3
github.com/krakendio/krakend-jose/v2 v2.5.0
github.com/krakendio/krakend-jose/v2 v2.6.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.2
Expand All @@ -30,12 +30,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.1.0
github.com/krakendio/krakend-ratelimit/v3 v3.2.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.6.3
github.com/luraproject/lura/v2 v2.7.0
github.com/spf13/cobra v1.8.0
github.com/xeipuuv/gojsonschema v1.2.1-0.20200424115421-065759f9c3d7
golang.org/x/sync v0.7.0
Expand Down Expand Up @@ -136,9 +136,8 @@ require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.6.3 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
Expand All @@ -161,7 +160,7 @@ require (
github.com/klauspost/compress v1.17.7 // indirect
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
github.com/kpacha/opencensus-influxdb v0.0.0-20180520162117-1b490a38de4c // indirect
github.com/krakend/go-auth0 v1.1.0 // indirect
github.com/krakend/go-auth0 v1.2.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 Down Expand Up @@ -197,8 +196,8 @@ require (
github.com/prometheus/statsd_exporter v0.26.1 // indirect
github.com/rabbitmq/amqp091-go v1.9.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rs/cors v1.10.1 // indirect
github.com/rs/cors/wrapper/gin v0.0.0-20221003140808-fcebdb403f4d // indirect
github.com/rs/cors v1.11.0 // indirect
github.com/rs/cors/wrapper/gin v0.0.0-20240515105523-1562b1715b35 // 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.3.1 // indirect
Expand All @@ -222,7 +221,7 @@ require (
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.11 // indirect
github.com/unrolled/secure v1.13.0 // indirect
github.com/unrolled/secure v1.15.0 // indirect
github.com/valyala/fastrand v1.1.0 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
Expand Down
Loading

0 comments on commit 58d2c20

Please sign in to comment.