test: add accessor methods and improve config change tests

Author: waveywaves

pkg/remoteresolution/resolver/framework/cache/cache.go

@@ -34,17 +34,19 @@ var _ resolutionframework.ConfigWatcher = (*resolverCache)(nil)
 // resolverCache is a wrapper around utilcache.LRUExpireCache that provides
 // type-safe methods for caching resolver results.
 type resolverCache struct {
-	cache  *utilcache.LRUExpireCache
-	logger *zap.SugaredLogger
-	ttl    time.Duration
-	clock  Clock
+	cache   *utilcache.LRUExpireCache
+	logger  *zap.SugaredLogger
+	ttl     time.Duration
+	maxSize int
+	clock   Clock
 }
 
 func newResolverCache(maxSize int, ttl time.Duration) *resolverCache {
 	return &resolverCache{
-		cache: utilcache.NewLRUExpireCache(maxSize),
-		ttl:   ttl,
-		clock: realClock{},
+		cache:   utilcache.NewLRUExpireCache(maxSize),
+		ttl:     ttl,
+		maxSize: maxSize,
+		clock:   realClock{},
 	}
 }
 
@@ -56,7 +58,17 @@ func (c *resolverCache) GetConfigName(_ context.Context) string {
 // withLogger returns a new ResolverCache instance with the provided logger.
 // This prevents state leak by not storing logger in the global singleton.
 func (c *resolverCache) withLogger(logger *zap.SugaredLogger) *resolverCache {
-	return &resolverCache{logger: logger, cache: c.cache, ttl: c.ttl, clock: c.clock}
+	return &resolverCache{logger: logger, cache: c.cache, ttl: c.ttl, maxSize: c.maxSize, clock: c.clock}
+}
+
+// TTL returns the time-to-live duration for cache entries.
+func (c *resolverCache) TTL() time.Duration {
+	return c.ttl
+}
+
+// MaxSize returns the maximum number of entries the cache can hold.
+func (c *resolverCache) MaxSize() int {
+	return c.maxSize
 }
 
 // Get retrieves a cached resource by resolver type and parameters, returning

pkg/remoteresolution/resolver/framework/cache/configstore_test.go

@@ -198,7 +198,7 @@ func TestParseCacheConfigMap(t *testing.T) {
 }
 
 func TestOnCacheConfigChanged(t *testing.T) {
-	// Test that onCacheConfigChanged updates the shared cache
+	// Test that onCacheConfigChanged updates the shared cache with new config values
 	config := &cacheConfig{
 		maxSize: 500,
 		ttl:     10 * time.Minute,
@@ -207,25 +207,56 @@ func TestOnCacheConfigChanged(t *testing.T) {
 	// Call onCacheConfigChanged to update the shared cache
 	onCacheConfigChanged("test-config", config)
 
-	// Verify the shared cache was updated by checking we can still get it
-	// We can't directly verify the size/ttl without accessing the internal cache,
-	// but we can verify it doesn't panic and returns a valid cache
+	// Verify the shared cache was updated with the correct config values
 	ctx := logtesting.TestContextWithLogger(t)
 	cache := Get(ctx)
 	if cache == nil {
-		t.Error("Expected cache after config change but got nil")
+		t.Fatal("Expected cache after config change but got nil")
+	}
+
+	// Verify TTL was applied
+	if cache.TTL() != config.ttl {
+		t.Errorf("Expected TTL to be %v, got %v", config.ttl, cache.TTL())
+	}
+
+	// Verify MaxSize was applied
+	if cache.MaxSize() != config.maxSize {
+		t.Errorf("Expected MaxSize to be %d, got %d", config.maxSize, cache.MaxSize())
 	}
 }
 
 func TestOnCacheConfigChangedWithInvalidType(t *testing.T) {
+	// First, set up a known good config
+	goodConfig := &cacheConfig{
+		maxSize: defaultCacheSize,
+		ttl:     defaultExpiration,
+	}
+	onCacheConfigChanged("test-config", goodConfig)
+
+	ctx := logtesting.TestContextWithLogger(t)
+	cacheBefore := Get(ctx)
+	if cacheBefore == nil {
+		t.Fatal("Expected cache before invalid config change")
+	}
+	ttlBefore := cacheBefore.TTL()
+	maxSizeBefore := cacheBefore.MaxSize()
+
 	// Test that onCacheConfigChanged handles invalid types gracefully
-	// This should not panic
+	// This should not panic and should preserve the existing cache
 	onCacheConfigChanged("test-config", "invalid-type")
 
-	// Verify we can still get the cache
-	ctx := logtesting.TestContextWithLogger(t)
-	cache := Get(ctx)
-	if cache == nil {
-		t.Error("Expected cache after invalid config change but got nil")
+	// Verify we can still get the cache and it wasn't modified
+	cacheAfter := Get(ctx)
+	if cacheAfter == nil {
+		t.Fatal("Expected cache after invalid config change but got nil")
+	}
+
+	// Verify cache config wasn't changed by invalid input
+	if cacheAfter.TTL() != ttlBefore {
+		t.Errorf("Expected TTL to remain %v after invalid config, got %v", ttlBefore, cacheAfter.TTL())
+	}
+
+	if cacheAfter.MaxSize() != maxSizeBefore {
+		t.Errorf("Expected MaxSize to remain %d after invalid config, got %d", maxSizeBefore, cacheAfter.MaxSize())
 	}
 }