Skip to content

ref(cells): update rpc callers to pass cell_name #110702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lynnagara merged 4 commits into from
Mar 16, 2026
Merged

ref(cells): update rpc callers to pass cell_name #110702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2970d5c
ref(cells): update rpc callers to pass cell_name
lynnagara Mar 13, 2026
7634d71
one more
lynnagara Mar 13, 2026
d0a2066
.
lynnagara Mar 13, 2026
64c7d6d
another one
lynnagara Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/sentry/services/organization/provisioning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def _control_based_provisioning(

rpc_org_slug_reservation: RpcOrganizationSlugReservation = (
control_organization_provisioning_rpc_service.provision_organization(
region_name=region_name, org_provision_args=provisioning_options
cell_name=region_name, org_provision_args=provisioning_options
)
)

Expand Down Expand Up @@ -106,7 +106,7 @@ def _control_based_slug_change(
organization_id=organization_id,
desired_slug=slug,
require_exact=True,
region_name=destination_region_name,
cell_name=destination_region_name,
)
)

Expand Down Expand Up @@ -161,7 +161,7 @@ def bulk_create_organization_slugs(
)

control_organization_provisioning_rpc_service.bulk_create_organization_slug_reservations(
slug_mapping=slug_mapping, region_name=destination_region_name
slug_mapping=slug_mapping, cell_name=destination_region_name
)


Expand Down Expand Up @@ -200,10 +200,10 @@ def handle_organization_provisioning_outbox_payload(

org_slug_reservation = org_slug_reservation_qs.get()

able_to_provision = region_organization_provisioning_rpc_service.create_organization_in_region(
able_to_provision = region_organization_provisioning_rpc_service.create_organization_in_cell(
organization_id=organization_id,
provision_payload=provisioning_payload,
region_name=region_name,
cell_name=region_name,
)

if not able_to_provision:
Expand Down Expand Up @@ -262,7 +262,7 @@ def handle_possible_organization_slug_swap(*, region_name: str, org_slug_reserva

able_to_update_slug = (
region_organization_provisioning_rpc_service.update_organization_slug_from_reservation(
region_name=region_name,
cell_name=region_name,
org_slug_temporary_alias_res=serialize_slug_reservation(
slug_reservation=org_slug_reservation
),
Expand Down
20 changes: 10 additions & 10 deletions tests/sentry/hybridcloud/services/test_control_organization_provisioning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def generate_provisioning_args(

def provision_organization(self, region_name: str = "us") -> RpcOrganizationSlugReservation:
slug_reservation = control_organization_provisioning_rpc_service.provision_organization(
region_name=region_name, org_provision_args=self.provisioning_args
cell_name=region_name, org_provision_args=self.provisioning_args
)
return slug_reservation

Expand Down Expand Up @@ -179,7 +179,7 @@ def test_updates_exact_slug(self) -> None:
organization_id=org_slug_res.organization_id,
desired_slug="newsantry",
require_exact=True,
region_name=self.region_name,
cell_name=self.region_name,
)
)

Expand All @@ -195,7 +195,7 @@ def test_updates_inexact_slug_without_collision(self) -> None:
organization_id=org_slug_res.organization_id,
desired_slug="newsantry",
require_exact=False,
region_name=self.region_name,
cell_name=self.region_name,
)
)

Expand All @@ -222,7 +222,7 @@ def test_updates_inexact_slug_with_collision(self) -> None:
organization_id=test_org_slug_reservation.organization_id,
desired_slug=conflicting_slug,
require_exact=False,
region_name=self.region_name,
cell_name=self.region_name,
)
)

Expand Down Expand Up @@ -253,7 +253,7 @@ def test_fails_to_update_exact_slug_with_collision(self) -> None:
organization_id=test_org_slug_reservation.organization_id,
desired_slug=conflicting_slug,
require_exact=True,
region_name=self.region_name,
cell_name=self.region_name,
)

with assume_test_silo_mode(SiloMode.CONTROL):
Expand All @@ -280,7 +280,7 @@ def test_updates_exact_slug_collision_in_other_region(self) -> None:
organization_id=org_reservation.organization_id,
desired_slug=conflicting_slug,
require_exact=True,
region_name=org_reservation.region_name,
cell_name=org_reservation.region_name,
)

with assume_test_silo_mode(SiloMode.CONTROL):
Expand Down Expand Up @@ -314,7 +314,7 @@ def test_conflicting_unregistered_organization_with_slug_exists(self) -> None:
organization_id=test_org_slug_reservation.organization_id,
desired_slug=conflicting_slug,
require_exact=True,
region_name=self.region_name,
cell_name=self.region_name,
)

slug_reservations = self.get_slug_reservations_for_organization(
Expand Down Expand Up @@ -348,7 +348,7 @@ def test_swap_for_org_without_primary_slug(self) -> None:
organization_id=unregistered_org.id,
desired_slug=desired_primary_slug,
require_exact=True,
region_name=self.region_name,
cell_name=self.region_name,
)

slug_reservations = self.get_slug_reservations_for_organization(
Expand All @@ -368,7 +368,7 @@ def test_swap_with_same_slug(self) -> None:
organization_id=org.id,
desired_slug=desired_slug,
require_exact=True,
region_name=self.region_name,
cell_name=self.region_name,
)

slug_reservations = self.get_slug_reservations_for_organization(organization_id=org.id)
Expand Down Expand Up @@ -401,7 +401,7 @@ def test_update_slug_revokes_auth_tokens(self) -> None:
organization_id=self.organization.id,
desired_slug="new-slug",
require_exact=True,
region_name=self.region_name,
cell_name=self.region_name,
)

token.refresh_from_db()
Expand Down
8 changes: 4 additions & 4 deletions tests/sentry/hybridcloud/services/test_region_organization_provisioning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ def test_updates_org_slug_when_no_conflicts(self) -> None:
)
result = (
region_organization_provisioning_rpc_service.update_organization_slug_from_reservation(
region_name="us",
cell_name="us",
org_slug_temporary_alias_res=self.create_rpc_organization_slug_reservation(
desired_slug
),
Expand All @@ -281,7 +281,7 @@ def test_updates_org_slug_when_no_conflicts(self) -> None:
def test_returns_true_if_organization_slug_already_updated(self) -> None:
result = (
region_organization_provisioning_rpc_service.update_organization_slug_from_reservation(
region_name="us",
cell_name="us",
org_slug_temporary_alias_res=self.create_rpc_organization_slug_reservation(
self.provisioned_org.slug
),
Expand All @@ -300,7 +300,7 @@ def test_fails_if_organization_not_found(self) -> None:

result = (
region_organization_provisioning_rpc_service.update_organization_slug_from_reservation(
region_name="us",
cell_name="us",
org_slug_temporary_alias_res=rpc_org_slug_res,
)
)
Expand All @@ -314,7 +314,7 @@ def test_does_not_update_slug_when_conflict_exists(self) -> None:
self.create_organization(slug=desired_slug, name="conflicted org", owner=self.create_user())
result = (
region_organization_provisioning_rpc_service.update_organization_slug_from_reservation(
region_name="us",
cell_name="us",
org_slug_temporary_alias_res=self.create_rpc_organization_slug_reservation(
desired_slug
),
Expand Down
Loading