From bd19adc1ef937b2c42d24fbcf51543ace6325078 Mon Sep 17 00:00:00 2001
From: mubashir1osmani <mubashir.osmani777@gmail.com>
Date: Wed, 24 Jun 2026 10:53:50 -0700
Subject: [PATCH] test(e2e): let the spend-counter reseed test reach a
 cluster-mode TLS redis

The test's _redis() built a standalone, non-TLS client on the docker-compose
defaults (localhost:6380), so against the EKS serverless ElastiCache (cluster-mode
+ TLS) it could never connect and the test skipped. Honor E2E_REDIS_SSL and
E2E_REDIS_CLUSTER so it builds a TLS RedisCluster client when the deploy provides
them, and E2E_REDIS_NAMESPACE so the counter is read with a direct GET (cluster-safe)
rather than a keyspace scan that can't span shards. The local standalone path and the
graceful skip-on-unreachable behavior are unchanged.
---
 .../budgets/test_spend_counter_reseed_e2e.py  | 38 ++++++++++++++-----
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/tests/e2e/budgets/test_spend_counter_reseed_e2e.py b/tests/e2e/budgets/test_spend_counter_reseed_e2e.py
index 97bf0bae422..51f84665012 100644
--- a/tests/e2e/budgets/test_spend_counter_reseed_e2e.py
+++ b/tests/e2e/budgets/test_spend_counter_reseed_e2e.py
@@ -41,21 +41,39 @@ COLD_WAIT_SECONDS = 80
 def _redis():
     import redis
 
-    return redis.Redis(
-        host=os.getenv("E2E_REDIS_HOST", "localhost"),
-        port=int(os.getenv("E2E_REDIS_PORT", "6380")),
-        password=os.getenv("REDIS_PASSWORD") or None,
-        decode_responses=True,
-        socket_connect_timeout=2,
-    )
+    kwargs = {
+        "host": os.getenv("E2E_REDIS_HOST", "localhost"),
+        "port": int(os.getenv("E2E_REDIS_PORT", "6380")),
+        "password": os.getenv("REDIS_PASSWORD") or None,
+        "decode_responses": True,
+        "socket_connect_timeout": 2,
+        "ssl": os.getenv("E2E_REDIS_SSL", "false").lower() in ("1", "true", "yes"),
+    }
+    # Serverless ElastiCache is cluster-mode + TLS; a standalone client breaks on
+    # MOVED redirects, so use the cluster client when the deploy says so. A local
+    # docker redis stays standalone.
+    if os.getenv("E2E_REDIS_CLUSTER", "false").lower() in ("1", "true", "yes"):
+        from redis.cluster import RedisCluster
+
+        return RedisCluster(**kwargs)
+    return redis.Redis(**kwargs)
 
 
 def _spend_counter(rds, key: str) -> float | None:
     """The shared spend counter for `key`, or None if it is cold. The counter key is
-    ``{cache namespace}:spend:key:{sha256(key)}``; matched by suffix so the configured
-    namespace need not be hard-coded."""
+    ``{cache namespace}:spend:key:{sha256(key)}``. With E2E_REDIS_NAMESPACE set (the
+    cluster-mode deploy, where a keyspace SCAN can't span shards) read it directly;
+    otherwise match by suffix so a local namespace need not be hard-coded."""
     digest = hashlib.sha256(key.encode()).hexdigest()
-    matches = list(rds.scan_iter(match=f"*spend:key:{digest}"))
+    suffix = f"spend:key:{digest}"
+    namespace = os.getenv("E2E_REDIS_NAMESPACE")
+    if namespace:
+        for candidate in (f"{namespace}:{suffix}", suffix):
+            raw = rds.get(candidate)
+            if raw is not None:
+                return float(raw)
+        return None
+    matches = list(rds.scan_iter(match=f"*{suffix}"))
     if not matches:
         return None
     raw = rds.get(matches[0])