fix: rework response cache tag storage (#8692)

carodewig · web-flow · commit 41d09ffdef2b · 2025-12-02T08:40:59.000-05:00
diff --git a/apollo-router/src/cache/redis.rs b/apollo-router/src/cache/redis.rs
@@ -869,6 +869,16 @@ impl RedisCacheStorage {
         self.delete_from_scan_result(keys.into_iter()).await?;
         Ok(())
     }
+
+    pub(crate) fn strip_namespace(&self, key: String) -> String {
+        match &self.namespace {
+            Some(namespace) => key
+                .strip_prefix(&format!("{namespace}:"))
+                .map(ToString::to_string)
+                .unwrap_or(key),
+            None => key,
+        }
+    }
 }
 
 #[cfg(test)]
diff --git a/apollo-router/src/plugins/response_cache/storage/redis.rs b/apollo-router/src/plugins/response_cache/storage/redis.rs
diff --git a/apollo-router/src/plugins/response_cache/storage/snapshots/apollo_router__plugins__response_cache__storage__redis__tests__invalidation_key_permutations@input____None____.snap b/apollo-router/src/plugins/response_cache/storage/snapshots/apollo_router__plugins__response_cache__storage__redis__tests__invalidation_key_permutations@input____None____.snap
@@ -3,5 +3,5 @@ source: apollo-router/src/plugins/response_cache/storage/redis.rs
 expression: cache_tags
 ---
 [
-    "cache-tag:subgraph-products",
+    "version:1.1:cache-tag:subgraph-products",
 ]
diff --git a/apollo-router/src/plugins/response_cache/storage/snapshots/apollo_router__plugins__response_cache__storage__redis__tests__invalidation_key_permutations@input____None____invalidation.snap b/apollo-router/src/plugins/response_cache/storage/snapshots/apollo_router__plugins__response_cache__storage__redis__tests__invalidation_key_permutations@input____None____invalidation.snap
@@ -3,6 +3,6 @@ source: apollo-router/src/plugins/response_cache/storage/redis.rs
 expression: cache_tags
 ---
 [
-    "cache-tag:subgraph-products",
-    "cache-tag:subgraph-products:key-invalidation",
+    "version:1.1:cache-tag:subgraph-products",
+    "version:1.1:cache-tag:subgraph-products:key-invalidation",
 ]
diff --git a/apollo-router/src/plugins/response_cache/storage/snapshots/apollo_router__plugins__response_cache__storage__redis__tests__invalidation_key_permutations@input____None____invalidation1__invalidation2__invalidation3.snap b/apollo-router/src/plugins/response_cache/storage/snapshots/apollo_router__plugins__response_cache__storage__redis__tests__invalidation_key_permutations@input____None____invalidation1__invalidation2__invalidation3.snap
@@ -3,8 +3,8 @@ source: apollo-router/src/plugins/response_cache/storage/redis.rs
 expression: cache_tags
 ---
 [
-    "cache-tag:subgraph-products",
-    "cache-tag:subgraph-products:key-invalidation1",
-    "cache-tag:subgraph-products:key-invalidation2",
-    "cache-tag:subgraph-products:key-invalidation3",
+    "version:1.1:cache-tag:subgraph-products",
+    "version:1.1:cache-tag:subgraph-products:key-invalidation1",
+    "version:1.1:cache-tag:subgraph-products:key-invalidation2",
+    "version:1.1:cache-tag:subgraph-products:key-invalidation3",
 ]
diff --git a/apollo-router/src/plugins/response_cache/storage/snapshots/apollo_router__plugins__response_cache__storage__redis__tests__invalidation_key_permutations@input____test____.snap b/apollo-router/src/plugins/response_cache/storage/snapshots/apollo_router__plugins__response_cache__storage__redis__tests__invalidation_key_permutations@input____test____.snap
@@ -3,5 +3,5 @@ source: apollo-router/src/plugins/response_cache/storage/redis.rs
 expression: cache_tags
 ---
 [
-    "test:cache-tag:subgraph-products",
+    "version:1.1:cache-tag:subgraph-products",
 ]
diff --git a/apollo-router/src/plugins/response_cache/storage/snapshots/apollo_router__plugins__response_cache__storage__redis__tests__invalidation_key_permutations@input____test____invalidation.snap b/apollo-router/src/plugins/response_cache/storage/snapshots/apollo_router__plugins__response_cache__storage__redis__tests__invalidation_key_permutations@input____test____invalidation.snap
@@ -3,6 +3,6 @@ source: apollo-router/src/plugins/response_cache/storage/redis.rs
 expression: cache_tags
 ---
 [
-    "test:cache-tag:subgraph-products",
-    "test:cache-tag:subgraph-products:key-invalidation",
+    "version:1.1:cache-tag:subgraph-products",
+    "version:1.1:cache-tag:subgraph-products:key-invalidation",
 ]
diff --git a/apollo-router/src/plugins/response_cache/storage/snapshots/apollo_router__plugins__response_cache__storage__redis__tests__invalidation_key_permutations@input____test____invalidation1__invalidation2__invalidation3.snap b/apollo-router/src/plugins/response_cache/storage/snapshots/apollo_router__plugins__response_cache__storage__redis__tests__invalidation_key_permutations@input____test____invalidation1__invalidation2__invalidation3.snap
@@ -3,8 +3,8 @@ source: apollo-router/src/plugins/response_cache/storage/redis.rs
 expression: cache_tags
 ---
 [
-    "test:cache-tag:subgraph-products",
-    "test:cache-tag:subgraph-products:key-invalidation1",
-    "test:cache-tag:subgraph-products:key-invalidation2",
-    "test:cache-tag:subgraph-products:key-invalidation3",
+    "version:1.1:cache-tag:subgraph-products",
+    "version:1.1:cache-tag:subgraph-products:key-invalidation1",
+    "version:1.1:cache-tag:subgraph-products:key-invalidation2",
+    "version:1.1:cache-tag:subgraph-products:key-invalidation3",
 ]

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@ source: apollo-router/src/plugins/response_cache/storage/redis.rs`
`3`	`3`	`expression: cache_tags`
`4`	`4`	`---`
`5`	`5`	`[`
`6`		`- "cache-tag:subgraph-products",`
	`6`	`+ "version:1.1:cache-tag:subgraph-products",`
`7`	`7`	`]`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ source: apollo-router/src/plugins/response_cache/storage/redis.rs`
`3`	`3`	`expression: cache_tags`
`4`	`4`	`---`
`5`	`5`	`[`
`6`		`- "cache-tag:subgraph-products",`
`7`		`- "cache-tag:subgraph-products:key-invalidation",`
	`6`	`+ "version:1.1:cache-tag:subgraph-products",`
	`7`	`+ "version:1.1:cache-tag:subgraph-products:key-invalidation",`
`8`	`8`	`]`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ source: apollo-router/src/plugins/response_cache/storage/redis.rs`
`3`	`3`	`expression: cache_tags`
`4`	`4`	`---`
`5`	`5`	`[`
`6`		`- "cache-tag:subgraph-products",`
`7`		`- "cache-tag:subgraph-products:key-invalidation1",`
`8`		`- "cache-tag:subgraph-products:key-invalidation2",`
`9`		`- "cache-tag:subgraph-products:key-invalidation3",`
	`6`	`+ "version:1.1:cache-tag:subgraph-products",`
	`7`	`+ "version:1.1:cache-tag:subgraph-products:key-invalidation1",`
	`8`	`+ "version:1.1:cache-tag:subgraph-products:key-invalidation2",`
	`9`	`+ "version:1.1:cache-tag:subgraph-products:key-invalidation3",`
`10`	`10`	`]`