feat: add cache invalidation

Author: christophwitzko

internal/server/cache.go

@@ -3,6 +3,7 @@ package server
 import (
 	"fmt"
 	"net/http"
+	"strings"
 
 	"github.com/patrickmn/go-cache"
 )
@@ -21,6 +22,10 @@ func (s *Server) getCacheKeyFromRequest(r *http.Request) cacheKey {
 	return cacheKey(fmt.Sprintf("%s/%s:%s", cacheKeyPrefixRequest, r.Method, r.URL.EscapedPath()))
 }
 
+func (s *Server) getCacheKeyPrefixFromPluginName(pluginName string) cacheKey {
+	return cacheKey(fmt.Sprintf("%s/%s:/api/v2/plugins/%s", cacheKeyPrefixRequest, http.MethodGet, pluginName))
+}
+
 func (s *Server) getCacheKeyWithPrefix(p cacheKeyPrefix, key string) cacheKey {
 	return cacheKey(fmt.Sprintf("%s/%s", p, key))
 }
@@ -32,3 +37,26 @@ func (s *Server) getFromCache(k cacheKey) (any, bool) {
 func (s *Server) setInCache(k cacheKey, v any) {
 	s.cache.Set(string(k), v, cache.DefaultExpiration)
 }
+
+func (s *Server) invalidateByPrefix(prefix cacheKey) {
+	for k := range s.cache.Items() {
+		if strings.HasPrefix(k, string(prefix)) {
+			s.cache.Delete(k)
+		}
+	}
+}
+
+func (s *Server) cacheMiddleware(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if s.config.DisableRequestCache {
+			next.ServeHTTP(w, r)
+			return
+		}
+		if k, ok := s.getFromCache(s.getCacheKeyFromRequest(r)); ok {
+			w.Header().Set("X-Go-Cache", "HIT")
+			s.writeJSON(w, k)
+			return
+		}
+		next.ServeHTTP(w, r)
+	})
+}

internal/server/handler_batch.go

@@ -147,6 +147,7 @@ func (s *Server) batchGetPlugins(w http.ResponseWriter, r *http.Request) {
 		ContentType: aws.String("application/gzip"),
 		Metadata: map[string]string{
 			"checksum": tgzChecksum,
+			"hash":     batchResponse.DownloadHash,
 		},
 	})
 	if closeErr := tarFile.Close(); closeErr != nil {

internal/server/handlers.go

@@ -28,6 +28,7 @@ func (s *Server) updateAllPlugins(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	}
+	s.invalidateByPrefix(s.getCacheKeyPrefixFromPluginName(""))
 	s.writeJSON(w, map[string]bool{"ok": true})
 }
 
@@ -46,6 +47,8 @@ func (s *Server) updatePlugin(w http.ResponseWriter, r *http.Request) {
 		s.writeJSONError(w, r, http.StatusInternalServerError, err, "could not update plugin")
 		return
 	}
+
+	s.invalidateByPrefix(s.getCacheKeyPrefixFromPluginName(p.GetFullName()))
 	s.writeJSON(w, map[string]bool{"ok": true})
 }
 

internal/server/middleware.go

@@ -39,18 +39,3 @@ func (s *Server) recoverMiddleware(next http.Handler) http.Handler {
 		next.ServeHTTP(w, r)
 	})
 }
-
-func (s *Server) cacheMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if s.config.DisableRequestCache {
-			next.ServeHTTP(w, r)
-			return
-		}
-		if k, ok := s.getFromCache(s.getCacheKeyFromRequest(r)); ok {
-			w.Header().Set("X-Cache", "HIT")
-			s.writeJSON(w, k)
-			return
-		}
-		next.ServeHTTP(w, r)
-	})
-}