From 1d11cdc04c953a62eca1cb74a55530d82fe0c4c2 Mon Sep 17 00:00:00 2001 From: darkweak Date: Thu, 19 Sep 2024 14:55:59 +0200 Subject: [PATCH] fix(storers): default storer to use for surrogate --- README.md | 2 +- pkg/surrogate/providers/common.go | 8 ++------ plugins/beego/go.mod | 4 ++-- plugins/caddy/go.mod | 4 ++-- plugins/caddy/httpcache.go | 2 +- plugins/chi/go.mod | 4 ++-- plugins/dotweb/go.mod | 4 ++-- plugins/echo/go.mod | 4 ++-- plugins/fiber/go.mod | 4 ++-- plugins/gin/go.mod | 4 ++-- plugins/go-zero/go.mod | 4 ++-- plugins/goa/go.mod | 4 ++-- plugins/goyave/go.mod | 4 ++-- plugins/hertz/go.mod | 4 ++-- plugins/kratos/go.mod | 4 ++-- plugins/roadrunner/go.mod | 4 ++-- plugins/skipper/go.mod | 4 ++-- plugins/souin/go.mod | 4 ++-- plugins/souin/storages/go.mod | 2 +- plugins/traefik/go.mod | 4 ++-- plugins/traefik/vendor/modules.txt | 2 +- plugins/tyk/go.mod | 4 ++-- plugins/webgo/go.mod | 4 ++-- 23 files changed, 42 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index 4f0333d0d..c42956e5b 100644 --- a/README.md +++ b/README.md @@ -952,7 +952,7 @@ experimental: plugins: souin: moduleName: github.com/darkweak/souin - version: v1.7.1 + version: v1.7.2 ``` After that you can declare either the whole configuration at once in the middleware block or by service. See the examples below. ```yaml diff --git a/pkg/surrogate/providers/common.go b/pkg/surrogate/providers/common.go index 981a75db7..01f39f59a 100644 --- a/pkg/surrogate/providers/common.go +++ b/pkg/surrogate/providers/common.go @@ -114,6 +114,7 @@ func (s *baseStorage) init(config configurationtypes.AbstractConfigurationInterf s.Storage = storer } else { + config.GetLogger().Debugf("Try to load the storer %s as surrogate backend", defaultStorerName) storer := core.GetRegisteredStorer(defaultStorerName) if storer == nil { config.GetLogger().Errorf("Impossible to retrieve the storers %s for the surrogate-keys fallback to the default storage", configuration.SurrogateConfiguration.Storer) @@ -210,7 +211,7 @@ func (s *baseStorage) purgeTag(tag string) []string { } // Store will take the lead to store the cache key for each provided Surrogate-key -func (s *baseStorage) Store(response *http.Response, cacheKey, uri string) error { +func (s *baseStorage) Store(response *http.Response, cacheKey, _ string) error { h := response.Header cacheKey = url.QueryEscape(cacheKey) @@ -238,11 +239,6 @@ func (s *baseStorage) Store(response *http.Response, cacheKey, uri string) error } } - if h.Get("Content-Location") != "" { - location := h.Get("Content-Location") - s.storeTag(location, cacheKey, urlRegexp) - } - return nil } diff --git a/plugins/beego/go.mod b/plugins/beego/go.mod index ef7a73403..4606b4a44 100644 --- a/plugins/beego/go.mod +++ b/plugins/beego/go.mod @@ -6,7 +6,7 @@ toolchain go1.22.4 require ( github.com/beego/beego/v2 v2.1.1 - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/darkweak/souin/plugins/souin v0.0.0-00010101000000-000000000000 github.com/darkweak/souin/plugins/souin/storages v0.0.0-00010101000000-000000000000 ) @@ -184,7 +184,7 @@ require ( ) replace ( - github.com/darkweak/souin v1.7.1 => ../.. + github.com/darkweak/souin v1.7.2 => ../.. github.com/darkweak/souin/plugins/souin => ../souin github.com/darkweak/souin/plugins/souin/storages => ../souin/storages ) diff --git a/plugins/caddy/go.mod b/plugins/caddy/go.mod index d7133768a..eb31950f1 100644 --- a/plugins/caddy/go.mod +++ b/plugins/caddy/go.mod @@ -4,7 +4,7 @@ go 1.22.1 require ( github.com/caddyserver/caddy/v2 v2.8.4 - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/darkweak/storages/core v0.0.8 ) @@ -153,4 +153,4 @@ require ( howett.net/plist v1.0.0 // indirect ) -replace github.com/darkweak/souin v1.7.1 => ../.. +replace github.com/darkweak/souin v1.7.2 => ../.. diff --git a/plugins/caddy/httpcache.go b/plugins/caddy/httpcache.go index 76246fba3..d72efd6ed 100644 --- a/plugins/caddy/httpcache.go +++ b/plugins/caddy/httpcache.go @@ -117,7 +117,7 @@ func (s *SouinCaddyMiddleware) configurationPropertyMapper() error { } func isProviderEmpty(c configurationtypes.CacheProvider) bool { - return c.Configuration == nil && c.Path == "" && c.URL == "" + return !c.Found } // FromApp to initialize configuration from App structure. diff --git a/plugins/chi/go.mod b/plugins/chi/go.mod index c9523c5cc..9dd91c219 100644 --- a/plugins/chi/go.mod +++ b/plugins/chi/go.mod @@ -3,7 +3,7 @@ module github.com/darkweak/souin/plugins/chi go 1.22.1 require ( - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/darkweak/souin/plugins/souin/storages v0.0.0-00010101000000-000000000000 github.com/go-chi/chi/v5 v5.0.12 ) @@ -179,6 +179,6 @@ require ( ) replace ( - github.com/darkweak/souin v1.7.1 => ../.. + github.com/darkweak/souin v1.7.2 => ../.. github.com/darkweak/souin/plugins/souin/storages => ../souin/storages ) diff --git a/plugins/dotweb/go.mod b/plugins/dotweb/go.mod index 00d51ef30..1a61ab0a1 100644 --- a/plugins/dotweb/go.mod +++ b/plugins/dotweb/go.mod @@ -3,7 +3,7 @@ module github.com/darkweak/souin/plugins/dotweb go 1.22.1 require ( - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/darkweak/souin/plugins/souin/storages v0.0.0-00010101000000-000000000000 github.com/devfeel/dotweb v1.7.21 ) @@ -180,6 +180,6 @@ require ( ) replace ( - github.com/darkweak/souin v1.7.1 => ../.. + github.com/darkweak/souin v1.7.2 => ../.. github.com/darkweak/souin/plugins/souin/storages => ../souin/storages ) diff --git a/plugins/echo/go.mod b/plugins/echo/go.mod index dcf904d4c..196d515b7 100644 --- a/plugins/echo/go.mod +++ b/plugins/echo/go.mod @@ -3,7 +3,7 @@ module github.com/darkweak/souin/plugins/echo go 1.22.1 require ( - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/darkweak/souin/plugins/souin/storages v0.0.0-00010101000000-000000000000 github.com/darkweak/storages/core v0.0.8 github.com/labstack/echo/v4 v4.11.1 @@ -182,6 +182,6 @@ require ( ) replace ( - github.com/darkweak/souin v1.7.1 => ../.. + github.com/darkweak/souin v1.7.2 => ../.. github.com/darkweak/souin/plugins/souin/storages => ../souin/storages ) diff --git a/plugins/fiber/go.mod b/plugins/fiber/go.mod index 6fc681729..0783e081b 100644 --- a/plugins/fiber/go.mod +++ b/plugins/fiber/go.mod @@ -3,7 +3,7 @@ module github.com/darkweak/souin/plugins/fiber go 1.22.1 require ( - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/darkweak/souin/plugins/souin/storages v0.0.0-00010101000000-000000000000 github.com/gofiber/fiber/v2 v2.52.1 github.com/valyala/fasthttp v1.51.0 @@ -185,6 +185,6 @@ require ( ) replace ( - github.com/darkweak/souin v1.7.1 => ../.. + github.com/darkweak/souin v1.7.2 => ../.. github.com/darkweak/souin/plugins/souin/storages => ../souin/storages ) diff --git a/plugins/gin/go.mod b/plugins/gin/go.mod index 1e0f61f37..f8b61cd01 100644 --- a/plugins/gin/go.mod +++ b/plugins/gin/go.mod @@ -3,7 +3,7 @@ module github.com/darkweak/souin/plugins/gin go 1.22.1 require ( - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/darkweak/souin/plugins/souin/storages v0.0.0-00010101000000-000000000000 github.com/gin-gonic/gin v1.9.1 ) @@ -196,6 +196,6 @@ require ( ) replace ( - github.com/darkweak/souin v1.7.1 => ../.. + github.com/darkweak/souin v1.7.2 => ../.. github.com/darkweak/souin/plugins/souin/storages => ../souin/storages ) diff --git a/plugins/go-zero/go.mod b/plugins/go-zero/go.mod index 24baa2b7c..a0696a11b 100644 --- a/plugins/go-zero/go.mod +++ b/plugins/go-zero/go.mod @@ -3,7 +3,7 @@ module github.com/darkweak/souin/plugins/go-zero go 1.22.1 require ( - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/darkweak/souin/plugins/souin/storages v0.0.0-00010101000000-000000000000 github.com/zeromicro/go-zero v1.6.2 ) @@ -199,6 +199,6 @@ require ( ) replace ( - github.com/darkweak/souin v1.7.1 => ../.. + github.com/darkweak/souin v1.7.2 => ../.. github.com/darkweak/souin/plugins/souin/storages => ../souin/storages ) diff --git a/plugins/goa/go.mod b/plugins/goa/go.mod index eb355e030..94874c695 100644 --- a/plugins/goa/go.mod +++ b/plugins/goa/go.mod @@ -3,7 +3,7 @@ module github.com/darkweak/souin/plugins/goa go 1.22.1 require ( - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/darkweak/souin/plugins/souin/storages v0.0.0-00010101000000-000000000000 github.com/darkweak/storages/core v0.0.8 goa.design/goa/v3 v3.12.3 @@ -181,6 +181,6 @@ require ( ) replace ( - github.com/darkweak/souin v1.7.1 => ../.. + github.com/darkweak/souin v1.7.2 => ../.. github.com/darkweak/souin/plugins/souin/storages => ../souin/storages ) diff --git a/plugins/goyave/go.mod b/plugins/goyave/go.mod index b9c053bce..063cd29d4 100644 --- a/plugins/goyave/go.mod +++ b/plugins/goyave/go.mod @@ -3,7 +3,7 @@ module github.com/darkweak/souin/plugins/goyave go 1.22.1 require ( - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/darkweak/souin/plugins/souin/storages v0.0.0-00010101000000-000000000000 goyave.dev/goyave/v4 v4.4.11 ) @@ -186,6 +186,6 @@ require ( ) replace ( - github.com/darkweak/souin v1.7.1 => ../.. + github.com/darkweak/souin v1.7.2 => ../.. github.com/darkweak/souin/plugins/souin/storages => ../souin/storages ) diff --git a/plugins/hertz/go.mod b/plugins/hertz/go.mod index d0c6f00d2..ad5b4030e 100644 --- a/plugins/hertz/go.mod +++ b/plugins/hertz/go.mod @@ -3,7 +3,7 @@ module github.com/darkweak/souin/plugins/hertz go 1.22.1 require ( - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/darkweak/souin/plugins/souin/storages v0.0.0-00010101000000-000000000000 ) @@ -195,6 +195,6 @@ require ( ) replace ( - github.com/darkweak/souin v1.7.1 => ../.. + github.com/darkweak/souin v1.7.2 => ../.. github.com/darkweak/souin/plugins/souin/storages => ../souin/storages ) diff --git a/plugins/kratos/go.mod b/plugins/kratos/go.mod index 236953598..2a6506c45 100644 --- a/plugins/kratos/go.mod +++ b/plugins/kratos/go.mod @@ -3,7 +3,7 @@ module github.com/darkweak/souin/plugins/kratos go 1.22.1 require ( - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/darkweak/souin/plugins/souin/storages v0.0.0-00010101000000-000000000000 github.com/go-kratos/kratos/v2 v2.7.0 gopkg.in/yaml.v3 v3.0.1 @@ -183,6 +183,6 @@ require ( ) replace ( - github.com/darkweak/souin v1.7.1 => ../.. + github.com/darkweak/souin v1.7.2 => ../.. github.com/darkweak/souin/plugins/souin/storages => ../souin/storages ) diff --git a/plugins/roadrunner/go.mod b/plugins/roadrunner/go.mod index 187aa9039..ca349989a 100644 --- a/plugins/roadrunner/go.mod +++ b/plugins/roadrunner/go.mod @@ -3,7 +3,7 @@ module github.com/darkweak/souin/plugins/roadrunner go 1.22.1 require ( - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/darkweak/souin/plugins/souin v0.0.0-00010101000000-000000000000 github.com/darkweak/souin/plugins/souin/storages v0.0.0-00010101000000-000000000000 github.com/roadrunner-server/errors v1.3.0 @@ -180,7 +180,7 @@ require ( ) replace ( - github.com/darkweak/souin v1.7.1 => ../.. + github.com/darkweak/souin v1.7.2 => ../.. github.com/darkweak/souin/plugins/souin => ../souin github.com/darkweak/souin/plugins/souin/storages => ../souin/storages ) diff --git a/plugins/skipper/go.mod b/plugins/skipper/go.mod index 424c5b0fa..4642b9cdc 100644 --- a/plugins/skipper/go.mod +++ b/plugins/skipper/go.mod @@ -3,7 +3,7 @@ module github.com/darkweak/souin/plugins/skipper go 1.22.1 require ( - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/darkweak/souin/plugins/souin/storages v0.0.0-00010101000000-000000000000 github.com/zalando/skipper v0.16.145 ) @@ -219,6 +219,6 @@ require ( ) replace ( - github.com/darkweak/souin v1.7.1 => ../.. + github.com/darkweak/souin v1.7.2 => ../.. github.com/darkweak/souin/plugins/souin/storages => ../souin/storages ) diff --git a/plugins/souin/go.mod b/plugins/souin/go.mod index aa1451bad..df223926a 100644 --- a/plugins/souin/go.mod +++ b/plugins/souin/go.mod @@ -3,12 +3,12 @@ module github.com/darkweak/souin/plugins/souin go 1.22.1 replace ( - github.com/darkweak/souin v1.7.1 => ../.. + github.com/darkweak/souin v1.7.2 => ../.. github.com/darkweak/souin/plugins/souin/storages => ./storages ) require ( - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/darkweak/souin/plugins/souin/storages v0.0.0-00010101000000-000000000000 github.com/darkweak/storages/core v0.0.8 github.com/fsnotify/fsnotify v1.7.0 diff --git a/plugins/souin/storages/go.mod b/plugins/souin/storages/go.mod index 835c4509d..a840100da 100644 --- a/plugins/souin/storages/go.mod +++ b/plugins/souin/storages/go.mod @@ -5,7 +5,7 @@ go 1.22.1 replace github.com/darkweak/souin => ../../.. require ( - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/darkweak/storages/badger v0.0.8 github.com/darkweak/storages/core v0.0.8 github.com/darkweak/storages/etcd v0.0.8 diff --git a/plugins/traefik/go.mod b/plugins/traefik/go.mod index 550b22dd3..bcd076e87 100644 --- a/plugins/traefik/go.mod +++ b/plugins/traefik/go.mod @@ -4,7 +4,7 @@ go 1.22.1 require ( github.com/akyoto/cache v1.0.6 - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/pquerna/cachecontrol v0.2.0 ) @@ -125,6 +125,6 @@ require ( ) replace ( - github.com/darkweak/souin v1.7.1 => ../.. + github.com/darkweak/souin v1.7.2 => ../.. go.uber.org/zap v1.26.0 => go.uber.org/zap v1.21.0 ) diff --git a/plugins/traefik/vendor/modules.txt b/plugins/traefik/vendor/modules.txt index 34a7bc15e..2e2975c6f 100644 --- a/plugins/traefik/vendor/modules.txt +++ b/plugins/traefik/vendor/modules.txt @@ -66,7 +66,7 @@ github.com/cpuguy83/go-md2man/v2/md2man # github.com/darkweak/go-esi v0.0.5 ## explicit; go 1.18 github.com/darkweak/go-esi/esi -# github.com/darkweak/souin v1.7.1 => ../.. +# github.com/darkweak/souin v1.7.2 => ../.. ## explicit; go 1.22.1 github.com/darkweak/souin/configurationtypes github.com/darkweak/souin/context diff --git a/plugins/tyk/go.mod b/plugins/tyk/go.mod index 8736a8a08..2148daeb3 100644 --- a/plugins/tyk/go.mod +++ b/plugins/tyk/go.mod @@ -5,7 +5,7 @@ go 1.22.1 require ( github.com/TykTechnologies/tyk v1.9.2-0.20230330071232-370295d796b5 github.com/cespare/xxhash/v2 v2.2.0 - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/darkweak/souin/plugins/souin v0.0.0-00010101000000-000000000000 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pquerna/cachecontrol v0.2.0 @@ -182,7 +182,7 @@ require ( ) replace ( - github.com/darkweak/souin v1.7.1 => ../.. + github.com/darkweak/souin v1.7.2 => ../.. github.com/darkweak/souin/plugins/souin => ../souin gopkg.in/alecthomas/kingpin.v2 v2.2.6 => github.com/alecthomas/kingpin/v2 v2.3.2 ) diff --git a/plugins/webgo/go.mod b/plugins/webgo/go.mod index 9629f6b00..0f04f9a24 100644 --- a/plugins/webgo/go.mod +++ b/plugins/webgo/go.mod @@ -4,7 +4,7 @@ go 1.22.1 require ( github.com/bnkamalesh/webgo/v6 v6.7.0 - github.com/darkweak/souin v1.7.1 + github.com/darkweak/souin v1.7.2 github.com/darkweak/souin/plugins/souin/storages v0.0.0-00010101000000-000000000000 ) @@ -179,6 +179,6 @@ require ( ) replace ( - github.com/darkweak/souin v1.7.1 => ../.. + github.com/darkweak/souin v1.7.2 => ../.. github.com/darkweak/souin/plugins/souin/storages => ../souin/storages )