ref(redis): Do not use redis-blaster for auth idpmigration (#102319)

<!-- Describe your PR here. -->

Remove another place where we still use redis-blaster.

Author: beezz

src/sentry/auth/idpmigration.py

@@ -5,8 +5,9 @@
 from typing import Any
 
 import orjson
+from django.conf import settings
 from django.urls import reverse
-from rb.clients import LocalClient
+from sentry_redis_tools.clients import RedisCluster, StrictRedis
 
 from sentry import options
 from sentry.models.authprovider import AuthProvider
@@ -17,7 +18,6 @@
 from sentry.utils.http import absolute_uri
 from sentry.utils.security import get_secure_token
 
-_REDIS_KEY = "verificationKeyStorage"
 _TTL = timedelta(minutes=10)
 SSO_VERIFICATION_KEY = "confirm_account_verification_key"
 
@@ -48,8 +48,8 @@ def send_one_time_account_confirm_link(
     return link
 
 
-def get_redis_cluster() -> LocalClient:
-    return redis.clusters.get("default").get_local_client_for_key(_REDIS_KEY)
+def _get_redis_client() -> RedisCluster[str] | StrictRedis[str]:
+    return redis.redis_clusters.get(settings.SENTRY_AUTH_IDPMIGRATION_REDIS_CLUSTER)
 
 
 # Helper function for serializing named tuples with orjson.
@@ -96,7 +96,7 @@ def send_confirm_email(self) -> None:
         metrics.incr("idpmigration.confirm_link_sent", sample_rate=1.0)
 
     def store_in_redis(self) -> None:
-        cluster = get_redis_cluster()
+        client = _get_redis_client()
 
         member = organization_service.check_membership_by_id(
             organization_id=self.organization.id, user_id=self.user.id
@@ -110,17 +110,17 @@ def store_in_redis(self) -> None:
             "identity_id": self.identity_id,
             "provider": self.provider.provider,
         }
-        cluster.setex(
+        client.setex(
             self.verification_key,
             int(_TTL.total_seconds()),
             orjson.dumps(verification_value, default=_serialize_named_tuple).decode(),
         )
 
 
 def get_verification_value_from_key(key: str) -> dict[str, Any] | None:
-    cluster = get_redis_cluster()
+    client = _get_redis_client()
     verification_key = f"auth:one-time-key:{key}"
-    verification_str = cluster.get(verification_key)
+    verification_str = client.get(verification_key)
     if verification_str is None:
         metrics.incr("idpmigration.confirmation_failure", sample_rate=1.0)
         return None

src/sentry/conf/server.py

@@ -193,6 +193,7 @@ def env(
 SENTRY_WEEKLY_REPORTS_REDIS_CLUSTER = "default"
 SENTRY_HYBRIDCLOUD_DELETIONS_REDIS_CLUSTER = "default"
 SENTRY_SESSION_STORE_REDIS_CLUSTER = "default"
+SENTRY_AUTH_IDPMIGRATION_REDIS_CLUSTER = "default"
 
 # Hosts that are allowed to use system token authentication.
 # http://en.wikipedia.org/wiki/Reserved_IP_addresses

tests/sentry/auth/test_idpmigration.py

@@ -1,4 +1,5 @@
 import re
+from typing import cast
 
 from django.urls import reverse
 
@@ -31,7 +32,8 @@ def test_send_one_time_account_confirm_link(self) -> None:
         )
         assert re.match(r"auth:one-time-key:\w{32}", link.verification_key)
 
-        value = json.loads(idpmigration.get_redis_cluster().get(link.verification_key))
+        value = json.loads(cast(str, idpmigration._get_redis_client().get(link.verification_key)))
+
         assert value["user_id"] == self.user.id
         assert value["email"] == self.email
         assert value["member_id"] == om.id
@@ -44,7 +46,8 @@ def test_send_without_org_membership(self) -> None:
             self.user, self.org, self.provider, self.email, self.IDENTITY_ID
         )
 
-        value = json.loads(idpmigration.get_redis_cluster().get(link.verification_key))
+        value = json.loads(cast(str, idpmigration._get_redis_client().get(link.verification_key)))
+
         assert value["user_id"] == self.user.id
         assert value["email"] == self.email
         assert value["member_id"] is None