Skip to content

Commit 876b9a5

Browse files
authored
ref(cells): RpcOrganizationSlugReservation uses cell_name on the wire (#111597)
flips the wire format from "region_name" to "cell_name". Alias is still present for deploy safety.
1 parent d4c27af commit 876b9a5

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ class RpcOrganizationSlugReservation(RpcModel):
1010
organization_id: int
1111
user_id: int | None
1212
slug: str
13-
region_name: str
13+
cell_name: str
1414
reservation_type: int
1515

1616
@root_validator(pre=True)
1717
@classmethod
18-
def _accept_cell_name(cls, values: dict[str, Any]) -> dict[str, Any]:
19-
if "cell_name" in values and "region_name" not in values:
20-
values["region_name"] = values.pop("cell_name")
18+
def _accept_region_name(cls, values: dict[str, Any]) -> dict[str, Any]:
19+
if "region_name" in values and "cell_name" not in values:
20+
values["cell_name"] = values.pop("region_name")
2121
return values
2222

2323
@property
24-
def cell_name(self) -> str:
25-
return self.region_name
24+
def region_name(self) -> str:
25+
return self.cell_name

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def serialize_slug_reservation(
1111
id=slug_reservation.id,
1212
organization_id=slug_reservation.organization_id,
1313
slug=slug_reservation.slug,
14-
region_name=slug_reservation.cell_name,
14+
cell_name=slug_reservation.cell_name,
1515
user_id=slug_reservation.user_id,
1616
reservation_type=slug_reservation.reservation_type,
1717
)

tests/sentry/hybridcloud/services/test_cell_organization_provisioning.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ def create_rpc_organization_slug_reservation(self, slug: str) -> RpcOrganization
254254
slug=slug,
255255
organization_id=self.provisioned_org.id,
256256
user_id=self.provisioning_user.id,
257-
region_name="us",
257+
cell_name="us",
258258
reservation_type=OrganizationSlugReservationType.TEMPORARY_RENAME_ALIAS.value,
259259
)
260260

0 commit comments

Comments
 (0)