From 2602117591fee05202c5bd3c5f7b255ce719a937 Mon Sep 17 00:00:00 2001 From: Lyn Nagara Date: Wed, 25 Mar 2026 17:53:28 -0700 Subject: [PATCH 1/2] ref(cells): RpcOrganizationSlugReservation uses cell_name on the wire switches the wire format from "region_name" to "cell_name" --- .../control_organization_provisioning/model.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/sentry/hybridcloud/services/control_organization_provisioning/model.py b/src/sentry/hybridcloud/services/control_organization_provisioning/model.py index e72dfd93ef27ce..90806036796a35 100644 --- a/src/sentry/hybridcloud/services/control_organization_provisioning/model.py +++ b/src/sentry/hybridcloud/services/control_organization_provisioning/model.py @@ -10,16 +10,16 @@ class RpcOrganizationSlugReservation(RpcModel): organization_id: int user_id: int | None slug: str - region_name: str + cell_name: str reservation_type: int @root_validator(pre=True) @classmethod - def _accept_cell_name(cls, values: dict[str, Any]) -> dict[str, Any]: - if "cell_name" in values and "region_name" not in values: - values["region_name"] = values.pop("cell_name") + def _accept_region_name(cls, values: dict[str, Any]) -> dict[str, Any]: + if "region_name" in values and "cell_name" not in values: + values["cell_name"] = values.pop("region_name") return values @property - def cell_name(self) -> str: - return self.region_name + def region_name(self) -> str: + return self.cell_name From efb96309e47e41e8a0d887ca2494e05148746d06 Mon Sep 17 00:00:00 2001 From: Lyn Nagara Date: Fri, 27 Mar 2026 07:40:03 -0700 Subject: [PATCH 2/2] pass cell_name --- .../services/control_organization_provisioning/serial.py | 2 +- .../hybridcloud/services/test_cell_organization_provisioning.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sentry/hybridcloud/services/control_organization_provisioning/serial.py b/src/sentry/hybridcloud/services/control_organization_provisioning/serial.py index 515773d81a3240..626aa6dfc3ed69 100644 --- a/src/sentry/hybridcloud/services/control_organization_provisioning/serial.py +++ b/src/sentry/hybridcloud/services/control_organization_provisioning/serial.py @@ -11,7 +11,7 @@ def serialize_slug_reservation( id=slug_reservation.id, organization_id=slug_reservation.organization_id, slug=slug_reservation.slug, - region_name=slug_reservation.cell_name, + cell_name=slug_reservation.cell_name, user_id=slug_reservation.user_id, reservation_type=slug_reservation.reservation_type, ) diff --git a/tests/sentry/hybridcloud/services/test_cell_organization_provisioning.py b/tests/sentry/hybridcloud/services/test_cell_organization_provisioning.py index bbe89289ca5053..371e24ba2f8d5a 100644 --- a/tests/sentry/hybridcloud/services/test_cell_organization_provisioning.py +++ b/tests/sentry/hybridcloud/services/test_cell_organization_provisioning.py @@ -254,7 +254,7 @@ def create_rpc_organization_slug_reservation(self, slug: str) -> RpcOrganization slug=slug, organization_id=self.provisioned_org.id, user_id=self.provisioning_user.id, - region_name="us", + cell_name="us", reservation_type=OrganizationSlugReservationType.TEMPORARY_RENAME_ALIAS.value, )