feat(plugins): vendorize Traefik & Tyk

darkweak · Mar 11, 2024 · afa055c · afa055c
1 parent 7d2b41f
commit afa055c
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 20 deletions.
diff --git a/plugins/traefik/override/middleware/middleware.go b/plugins/traefik/override/middleware/middleware.go
@@ -32,7 +32,7 @@ func NewHTTPCacheHandler(c configurationtypes.AbstractConfigurationInterface) *S
 	}
 	fmt.Println("Storers initialized.")
 	regexpUrls := helpers.InitializeRegexp(c)
-	surrogateStorage := surrogate.InitializeSurrogate(c)
+	surrogateStorage := surrogate.InitializeSurrogate(c, storers[0].Name())
 	fmt.Println("Surrogate storage initialized.")
 	var excludedRegexp *regexp.Regexp = nil
 	if c.GetDefaultCache().GetRegex().Exclude != "" {

diff --git a/plugins/traefik/override/surrogate/providers/common.go b/plugins/traefik/override/surrogate/providers/common.go
@@ -83,7 +83,7 @@ type baseStorage struct {
 	duration   time.Duration
 }
 
-func (s *baseStorage) init(config configurationtypes.AbstractConfigurationInterface) {
+func (s *baseStorage) init(config configurationtypes.AbstractConfigurationInterface, _ string) {
 	storers, err := storage.NewStorages(config)
 	if err != nil {
 		panic(fmt.Sprintf("Impossible to instanciate the storer for the surrogate-keys: %v", err))

diff --git a/plugins/traefik/vendor/github.com/darkweak/souin/pkg/middleware/middleware.go b/plugins/traefik/vendor/github.com/darkweak/souin/pkg/middleware/middleware.go
diff --git a/plugins/traefik/vendor/github.com/darkweak/souin/pkg/surrogate/providers/akamai.go b/plugins/traefik/vendor/github.com/darkweak/souin/pkg/surrogate/providers/akamai.go
diff --git a/plugins/traefik/vendor/github.com/darkweak/souin/pkg/surrogate/providers/cloudflare.go b/plugins/traefik/vendor/github.com/darkweak/souin/pkg/surrogate/providers/cloudflare.go
diff --git a/plugins/traefik/vendor/github.com/darkweak/souin/pkg/surrogate/providers/common.go b/plugins/traefik/vendor/github.com/darkweak/souin/pkg/surrogate/providers/common.go
diff --git a/plugins/traefik/vendor/github.com/darkweak/souin/pkg/surrogate/providers/factory.go b/plugins/traefik/vendor/github.com/darkweak/souin/pkg/surrogate/providers/factory.go
diff --git a/plugins/traefik/vendor/github.com/darkweak/souin/pkg/surrogate/providers/fastly.go b/plugins/traefik/vendor/github.com/darkweak/souin/pkg/surrogate/providers/fastly.go
diff --git a/plugins/traefik/vendor/github.com/darkweak/souin/pkg/surrogate/providers/souin.go b/plugins/traefik/vendor/github.com/darkweak/souin/pkg/surrogate/providers/souin.go
diff --git a/plugins/traefik/vendor/github.com/darkweak/souin/pkg/surrogate/surrogate.go b/plugins/traefik/vendor/github.com/darkweak/souin/pkg/surrogate/surrogate.go
diff --git a/plugins/tyk/override/middleware/middleware.go b/plugins/tyk/override/middleware/middleware.go
@@ -61,7 +61,7 @@ func NewHTTPCacheHandler(c configurationtypes.AbstractConfigurationInterface) *S
 	}
 	c.GetLogger().Debug("Storer initialized.")
 	regexpUrls := helpers.InitializeRegexp(c)
-	surrogateStorage := surrogate.InitializeSurrogate(c)
+	surrogateStorage := surrogate.InitializeSurrogate(c, storers[0].Name())
 	c.GetLogger().Debug("Surrogate storage initialized.")
 	var excludedRegexp *regexp.Regexp = nil
 	if c.GetDefaultCache().GetRegex().Exclude != "" {