fix(configuration): load mapping_eviction_interval properly

Author: darkweak

plugins/caddy/configuration.go

@@ -60,6 +60,8 @@ type DefaultCache struct {
 	Stale configurationtypes.Duration `json:"stale"`
 	// Disable the coalescing system.
 	DisableCoalescing bool `json:"disable_coalescing"`
+	// MappingEvictionInterval interval between eviction
+	MappingEvictionInterval configurationtypes.Duration `json:"mapping_eviction_interval"`
 }
 
 // GetAllowedHTTPVerbs returns the allowed verbs to cache
@@ -107,6 +109,11 @@ func (d *DefaultCache) GetEtcd() configurationtypes.CacheProvider {
 	return d.Etcd
 }
 
+// GetMappingEvictionInterval returns the interval between eviction
+func (d *DefaultCache) GetMappingEvictionInterval() time.Duration {
+	return d.MappingEvictionInterval.Duration
+}
+
 // GetMode returns mdoe configuration
 func (d *DefaultCache) GetMode() string {
 	return d.Mode
@@ -763,6 +770,12 @@ func parseConfiguration(cfg *Configuration, h *caddyfile.Dispenser, isGlobal boo
 				}
 			case "disable_coalescing":
 				cfg.DefaultCache.DisableCoalescing = true
+			case "mapping_eviction_interval":
+				args := h.RemainingArgs()
+				interval, err := time.ParseDuration(args[0])
+				if err == nil {
+					cfg.DefaultCache.MappingEvictionInterval.Duration = interval
+				}
 			case "disable_surrogate_key":
 				cfg.SurrogateKeyDisabled = true
 			default:

plugins/caddy/httpcache.go

@@ -296,8 +296,9 @@ func parseCaddyfileGlobalOption(h *caddyfile.Dispenser, _ interface{}) (interfac
 			TTL: configurationtypes.Duration{
 				Duration: 120 * time.Second,
 			},
-			DefaultCacheControl: "",
-			CacheName:           "",
+			MappingEvictionInterval: configurationtypes.Duration{Duration: time.Hour},
+			DefaultCacheControl:     "",
+			CacheName:               "",
 		},
 		URLs: make(map[string]configurationtypes.URL),
 	}

plugins/souin/agnostic/configuration_parser.go

@@ -104,9 +104,10 @@ func parseDefaultCache(dcConfiguration map[string]interface{}) *configurationtyp
 			Path:          "",
 			Configuration: nil,
 		},
-		Regex:               configurationtypes.Regex{},
-		TTL:                 configurationtypes.Duration{},
-		DefaultCacheControl: "",
+		Regex:                   configurationtypes.Regex{},
+		TTL:                     configurationtypes.Duration{},
+		MappingEvictionInterval: configurationtypes.Duration{Duration: time.Hour},
+		DefaultCacheControl:     "",
 	}
 	for defaultCacheK, defaultCacheV := range dcConfiguration {
 		switch defaultCacheK {
@@ -195,6 +196,11 @@ func parseDefaultCache(dcConfiguration map[string]interface{}) *configurationtyp
 					}
 				}
 			}
+		case "mapping_eviction_interval":
+			eviction, err := time.ParseDuration(defaultCacheV.(string))
+			if err == nil {
+				dc.MappingEvictionInterval = configurationtypes.Duration{Duration: eviction}
+			}
 		case "mode":
 			dc.Mode, _ = defaultCacheV.(string)
 		case "nats":