fix: Move underscore replacement from shared slugify_instance to Organization-specific code

Author: pine919

src/sentry/db/models/utils.py

@@ -103,9 +103,7 @@ def slugify_instance(
     *args: Any,
     **kwargs: Any,
 ) -> None:
-    # Django's slugify() doesn't replace underscores with hyphens, so we need to do it manually
-    # to ensure the slug matches ORG_SLUG_PATTERN which doesn't allow underscores
-    value = slugify(label.replace("_", "-"))[:max_length]
+    value = slugify(label)[:max_length]
     value = value.strip("-")
 
     return unique_db_instance(inst, value, reserved, max_length, field_name, *args, **kwargs)

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

@@ -98,7 +98,9 @@ def _generate_org_snowflake_id(region_name: str) -> int:
     @staticmethod
     def _generate_org_slug(region_name: str, slug: str) -> str:
         surrogate_org_slug = OrganizationSlugReservation()
-        slugify_instance(surrogate_org_slug, slug, reserved=RESERVED_ORGANIZATION_SLUGS)
+        # Django's slugify() doesn't replace underscores with hyphens, so we need to do it manually
+        # to ensure the slug matches ORG_SLUG_PATTERN which doesn't allow underscores
+        slugify_instance(surrogate_org_slug, slug.replace("_", "-"), reserved=RESERVED_ORGANIZATION_SLUGS)
 
         return surrogate_org_slug.slug
 

src/sentry/models/organization.py

@@ -247,6 +247,9 @@ def save(self, *args, **kwargs):
         elif not self.id:
             slugify_target = self.slug
         if slugify_target is not None:
+            # Django's slugify() doesn't replace underscores with hyphens, so we need to do it manually
+            # to ensure the slug matches ORG_SLUG_PATTERN which doesn't allow underscores
+            slugify_target = slugify_target.replace("_", "-")
             lock = locks.get("slug:organization", duration=5, name="organization_slug")
             with TimedRetryPolicy(10)(lock.acquire):
                 slugify_instance(self, slugify_target, reserved=RESERVED_ORGANIZATION_SLUGS)

tests/sentry/db/models/test_utils.py

@@ -105,6 +105,17 @@ def test_replaces_space_with_hyphen(self) -> None:
         assert org.slug == "f-o-o"
 
     def test_removes_underscores(self) -> None:
+        # Note: slugify_instance does NOT replace underscores - that's done by callers
+        # who need it (like Organization). This test verifies Django's slugify behavior.
         org = Organization(name="_foo_")
         slugify_instance(org, org.name)
+        # Django's slugify converts underscores to hyphens and strips them
         assert org.slug == "foo"
+
+    def test_strips_leading_hyphens_before_truncation(self) -> None:
+        # Test that leading hyphens are stripped after truncation
+        org = Organization(name="---Long-Name-That-Exceeds-Length")
+        slugify_instance(org, org.name, max_length=30)
+        # Should strip trailing hyphen after truncation
+        assert org.slug == "long-name-that-exceeds-length"
+        assert not org.slug.endswith("-")

tests/sentry/models/test_project.py

@@ -41,6 +41,12 @@
 
 
 class ProjectTest(APITestCase, TestCase):
+    def test_slug_preserves_underscores(self) -> None:
+        # Projects use MIXED_SLUG_PATTERN which allows underscores
+        org = self.create_organization()
+        project = self.create_project(organization=org, name="my_project")
+        assert project.slug == "my_project"
+
     def test_member_set_simple(self) -> None:
         user = self.create_user()
         org = self.create_organization(owner=user)