revert changes to cache

coder · Emyrk · May 16, 2025 · May 14, 2025 · May 14, 2025 · May 14, 2025
commit a5ee3747dff2e51cf0052bc57385bfb9c5ba78cd
@@ -14,18 +14,10 @@ import (
 	"github.com/coder/coder/v2/coderd/util/lazy"
 )
 
-func New(fetch fetcher) *Cache {
-	return &Cache{
-		lock:    sync.Mutex{},
-		data:    make(map[uuid.UUID]*cacheEntry),
-		fetcher: fetch,
-	}
-}
-
 // NewFromStore returns a file cache that will fetch files from the provided
 // database.
-func NewFromStore(store database.Store) *Cache {
-	fetch := func(ctx context.Context, fileID uuid.UUID) (fs.FS, error) {
+func NewFromStore(store database.Store) Cache {
+	fetcher := func(ctx context.Context, fileID uuid.UUID) (fs.FS, error) {
 		file, err := store.GetFileByID(ctx, fileID)
 		if err != nil {
 			return nil, xerrors.Errorf("failed to read file from database: %w", err)
@@ -35,7 +27,11 @@ func NewFromStore(store database.Store) *Cache {
 		return archivefs.FromTarReader(content), nil
 	}
 
-	return New(fetch)
+	return Cache{
+		lock:    sync.Mutex{},
+		data:    make(map[uuid.UUID]*cacheEntry),
+		fetcher: fetcher,
+	}
 }
 
 // Cache persists the files for template versions, and is used by dynamic

diff --git a/coderd/parameters_internal_test.go b/coderd/parameters_internal_test.go