upstream: fix(cache): avoid double prefix when removing expired entries (goharbor/harbor#23913)

Signed-off-by: Hanabi <317387557+Hanabi9248@users.noreply.github.com>

(cherry picked from commit 8ca2cc23229e577fa72ddb9f0088bdd5beda827f)

Upstream-Commit: 8ca2cc23229e577fa72ddb9f0088bdd5beda827f
Upstream-PR: goharbor/harbor#23913
Upstream-Author: @Hanabi9248
Cherry-Pick-Status: clean
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: github-actions[bot]

src/lib/cache/memory/memory.go

@@ -51,7 +51,7 @@ func (c *Cache) Contains(ctx context.Context, key string) bool {
 	}
 
 	if e.(*entry).isExpirated() {
-		err := c.Delete(ctx, c.opts.Key(key))
+		err := c.Delete(ctx, key)
 		log.Errorf("failed to delete cache in Contains() method when it's expired, error: %v", err)
 		return false
 	}
@@ -74,7 +74,7 @@ func (c *Cache) Fetch(ctx context.Context, key string, value any) error {
 
 	e := v.(*entry)
 	if e.isExpirated() {
-		err := c.Delete(ctx, c.opts.Key(key))
+		err := c.Delete(ctx, key)
 		if err != nil {
 			log.Errorf("failed to delete cache in Fetch() method when it's expired, error: %v", err)
 		}

src/lib/cache/memory/memory_test.go

@@ -20,6 +20,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
 	"github.com/goharbor/harbor/src/lib/cache"
@@ -164,6 +165,29 @@ func TestCacheTestSuite(t *testing.T) {
 	suite.Run(t, new(CacheTestSuite))
 }
 
+func TestExpiredPrefixedEntry(t *testing.T) {
+	for _, operation := range []string{"contains", "fetch"} {
+		t.Run(operation, func(t *testing.T) {
+			ctx := context.Background()
+			c, err := cache.New("memory", cache.Prefix("prefix:"))
+			require.NoError(t, err)
+			require.NoError(t, c.Save(ctx, "key", "expired", -time.Second))
+			require.NoError(t, c.Save(ctx, "prefix:key", "live"))
+			if operation == "contains" {
+				require.False(t, c.Contains(ctx, "key"))
+			} else {
+				var value string
+				require.ErrorIs(t, c.Fetch(ctx, "key", &value), cache.ErrNotFound)
+			}
+			var value string
+			require.NoError(t, c.Fetch(ctx, "prefix:key", &value))
+			require.Equal(t, "live", value)
+			_, exists := c.(*Cache).storage.Load("prefix:key")
+			require.False(t, exists, "the expired entry must be removed")
+		})
+	}
+}
+
 func BenchmarkCacheFetchParallel(b *testing.B) {
 	key := "benchmark"
 	cache, _ := cache.New("memory")