ref(cells): clean up rpc method signatures

src/sentry/hybridcloud/rpc/caching/impl.py

@@ -85,8 +85,7 @@ class LocalCellCachingService(CellCachingService):
     def clear_key(
         self,
         *,
-        cell_name: str | None = None,  # TODO(cells): make required when all callers are updated
-        region_name: str | None = None,  # TODO(cells): remove when all callers are updated
+        cell_name: str,
         key: str,
     ) -> int:
         return _consume_generator(_delete_cache(key, SiloMode.CELL))

src/sentry/hybridcloud/rpc/caching/service.py

@@ -33,8 +33,7 @@ def get_local_implementation(cls) -> RpcService:
     def clear_key(
         self,
         *,
-        cell_name: str | None = None,  # TODO(cells): make required when all callers are updated
-        region_name: str | None = None,  # TODO(cells): remove when all callers are updated
+        cell_name: str,
         key: str,
     ) -> int:
         pass

src/sentry/hybridcloud/services/control_organization_provisioning/impl.py

@@ -129,17 +129,13 @@ def _get_slug_reservation_by_type_from_list(
     def provision_organization(
         self,
         *,
-        cell_name: str | None = None,  # TODO(cells): make required when all callers are updated
-        region_name: str | None = None,  # TODO(cells): remove when all callers are updated
+        cell_name: str,
         org_provision_args: OrganizationProvisioningOptions,
     ) -> RpcOrganizationSlugReservation:
-        resolved_cell_name = cell_name or region_name
-        assert resolved_cell_name is not None, "cell_name or region_name must be provided"
-
         # Generate a new non-conflicting slug and org ID
-        org_id = self._generate_org_snowflake_id(region_name=resolved_cell_name)
+        org_id = self._generate_org_snowflake_id(region_name=cell_name)
         slug = self._generate_org_slug(
-            region_name=resolved_cell_name, slug=org_provision_args.provision_options.slug
+            region_name=cell_name, slug=org_provision_args.provision_options.slug
         )
 
         # Generate a provisioning outbox for the region and drain
@@ -158,13 +154,13 @@ def provision_organization(
                 slug=slug,
                 organization_id=org_id,
                 user_id=org_provision_args.provision_options.owning_user_id,
-                cell_name=resolved_cell_name,
+                cell_name=cell_name,
             )
 
             org_slug_res.save(unsafe_write=True)
             create_organization_provisioning_outbox(
                 organization_id=org_id,
-                cell_name=resolved_cell_name,
+                cell_name=cell_name,
                 org_provision_payload=provision_payload,
             ).save()
 
@@ -183,14 +179,11 @@ def provision_organization(
     def update_organization_slug(
         self,
         *,
-        cell_name: str | None = None,  # TODO(cells): make required when all callers are updated
-        region_name: str | None = None,  # TODO(cells): remove when all callers are updated
+        cell_name: str,
         organization_id: int,
         desired_slug: str,
         require_exact: bool = True,
     ) -> RpcOrganizationSlugReservation:
-        resolved_cell_name = cell_name or region_name
-        assert resolved_cell_name is not None, "cell_name or region_name must be provided"
         existing_slug_reservations = list(
             OrganizationSlugReservation.objects.filter(organization_id=organization_id)
         )
@@ -209,14 +202,14 @@ def update_organization_slug(
         )
 
         # If there's already a matching primary slug reservation for the org,
-        # just replicate it to the region to kick off the organization sync process
+        # just replicate it to the cell to kick off the organization sync process
         if existing_primary_alias and existing_primary_alias.slug == desired_slug:
-            existing_primary_alias.handle_async_replication(resolved_cell_name, organization_id)
+            existing_primary_alias.handle_async_replication(cell_name, organization_id)
             return serialize_slug_reservation(existing_primary_alias)
 
         slug_base = desired_slug
         if not require_exact:
-            slug_base = self._generate_org_slug(region_name=resolved_cell_name, slug=slug_base)
+            slug_base = self._generate_org_slug(region_name=cell_name, slug=slug_base)
 
         try:
             with outbox_context(
@@ -226,7 +219,7 @@ def update_organization_slug(
                     slug=slug_base,
                     organization_id=organization_id,
                     user_id=-1,
-                    cell_name=resolved_cell_name,
+                    cell_name=cell_name,
                     reservation_type=OrganizationSlugReservationType.TEMPORARY_RENAME_ALIAS.value,
                 ).save(unsafe_write=True)
 
@@ -295,23 +288,19 @@ def _validate_primary_slug_updated(
     def bulk_create_organization_slug_reservations(
         self,
         *,
-        cell_name: str | None = None,  # TODO(cells): make required when all callers are updated
-        region_name: str | None = None,  # TODO(cells): remove when all callers are updated
+        cell_name: str,
         slug_mapping: dict[int, str],
     ) -> None:
-        resolved_cell_name = cell_name or region_name
-        assert resolved_cell_name is not None, "cell_name or region_name must be provided"
-
         slug_reservations_to_create: list[OrganizationSlugReservation] = []
 
         with outbox_context(transaction.atomic(router.db_for_write(OrganizationSlugReservation))):
             for org_id, slug in slug_mapping.items():
                 slug_reservation = OrganizationSlugReservation(
-                    slug=self._generate_org_slug(slug=slug, region_name=resolved_cell_name),
+                    slug=self._generate_org_slug(slug=slug, region_name=cell_name),
                     organization_id=org_id,
                     reservation_type=OrganizationSlugReservationType.TEMPORARY_RENAME_ALIAS.value,
                     user_id=-1,
-                    cell_name=resolved_cell_name,
+                    cell_name=cell_name,
                 )
                 slug_reservation.save(unsafe_write=True)
 

src/sentry/hybridcloud/services/control_organization_provisioning/service.py

@@ -21,8 +21,7 @@ class ControlOrganizationProvisioningRpcService(RpcService):
     def provision_organization(
         self,
         *,
-        cell_name: str | None = None,  # TODO(cells): make required when all callers are updated
-        region_name: str | None = None,  # TODO(cells): remove when all callers are updated
+        cell_name: str,
         org_provision_args: OrganizationProvisioningOptions,
     ) -> RpcOrganizationSlugReservation:
         """
@@ -39,8 +38,7 @@ def provision_organization(
     def update_organization_slug(
         self,
         *,
-        cell_name: str | None = None,  # TODO(cells): make required when all callers are updated
-        region_name: str | None = None,  # TODO(cells): remove when all callers are updated
+        cell_name: str,
         organization_id: int,
         desired_slug: str,
         require_exact: bool = True,
@@ -66,8 +64,7 @@ def update_organization_slug(
     def bulk_create_organization_slug_reservations(
         self,
         *,
-        cell_name: str | None = None,  # TODO(cells): make required when all callers are updated
-        region_name: str | None = None,  # TODO(cells): remove when all callers are updated
+        cell_name: str,
         slug_mapping: dict[int, str],
     ) -> None:
         """

src/sentry/hybridcloud/services/replica/impl.py

@@ -151,8 +151,7 @@ def upsert_replicated_api_token(
         self,
         *,
         api_token: RpcApiToken,
-        cell_name: str | None = None,
-        region_name: str | None = None,
+        cell_name: str,
     ) -> None:
         organization: Organization | None = None
         if api_token.organization_id is not None:
@@ -179,7 +178,10 @@ def upsert_replicated_api_token(
         handle_replication(ApiToken, destination)
 
     def delete_replicated_api_token(
-        self, *, apitoken_id: int, cell_name: str | None = None, region_name: str | None = None
+        self,
+        *,
+        apitoken_id: int,
+        cell_name: str,
     ) -> None:
         with enforce_constraints(transaction.atomic(router.db_for_write(ApiTokenReplica))):
             api_token_qs = ApiTokenReplica.objects.filter(apitoken_id=apitoken_id)
@@ -189,8 +191,7 @@ def upsert_replicated_org_auth_token(
         self,
         *,
         token: RpcOrgAuthToken,
-        cell_name: str | None = None,
-        region_name: str | None = None,
+        cell_name: str,
     ) -> None:
         try:
             organization = Organization.objects.get(id=token.organization_id)
@@ -212,8 +213,7 @@ def upsert_replicated_auth_provider(
         self,
         *,
         auth_provider: RpcAuthProvider,
-        cell_name: str | None = None,
-        region_name: str | None = None,
+        cell_name: str,
     ) -> None:
         try:
             organization = Organization.objects.get(id=auth_provider.organization_id)
@@ -237,8 +237,7 @@ def upsert_replicated_auth_identity(
         self,
         *,
         auth_identity: RpcAuthIdentity,
-        cell_name: str | None = None,
-        region_name: str | None = None,
+        cell_name: str,
     ) -> None:
         destination = AuthIdentityReplica(
             auth_identity_id=auth_identity.id,
@@ -252,7 +251,10 @@ def upsert_replicated_auth_identity(
         handle_replication(AuthIdentity, destination)
 
     def upsert_replicated_api_key(
-        self, *, api_key: RpcApiKey, cell_name: str | None = None, region_name: str | None = None
+        self,
+        *,
+        api_key: RpcApiKey,
+        cell_name: str,
     ) -> None:
         try:
             organization = Organization.objects.get(id=api_key.organization_id)
@@ -275,8 +277,7 @@ def upsert_replicated_org_slug_reservation(
         self,
         *,
         slug_reservation: RpcOrganizationSlugReservation,
-        cell_name: str | None = None,
-        region_name: str | None = None,
+        cell_name: str,
     ) -> None:
         with enforce_constraints(
             transaction.atomic(router.db_for_write(OrganizationSlugReservationReplica))
@@ -304,8 +305,7 @@ def delete_replicated_org_slug_reservation(
         self,
         *,
         organization_slug_reservation_id: int,
-        cell_name: str | None = None,
-        region_name: str | None = None,
+        cell_name: str,
     ) -> None:
         with enforce_constraints(
             transaction.atomic(router.db_for_write(OrganizationSlugReservationReplica))
@@ -316,7 +316,10 @@ def delete_replicated_org_slug_reservation(
             org_slug_qs.delete()
 
     def delete_replicated_auth_provider(
-        self, *, auth_provider_id: int, cell_name: str | None = None, region_name: str | None = None
+        self,
+        *,
+        auth_provider_id: int,
+        cell_name: str,
     ) -> None:
         with enforce_constraints(transaction.atomic(router.db_for_write(AuthProviderReplica))):
             AuthProviderReplica.objects.filter(auth_provider_id=auth_provider_id).delete()

src/sentry/hybridcloud/services/replica/service.py

@@ -70,8 +70,7 @@ def upsert_replicated_auth_provider(
         self,
         *,
         auth_provider: RpcAuthProvider,
-        cell_name: str | None = None,
-        region_name: str | None = None,
+        cell_name: str,
     ) -> None:
         pass
 
@@ -81,15 +80,17 @@ def upsert_replicated_auth_identity(
         self,
         *,
         auth_identity: RpcAuthIdentity,
-        cell_name: str | None = None,
-        region_name: str | None = None,
+        cell_name: str,
     ) -> None:
         pass
 
     @cell_rpc_method(resolve=ByCellName())
     @abc.abstractmethod
     def upsert_replicated_api_key(
-        self, *, api_key: RpcApiKey, cell_name: str | None = None, region_name: str | None = None
+        self,
+        *,
+        api_key: RpcApiKey,
+        cell_name: str,
     ) -> None:
         pass
 
@@ -99,15 +100,17 @@ def upsert_replicated_api_token(
         self,
         *,
         api_token: RpcApiToken,
-        cell_name: str | None = None,
-        region_name: str | None = None,
+        cell_name: str,
     ) -> None:
         pass
 
     @cell_rpc_method(resolve=ByCellName())
     @abc.abstractmethod
     def delete_replicated_api_token(
-        self, *, apitoken_id: int, cell_name: str | None = None, region_name: str | None = None
+        self,
+        *,
+        apitoken_id: int,
+        cell_name: str,
     ) -> None:
         pass
 
@@ -117,8 +120,7 @@ def upsert_replicated_org_auth_token(
         self,
         *,
         token: RpcOrgAuthToken,
-        cell_name: str | None = None,
-        region_name: str | None = None,
+        cell_name: str,
     ) -> None:
         pass
 
@@ -128,8 +130,7 @@ def upsert_replicated_org_slug_reservation(
         self,
         *,
         slug_reservation: RpcOrganizationSlugReservation,
-        cell_name: str | None = None,
-        region_name: str | None = None,
+        cell_name: str,
     ) -> None:
         pass
 
@@ -139,15 +140,17 @@ def delete_replicated_org_slug_reservation(
         self,
         *,
         organization_slug_reservation_id: int,
-        cell_name: str | None = None,
-        region_name: str | None = None,
+        cell_name: str,
     ) -> None:
         pass
 
     @cell_rpc_method(resolve=ByCellName())
     @abc.abstractmethod
     def delete_replicated_auth_provider(
-        self, *, auth_provider_id: int, cell_name: str | None = None, region_name: str | None = None
+        self,
+        *,
+        auth_provider_id: int,
+        cell_name: str,
     ) -> None:
         pass
 

src/sentry/issues/services/issue/impl.py

@@ -18,8 +18,7 @@ class DatabaseBackedIssueService(IssueService):
     def get_external_issue_groups(
         self,
         *,
-        cell_name: str | None = None,  # TODO(cells): make required when all callers are updated
-        region_name: str | None = None,  # TODO(cells): remove when all callers are updated
+        cell_name: str,
         external_issue_key: str,
         integration_id: int,
     ) -> list[RpcExternalIssueGroupMetadata] | None:

src/sentry/issues/services/issue/service.py

@@ -40,8 +40,7 @@ def get_local_implementation(cls) -> RpcService:
     def get_external_issue_groups(
         self,
         *,
-        cell_name: str | None = None,  # TODO(cells): make required when all callers are updated
-        region_name: str | None = None,  # TODO(cells): remove when all callers are updated
+        cell_name: str,
         external_issue_key: str,
         integration_id: int,
     ) -> list[RpcExternalIssueGroupMetadata] | None:

src/sentry/organizations/services/organization/impl.py

@@ -650,10 +650,6 @@ def update_cell_user(
                 user_is_active=user.is_active, user_email=user.email
             )
 
-    # TODO(cells): Remove when callers updated
-    def update_region_user(self, *, user: RpcCellUser, cell_name: str) -> None:
-        return self.update_cell_user(user=user, cell_name=cell_name)
-
     def get_option(self, *, organization_id: int, key: str) -> OptionValue:
         orm_organization = Organization.objects.get_from_cache(id=organization_id)
         value = orm_organization.get_option(key)

src/sentry/organizations/services/organization/service.py

@@ -498,22 +498,6 @@ def update_cell_user(
         """
         pass
 
-    # TODO(cells): Remove when callers updated
-    @cell_rpc_method(resolve=ByCellName())
-    @abstractmethod
-    def update_region_user(
-        self,
-        *,
-        user: RpcCellUser,
-        cell_name: str,
-    ) -> None:
-        """
-        Update all memberships in a cell to reflect changes in user details.
-
-        Will sync is_active and email attributes.
-        """
-        pass
-
     @cell_rpc_method(resolve=ByOrganizationId())
     @abstractmethod
     def reset_idp_flags(self, *, organization_id: int) -> None: