ref(cells): Remove usage of Region.category

[lynnagara]

"category" will be removed from Region/Cell, and will only be a property of locality.

Now there are no more callers to Region.category.

It still exists on the Region dataclass as it's still (temporarily) needed for the 1:1 cell/locality shim.

also simplify TestEnvRegionDirectory

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Constructor uses _category but field is named category
  • Updated both incorrect Region constructor calls to use the correct category= keyword so required dataclass validation succeeds.

Or push these changes by commenting:

@cursor push 562e5490ca

Preview (562e5490ca)

diff --git a/src/sentry/testutils/helpers/apigateway.py b/src/sentry/testutils/helpers/apigateway.py
--- a/src/sentry/testutils/helpers/apigateway.py
+++ b/src/sentry/testutils/helpers/apigateway.py
@@ -143,7 +143,7 @@
         name="us",
         snowflake_id=1,
         address="http://us.internal.sentry.io",
-        _category=RegionCategory.MULTI_TENANT,
+        category=RegionCategory.MULTI_TENANT,
     )
 
     def setUp(self):

diff --git a/src/sentry/testutils/silo.py b/src/sentry/testutils/silo.py
--- a/src/sentry/testutils/silo.py
+++ b/src/sentry/testutils/silo.py
@@ -91,7 +91,7 @@
             name=name,
             snowflake_id=index + 1,
             address=generate_locality_url(name),
-            _category=(
+            category=(
                 RegionCategory.SINGLE_TENANT
                 if name in single_tenants
                 else RegionCategory.MULTI_TENANT

_{This Bugbot Autofix run was free. To enable autofix for future PRs, go to the Cursor dashboard.}

[github-actions]

Backend Test Failures

Failures on 7618d25 in this run:

tests/sentry/types/test_region.py::RegionDirectoryTest::test_find_all_multitenant_region_names_non_visible — log

tests/sentry/types/test_region.py:252: in test_find_all_multitenant_region_names_non_visible
    assert set(result) == {"us", "eu"}
E   AssertionError: assert set() == {'eu', 'us'}
E     
E     Extra items in the right set:
E     'us'
E     'eu'
E     
E     Full diff:
E     + set()
E     - {
E     -     'eu',
E     -     'us',
E     - }

tests/sentry/types/test_region.py::RegionDirectoryTest::test_find_all_multitenant_region_names — log

tests/sentry/types/test_region.py:234: in test_find_all_multitenant_region_names
    assert set(result) == {"us", "eu"}
E   AssertionError: assert set() == {'eu', 'us'}
E     
E     Extra items in the right set:
E     'us'
E     'eu'
E     
E     Full diff:
E     + set()
E     - {
E     -     'eu',
E     -     'us',
E     - }

[github-actions]

Backend Test Failures

Failures on fb6cbe0 in this run:

tests/sentry/web/test_client_config.py::test_client_config_with_hidden_region_data[CONTROL] — log

tests/sentry/web/test_client_config.py:228: in test_client_config_with_hidden_region_data
    assert len(result["regions"]) == 1
E   AssertionError: assert 2 == 1
E    +  where 2 = len([{'name': 'us', 'url': 'http://us.testserver'}, {'name': 'eu', 'url': 'http://eu.testserver'}])

tests/sentry/synapse/endpoints/test_org_cell_mappings.py::OrgCellMappingsTest::test_get_results_no_next — log

tests/sentry/synapse/endpoints/test_org_cell_mappings.py:72: in test_get_results_no_next
    assert res.data["data"][0] == {"id": str(org1.id), "slug": org1.slug, "cell": "us"}
E   AssertionError: assert {'cell': 'de'...'better-sole'} == {'cell': 'us'...'better-sole'}
E     
E     Omitting 2 identical items, use -vv to show
E     Differing items:
E     {'cell': 'de'} != {'cell': 'us'}
E     
E     Full diff:
E       {
E     -     'cell': 'us',
E     ?              ^^
E     +     'cell': 'de',
E     ?              ^^
E           'id': '4557736349990944',
E           'slug': 'better-sole',
E       }

tests/sentry/web/test_client_config.py::test_client_config_with_multiple_membership[CONTROL] — log

tests/sentry/web/test_client_config.py:249: in test_client_config_with_multiple_membership
    assert len(result["regions"]) == 2
E   AssertionError: assert 3 == 2
E    +  where 3 = len([{'name': 'us', 'url': 'http://us.testserver'}, {'name': 'eu', 'url': 'http://eu.testserver'}, {'name': 'acme', 'url': 'http://acme.testserver'}])

tests/sentry/web/test_client_config.py::test_client_config_links_with_priority_org[CONTROL] — log

tests/sentry/web/test_client_config.py:344: in test_client_config_links_with_priority_org
    assert result["links"]["regionUrl"] == "http://us.testserver"
E   AssertionError: assert 'http://eu.testserver' == 'http://us.testserver'
E     
E     - http://us.testserver
E     ?         -
E     + http://eu.testserver
E     ?        +

tests/sentry/web/test_client_config.py::test_client_config_links_regionurl[CONTROL] — log

tests/sentry/web/test_client_config.py:293: in test_client_config_links_regionurl
    assert result["links"]["regionUrl"] == "http://us.testserver"
E   AssertionError: assert 'http://acme.testserver' == 'http://us.testserver'
E     
E     - http://us.testserver
E     ?        ^^
E     + http://acme.testserver
E     ?        ^^^^

tests/sentry/web/test_api.py::ClientConfigViewTest::test_region_api_url_template — log

tests/sentry/web/test_api.py:643: in test_region_api_url_template
    assert data["links"] == {
E   AssertionError: assert {'organizatio...//testserver'} == {'organizatio...//testserver'}
E     
E     Omitting 2 identical items, use -vv to show
E     Differing items:
E     {'regionUrl': 'http://foobar.eu.testserver'} != {'regionUrl': 'http://foobar.us.testserver'}
E     
E     Full diff:
E       {
E           'organizationUrl': 'http://baz.testserver',
E     -     'regionUrl': 'http://foobar.us.testserver',
E     ?                                  -
E     +     'regionUrl': 'http://foobar.eu.testserver',
E     ?                                 +
E           'sentryUrl': 'http://testserver',
E       }

[markstory]

Suggested change

	return iter(self.regions)
	return iter(self._cells)

[markstory]

Suggested change

	r
	for r in self.regions
	if (loc := self._cell_to_locality.get(r.name)) is not None and loc.category == category
	c
	for c in self._cells
	if (loc := self._cell_to_locality.get(c.name)) is not None and loc.category == category

Should this be _cells as regions is on the way out?

[lynnagara]

yeah i can flip those now