Added methods to cache midelware

evg4b · Jul 6, 2023 · 460b93d · 460b93d
1 parent 38865d0
commit 460b93d
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 2 deletions.
diff --git a/internal/config/cache.go b/internal/config/cache.go
@@ -20,11 +20,18 @@ func (globs CacheGlobs) Clone() CacheGlobs {
 type CacheConfig struct {
 	ExpirationTime time.Duration `mapstructure:"expiration-time"`
 	ClearTime      time.Duration `mapstructure:"clear-time"`
+	Methods        []string      `mapstructure:"methods"`
 }
 
 func (config *CacheConfig) Clone() *CacheConfig {
+	var methods []string = nil
+	if config.Methods != nil {
+		methods = append(methods, config.Methods...)
+	}
+
 	return &CacheConfig{
 		ExpirationTime: config.ExpirationTime,
 		ClearTime:      config.ClearTime,
+		Methods:        methods,
 	}
 }
diff --git a/internal/config/cache_test.go b/internal/config/cache_test.go
@@ -1,6 +1,7 @@
 package config_test
 
 import (
+	"net/http"
 	"testing"
 	"time"
 
@@ -31,6 +32,7 @@ func TestCacheConfigClone(t *testing.T) {
 	cacheConfig := &config.CacheConfig{
 		ExpirationTime: 5 * time.Minute,
 		ClearTime:      30 * time.Second,
+		Methods:        []string{http.MethodGet, http.MethodPost},
 	}
 
 	clonedCacheConfig := cacheConfig.Clone()
@@ -42,4 +44,8 @@ func TestCacheConfigClone(t *testing.T) {
 	t.Run("equals values", func(t *testing.T) {
 		assert.EqualValues(t, cacheConfig, clonedCacheConfig)
 	})
+
+	t.Run("not same methods", func(t *testing.T) {
+		assert.NotSame(t, cacheConfig.Methods, clonedCacheConfig.Methods)
+	})
 }
diff --git a/internal/config/config_test.go b/internal/config/config_test.go
@@ -1,6 +1,7 @@
 package config_test
 
 import (
+	"net/http"
 	"testing"
 	"time"
 
@@ -51,6 +52,9 @@ key-file: /etc/certificates/key-file.key
 cache-config:
   expiration-time: 1h
   clear-time: 30m
+  methods:
+    - GET
+    - POST
 `
 )
 
@@ -96,6 +100,7 @@ func TestLoadConfiguration(t *testing.T) {
 					CacheConfig: config.CacheConfig{
 						ExpirationTime: config.DefaultExpirationTime,
 						ClearTime:      config.DefaultClearTime,
+						Methods:        []string{http.MethodGet},
 					},
 				},
 			},
@@ -111,6 +116,7 @@ func TestLoadConfiguration(t *testing.T) {
 					CacheConfig: config.CacheConfig{
 						ExpirationTime: config.DefaultExpirationTime,
 						ClearTime:      config.DefaultClearTime,
+						Methods:        []string{http.MethodGet},
 					},
 				},
 			},
@@ -154,6 +160,10 @@ func TestLoadConfiguration(t *testing.T) {
 					CacheConfig: config.CacheConfig{
 						ExpirationTime: time.Hour,
 						ClearTime:      30 * time.Minute,
+						Methods: []string{
+							http.MethodGet,
+							http.MethodPost,
+						},
 					},
 				},
 			},
@@ -205,6 +215,10 @@ func TestLoadConfiguration(t *testing.T) {
 					CacheConfig: config.CacheConfig{
 						ExpirationTime: time.Hour,
 						ClearTime:      30 * time.Minute,
+						Methods: []string{
+							http.MethodGet,
+							http.MethodPost,
+						},
 					},
 				},
 			},

diff --git a/internal/config/default.go b/internal/config/default.go
@@ -1,6 +1,7 @@
 package config
 
 import (
+	"net/http"
 	"time"
 
 	"github.com/spf13/viper"
@@ -14,4 +15,5 @@ const (
 func setDefaultValues(instance *viper.Viper) {
 	instance.SetDefault("cache-config.expiration-time", DefaultExpirationTime)
 	instance.SetDefault("cache-config.clear-time", DefaultClearTime)
+	instance.SetDefault("cache-config.methods", []string{http.MethodGet})
 }
diff --git a/internal/config/mapping.go b/internal/config/mapping.go
@@ -21,6 +21,7 @@ func (u *Mapping) Clone() Mapping {
 		To:      u.To,
 		Statics: u.Statics.Clone(),
 		Mocks:   u.Mocks.Clone(),
+		Cache:   u.Cache.Clone(),
 	}
 }
 

diff --git a/internal/config/mappings.go b/internal/config/mappings.go
@@ -25,6 +25,9 @@ func (mappings Mappings) String() string {
 		for _, static := range mapping.Statics {
 			builder.WriteString(sfmt.Sprintf("    static: %s => %s\n", static.Path, static.Dir))
 		}
+		for _, cacheGlob := range mapping.Cache {
+			builder.WriteString(sfmt.Sprintf("    cache: %s\n", cacheGlob))
+		}
 	}
 
 	builder.WriteString("\n")

diff --git a/internal/handler/cache/middleware_test.go b/internal/handler/cache/middleware_test.go
@@ -27,7 +27,7 @@ func TestNewMiddleware(t *testing.T) {
 	middleware := cache.NewMiddleware(
 		cache.WithCacheStorage(goCache.New(time.Minute, time.Minute)),
 		cache.WithLogger(mocks.NewNoopLogger(t)),
-		cache.WithMethods(http.MethodGet),
+		cache.WithMethods([]string{http.MethodGet}),
 		cache.WithGlobs(config.CacheGlobs{
 			"/translations",
 			"/api/**",

diff --git a/internal/handler/cache/options.go b/internal/handler/cache/options.go
@@ -20,7 +20,7 @@ func WithPrefix(prefix string) MiddlewareOption {
 	}
 }
 
-func WithMethods(methods ...string) MiddlewareOption {
+func WithMethods(methods []string) MiddlewareOption {
 	return func(m *Middleware) {
 		m.methods = methods
 	}

diff --git a/main.go b/main.go
@@ -89,6 +89,7 @@ func main() {
 			return cache.NewMiddleware(
 				cache.WithLogger(ui.CacheLogger),
 				cache.WithPrefix(key),
+				cache.WithMethods(cacheConfig.Methods),
 				cache.WithCacheStorage(cacheStorage),
 				cache.WithGlobs(globs),
 			)