ref: remove unused SENTRY_PUBLIC / SENTRY_PUBLIC_ENDPOINT

Author: asottile-sentry

Diff for: src/sentry/conf/server.py

@@ -1584,9 +1584,6 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
 # Should we send the beacon to the upstream server?
 SENTRY_BEACON = True
 
-# Allow access to Sentry without authentication.
-SENTRY_PUBLIC = False
-
 # Instruct Sentry that this install intends to be run by a single organization
 # and thus various UI optimizations should be enabled.
 SENTRY_SINGLE_ORGANIZATION = False
@@ -1879,7 +1876,6 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
 # URI Prefixes for generating DSN URLs
 # (Defaults to URL_PREFIX by default)
 SENTRY_ENDPOINT: str | None = None
-SENTRY_PUBLIC_ENDPOINT: str | None = None
 
 # Hostname prefix to add for organizations that are opted into the
 # `organizations:org-ingest-subdomains` feature.

Diff for: src/sentry/models/organization.py

@@ -112,12 +112,6 @@ def get_for_user(self, user, scope=None, only_visible=True):
         if not user.is_authenticated:
             return []
 
-        if settings.SENTRY_PUBLIC and scope is None:
-            if only_visible:
-                return list(self.filter(status=OrganizationStatus.ACTIVE))
-            else:
-                return list(self.filter())
-
         qs = OrganizationMember.objects.filter(user_id=user.id).select_related("organization")
         if only_visible:
             qs = qs.filter(organization__status=OrganizationStatus.ACTIVE)

Diff for: src/sentry/models/projectkey.py

@@ -199,7 +199,7 @@ def save(self, *args, **kwargs):
         super().save(*args, **kwargs)
 
     def get_dsn(self, domain=None, secure=True, public=False):
-        urlparts = urlparse(self.get_endpoint(public=public))
+        urlparts = urlparse(self.get_endpoint())
 
         if not public:
             key = f"{self.public_key}:{self.secret_key}"
@@ -277,27 +277,24 @@ def js_sdk_loader_cdn_url(self) -> str:
                 reverse("sentry-js-sdk-loader", args=[self.public_key, ".min"]),
             )
 
-    def get_endpoint(self, public=True):
+    def get_endpoint(self) -> str:
         from sentry.api.utils import generate_region_url
 
-        if public:
-            endpoint = settings.SENTRY_PUBLIC_ENDPOINT or settings.SENTRY_ENDPOINT
-        else:
-            endpoint = settings.SENTRY_ENDPOINT
-
-        if not endpoint and SiloMode.get_current_mode() == SiloMode.REGION:
-            endpoint = generate_region_url()
+        endpoint = settings.SENTRY_ENDPOINT
         if not endpoint:
-            endpoint = options.get("system.url-prefix")
+            if SiloMode.get_current_mode() == SiloMode.REGION:
+                endpoint = generate_region_url()
+            else:
+                endpoint = options.get("system.url-prefix")
+            assert endpoint is not None
 
-        has_org_subdomain = False
         try:
             has_org_subdomain = features.has(
                 "organizations:org-ingest-subdomains", self.project.organization
             )
         except ProgrammingError:
             # This happens during migration generation for the organization model.
-            pass
+            has_org_subdomain = False
 
         if has_org_subdomain:
             urlparts = urlparse(endpoint)

Diff for: src/sentry/models/team.py

@@ -52,7 +52,7 @@ def get_for_user(
 
         base_team_qs = self.filter(organization=organization, status=TeamStatus.ACTIVE)
 
-        if env.request and is_active_superuser(env.request) or settings.SENTRY_PUBLIC:
+        if env.request and is_active_superuser(env.request):
             team_list = list(base_team_qs)
         else:
             try:

Diff for: src/sentry/organizations/services/organization/impl.py

@@ -318,14 +318,6 @@ def set_user_for_organization_member(
     def _query_organizations(
         self, user_id: int, scope: str | None, only_visible: bool
     ) -> list[Organization]:
-        from django.conf import settings
-
-        if settings.SENTRY_PUBLIC and scope is None:
-            if only_visible:
-                return list(Organization.objects.filter(status=OrganizationStatus.ACTIVE))
-            else:
-                return list(Organization.objects.filter())
-
         qs = OrganizationMember.objects.filter(user_id=user_id)
 
         qs = qs.select_related("organization")

Diff for: src/sentry/testutils/pytest/sentry.py

@@ -145,8 +145,6 @@ def pytest_configure(config: pytest.Config) -> None:
     # override a few things with our test specifics
     install_plugin_apps("sentry.apps", settings)
     settings.INSTALLED_APPS = tuple(settings.INSTALLED_APPS) + ("fixtures",)
-    # Need a predictable key for tests that involve checking signatures
-    settings.SENTRY_PUBLIC = False
 
     if not settings.SENTRY_CACHE:
         settings.SENTRY_CACHE = "sentry.cache.django.DjangoCache"

Diff for: tests/sentry/models/test_projectkey.py

@@ -43,9 +43,9 @@ def test_get_dsn_with_port(self):
 
     def test_get_dsn_with_public_endpoint_setting(self):
         key = ProjectKey(project_id=self.project.id, public_key="public", secret_key="secret")
-        with self.settings(SENTRY_PUBLIC_ENDPOINT="http://public_endpoint.com"):
+        with self.settings(SENTRY_ENDPOINT="http://endpoint.com"):
             self.assertEqual(
-                key.get_dsn(public=True), f"http://public@public_endpoint.com/{self.project.id}"
+                key.get_dsn(public=True), f"http://public@endpoint.com/{self.project.id}"
             )
 
     def test_get_dsn_with_endpoint_setting(self):