fix(chore): caddy default provider check (#551)

darkweak · Sep 19, 2024 · 22abb94 · 22abb94
1 parent 12a2857
commit 22abb94
Show file tree

Hide file tree

Showing 23 changed files with 45 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -952,7 +952,7 @@ experimental:
   plugins:
     souin:
       moduleName: github.com/darkweak/souin
-      version: v1.7.0
+      version: v1.7.1
 ```
 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/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.0
+	github.com/darkweak/souin v1.7.1
 	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.0 => ../..
+	github.com/darkweak/souin v1.7.1 => ../..
 	github.com/darkweak/souin/plugins/souin => ../souin
 	github.com/darkweak/souin/plugins/souin/storages => ../souin/storages
 )
diff --git a/plugins/caddy/dispatch.go b/plugins/caddy/dispatch.go
@@ -121,7 +121,7 @@ func (s *SouinCaddyMiddleware) parseStorages(ctx caddy.Context) {
 			address := redis.URL
 			username := ""
 			dbname := "0"
-			cname := ""
+			cname := "souin-redis"
 			if c := redis.Configuration; c != nil {
 				p, ok := c.(map[string]interface{})
 				if ok {

diff --git 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.0
+	github.com/darkweak/souin v1.7.1
 	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.0 => ../..
+replace github.com/darkweak/souin v1.7.1 => ../..
diff --git a/plugins/caddy/httpcache.go b/plugins/caddy/httpcache.go
@@ -116,6 +116,10 @@ func (s *SouinCaddyMiddleware) configurationPropertyMapper() error {
 	return nil
 }
 
+func isProviderEmpty(c configurationtypes.CacheProvider) bool {
+	return c.Configuration == nil && c.Path == "" && c.URL == ""
+}
+
 // FromApp to initialize configuration from App structure.
 func (s *SouinCaddyMiddleware) FromApp(app *SouinApp) error {
 	if s.Configuration.GetDefaultCache() == nil {
@@ -199,7 +203,7 @@ func (s *SouinCaddyMiddleware) FromApp(app *SouinApp) error {
 	if dc.CacheName == "" {
 		s.Configuration.DefaultCache.CacheName = appDc.CacheName
 	}
-	if !s.Configuration.DefaultCache.Distributed && !dc.Olric.Found && !dc.Redis.Found && !dc.Etcd.Found && !dc.Badger.Found && !dc.Nuts.Found && !dc.Otter.Found {
+	if isProviderEmpty(dc.Badger) && isProviderEmpty(dc.Etcd) && isProviderEmpty(dc.Nats) && isProviderEmpty(dc.Nuts) && isProviderEmpty(dc.Olric) && isProviderEmpty(dc.Otter) && isProviderEmpty(dc.Redis) {
 		s.Configuration.DefaultCache.Distributed = appDc.Distributed
 		s.Configuration.DefaultCache.Olric = appDc.Olric
 		s.Configuration.DefaultCache.Redis = appDc.Redis

diff --git 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.0
+	github.com/darkweak/souin v1.7.1
 	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.0 => ../..
+	github.com/darkweak/souin v1.7.1 => ../..
 	github.com/darkweak/souin/plugins/souin/storages => ../souin/storages
 )
diff --git 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.0
+	github.com/darkweak/souin v1.7.1
 	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.0 => ../..
+	github.com/darkweak/souin v1.7.1 => ../..
 	github.com/darkweak/souin/plugins/souin/storages => ../souin/storages
 )
diff --git 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.0
+	github.com/darkweak/souin v1.7.1
 	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.0 => ../..
+	github.com/darkweak/souin v1.7.1 => ../..
 	github.com/darkweak/souin/plugins/souin/storages => ../souin/storages
 )
diff --git 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.0
+	github.com/darkweak/souin v1.7.1
 	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.0 => ../..
+	github.com/darkweak/souin v1.7.1 => ../..
 	github.com/darkweak/souin/plugins/souin/storages => ../souin/storages
 )
diff --git 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.0
+	github.com/darkweak/souin v1.7.1
 	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.0 => ../..
+	github.com/darkweak/souin v1.7.1 => ../..
 	github.com/darkweak/souin/plugins/souin/storages => ../souin/storages
 )
diff --git 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.0
+	github.com/darkweak/souin v1.7.1
 	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.0 => ../..
+	github.com/darkweak/souin v1.7.1 => ../..
 	github.com/darkweak/souin/plugins/souin/storages => ../souin/storages
 )
diff --git 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.0
+	github.com/darkweak/souin v1.7.1
 	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.0 => ../..
+	github.com/darkweak/souin v1.7.1 => ../..
 	github.com/darkweak/souin/plugins/souin/storages => ../souin/storages
 )
diff --git 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.0
+	github.com/darkweak/souin v1.7.1
 	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.0 => ../..
+	github.com/darkweak/souin v1.7.1 => ../..
 	github.com/darkweak/souin/plugins/souin/storages => ../souin/storages
 )
diff --git 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.0
+	github.com/darkweak/souin v1.7.1
 	github.com/darkweak/souin/plugins/souin/storages v0.0.0-00010101000000-000000000000
 )
 
@@ -195,6 +195,6 @@ require (
 )
 
 replace (
-	github.com/darkweak/souin v1.7.0 => ../..
+	github.com/darkweak/souin v1.7.1 => ../..
 	github.com/darkweak/souin/plugins/souin/storages => ../souin/storages
 )
diff --git 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.0
+	github.com/darkweak/souin v1.7.1
 	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.0 => ../..
+	github.com/darkweak/souin v1.7.1 => ../..
 	github.com/darkweak/souin/plugins/souin/storages => ../souin/storages
 )
diff --git 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.0
+	github.com/darkweak/souin v1.7.1
 	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.0 => ../..
+	github.com/darkweak/souin v1.7.1 => ../..
 	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
@@ -3,7 +3,7 @@ module github.com/darkweak/souin/plugins/skipper
 go 1.22.1
 
 require (
-	github.com/darkweak/souin v1.7.0
+	github.com/darkweak/souin v1.7.1
 	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.0 => ../..
+	github.com/darkweak/souin v1.7.1 => ../..
 	github.com/darkweak/souin/plugins/souin/storages => ../souin/storages
 )
diff --git 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.0 => ../..
+	github.com/darkweak/souin v1.7.1 => ../..
 	github.com/darkweak/souin/plugins/souin/storages => ./storages
 )
 
 require (
-	github.com/darkweak/souin v1.7.0
+	github.com/darkweak/souin v1.7.1
 	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
@@ -5,7 +5,7 @@ go 1.22.1
 replace github.com/darkweak/souin => ../../..
 
 require (
-	github.com/darkweak/souin v1.7.0
+	github.com/darkweak/souin v1.7.1
 	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
@@ -4,7 +4,7 @@ go 1.22.1
 
 require (
 	github.com/akyoto/cache v1.0.6
-	github.com/darkweak/souin v1.7.0
+	github.com/darkweak/souin v1.7.1
 	github.com/pquerna/cachecontrol v0.2.0
 )
 
@@ -125,6 +125,6 @@ require (
 )
 
 replace (
-	github.com/darkweak/souin v1.7.0 => ../..
+	github.com/darkweak/souin v1.7.1 => ../..
 	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
@@ -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.0 => ../..
+# github.com/darkweak/souin v1.7.1 => ../..
 ## 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
@@ -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.0
+	github.com/darkweak/souin v1.7.1
 	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.0 => ../..
+	github.com/darkweak/souin v1.7.1 => ../..
 	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
@@ -4,7 +4,7 @@ go 1.22.1
 
 require (
 	github.com/bnkamalesh/webgo/v6 v6.7.0
-	github.com/darkweak/souin v1.7.0
+	github.com/darkweak/souin v1.7.1
 	github.com/darkweak/souin/plugins/souin/storages v0.0.0-00010101000000-000000000000
 )
 
@@ -179,6 +179,6 @@ require (
 )
 
 replace (
-	github.com/darkweak/souin v1.7.0 => ../..
+	github.com/darkweak/souin v1.7.1 => ../..
 	github.com/darkweak/souin/plugins/souin/storages => ../souin/storages
 )