ref: remove coreapi, use ParseError in sentry_app logic (#97913)

removes the coreapi module. The only export that was used was
`APIError`, and we can consolidate this onto
`rest_framework.exceptions.ParseError`.

Author: JoshFerge

pyproject.toml

@@ -668,7 +668,6 @@ module = [
     "tests.sentry.auth.services.*",
     "tests.sentry.celery.*",
     "tests.sentry.charts.*",
-    "tests.sentry.coreapi.*",
     "tests.sentry.data_export.processors.*",
     "tests.sentry.data_secrecy.*",
     "tests.sentry.debug.*",

src/sentry/coreapi.py

@@ -2,7 +2,6 @@
 
 import logging
 from collections.abc import Sequence
-from functools import wraps
 from typing import Any
 
 import sentry_sdk
@@ -15,7 +14,6 @@
 from sentry.api.permissions import SentryPermission, StaffPermissionMixin
 from sentry.auth.staff import is_active_staff
 from sentry.auth.superuser import is_active_superuser, superuser_has_permission
-from sentry.coreapi import APIError
 from sentry.integrations.api.bases.integration import PARANOID_GET
 from sentry.models.organization import OrganizationStatus
 from sentry.organizations.services.organization import (
@@ -39,17 +37,6 @@
 logger = logging.getLogger(__name__)
 
 
-def catch_raised_errors(func):
-    @wraps(func)
-    def wrapped(self, *args, **kwargs):
-        try:
-            return func(self, *args, **kwargs)
-        except APIError as e:
-            return Response({"detail": e.msg}, status=400)
-
-    return wrapped
-
-
 def ensure_scoped_permission(request: Request, allowed_scopes: Sequence[str] | None) -> bool:
     """
     Verifies the User making the request has at least one required scope for

src/sentry/sentry_apps/api/bases/sentryapps.py

@@ -23,7 +23,6 @@
 from sentry.sentry_apps.api.bases.sentryapps import (
     SentryAppAndStaffPermission,
     SentryAppBaseEndpoint,
-    catch_raised_errors,
 )
 from sentry.sentry_apps.api.parsers.sentry_app import SentryAppParser
 from sentry.sentry_apps.api.serializers.sentry_app import (
@@ -99,7 +98,6 @@ def get(self, request: Request, sentry_app) -> Response:
         },
         examples=SentryAppExamples.UPDATE_SENTRY_APP,
     )
-    @catch_raised_errors
     def put(self, request: Request, sentry_app) -> Response:
         """
         Update an existing custom integration.

src/sentry/sentry_apps/api/endpoints/sentry_app_details.py

@@ -10,14 +10,13 @@
 from django.db.models import Q
 from django.http.request import HttpRequest
 from django.utils import timezone
-from rest_framework.exceptions import ValidationError
+from rest_framework.exceptions import ParseError, ValidationError
 from sentry_sdk.api import isolation_scope
 
 from sentry import analytics, audit_log
 from sentry.api.helpers.slugs import sentry_slugify
 from sentry.auth.staff import has_staff_option
 from sentry.constants import SentryAppStatus
-from sentry.coreapi import APIError
 from sentry.db.postgres.transactions import in_test_hide_transaction_boundary
 from sentry.integrations.models.integration_feature import IntegrationFeature, IntegrationTypes
 from sentry.models.apiapplication import ApiApplication
@@ -141,7 +140,7 @@ def run(self, user: User | RpcUser) -> SentryApp:
     def _update_features(self, user: User | RpcUser) -> None:
         if self.features is not None:
             if not _is_elevated_user(user) and self.sentry_app.status == SentryAppStatus.PUBLISHED:
-                raise APIError("Cannot update features on a published integration.")
+                raise ParseError(detail="Cannot update features on a published integration.")
 
             IntegrationFeature.objects.clean_update(
                 incoming_features=self.features,
@@ -173,7 +172,7 @@ def _update_scopes(self) -> None:
             if self.sentry_app.status == SentryAppStatus.PUBLISHED and set(
                 self.sentry_app.scope_list
             ) != set(self.scopes):
-                raise APIError("Cannot update permissions on a published integration.")
+                raise ParseError(detail="Cannot update permissions on a published integration.")
 
             # We are using a pre_save signal to enforce scope hierarchy on the ApiToken model.
             # Because we're using bulk_update here to update all the tokens for the SentryApp,
@@ -198,7 +197,9 @@ def _update_events(self) -> None:
             for event in self.events:
                 needed_scope = REQUIRED_EVENT_PERMISSIONS[event]
                 if needed_scope not in self.sentry_app.scope_list:
-                    raise APIError(f"{event} webhooks require the {needed_scope} permission.")
+                    raise ParseError(
+                        detail=f"{event} webhooks require the {needed_scope} permission."
+                    )
 
             self.sentry_app.events = expand_events(self.events)
 
@@ -243,7 +244,7 @@ def _update_is_alertable(self) -> None:
     def _update_verify_install(self) -> None:
         if self.verify_install is not None:
             if self.sentry_app.is_internal and self.verify_install:
-                raise APIError("Internal integrations cannot have verify_install=True.")
+                raise ParseError(detail="Internal integrations cannot have verify_install=True.")
             self.sentry_app.verify_install = self.verify_install
 
     def _update_overview(self) -> None:

src/sentry/sentry_apps/logic.py

@@ -8,6 +8,7 @@
 from django.utils import timezone
 from jsonschema import ValidationError
 
+from sentry.api.exceptions import BadRequest
 from sentry.auth.services.auth import AuthenticatedToken
 from sentry.backup.scopes import RelocationScope
 from sentry.constants import SentryAppInstallationStatus
@@ -235,7 +236,6 @@ def prepare_ui_component(
     project_slug: str | None = None,
     values: list[Mapping[str, Any]] | None = None,
 ) -> SentryAppComponent | RpcSentryAppComponent | None:
-    from sentry.coreapi import APIError
     from sentry.sentry_apps.components import SentryAppComponentPreparer
 
     if values is None:
@@ -246,7 +246,7 @@ def prepare_ui_component(
         ).run()
         return component
     except (
-        APIError,
+        BadRequest,
         ValidationError,
         SentryAppIntegratorError,
         SentryAppError,

src/sentry/sentry_apps/models/sentry_app_installation.py

@@ -2,10 +2,10 @@
 from unittest.mock import MagicMock, patch
 
 import responses
+from rest_framework.exceptions import ParseError
 
 from sentry.api.serializers.base import serialize
 from sentry.constants import SentryAppInstallationStatus
-from sentry.coreapi import APIError
 from sentry.sentry_apps.models.sentry_app import SentryApp
 from sentry.sentry_apps.models.sentry_app_component import SentryAppComponent
 from sentry.sentry_apps.utils.errors import SentryAppIntegratorError, SentryAppSentryError
@@ -370,7 +370,7 @@ def test_component_prep_general_error(
     def test_component_prep_errors_dont_bring_down_everything(
         self, run: MagicMock, capture_exception: MagicMock
     ) -> None:
-        run.side_effect = [APIError(), SentryAppSentryError(message="kewl")]
+        run.side_effect = [ParseError(), SentryAppSentryError(message="kewl")]
         capture_exception.return_value = 1
 
         response = self.get_success_response(

tests/sentry/coreapi/test_coreapi.py

@@ -3,9 +3,9 @@
 
 import pytest
 from django.utils import timezone
+from rest_framework.exceptions import ParseError
 
 from sentry.constants import SentryAppStatus
-from sentry.coreapi import APIError
 from sentry.integrations.types import EventLifecycleOutcome
 from sentry.models.apitoken import ApiToken
 from sentry.sentry_apps.logic import SentryAppUpdater, expand_events
@@ -100,7 +100,7 @@ def test_doesnt_update_published_app_scopes(self) -> None:
         updater = SentryAppUpdater(sentry_app=sentry_app)
         updater.scopes = ["project:read", "project:write"]
 
-        with pytest.raises(APIError):
+        with pytest.raises(ParseError):
             updater.run(self.user)
 
     def test_update_webhook_published_app(self) -> None:
@@ -120,15 +120,15 @@ def test_doesnt_update_app_with_invalid_event_permissions(self) -> None:
         )
         updater = SentryAppUpdater(sentry_app=sentry_app)
         updater.events = ["issue"]
-        with pytest.raises(APIError):
+        with pytest.raises(ParseError):
             updater.run(self.user)
 
     def test_doesnt_update_verify_install_if_internal(self) -> None:
         self.create_project(organization=self.org)
         sentry_app = self.create_internal_integration(name="Internal", organization=self.org)
         updater = SentryAppUpdater(sentry_app=sentry_app)
         updater.verify_install = True
-        with pytest.raises(APIError):
+        with pytest.raises(ParseError):
             updater.run(self.user)
 
     def test_updates_service_hook_events(self) -> None: