chore(sentry_app): Move SentryAppComponent to sentry_apps (#77752)

migrate SentryAppComponent model to sentry_apps! [X] model [] tests - N/A [] typing - N/A [] getsentry shim - N/A issue ref(#73857)
getsentry · Sep 19, 2024 · e6c247a · e6c247a
1 parent 0ce1631
commit e6c247a
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 16 deletions.
diff --git a/src/sentry/api/endpoints/integrations/sentry_apps/components.py b/src/sentry/api/endpoints/integrations/sentry_apps/components.py
@@ -10,12 +10,12 @@
 from sentry.api.paginator import OffsetPaginator
 from sentry.api.serializers import serialize
 from sentry.coreapi import APIError
-from sentry.models.integrations.sentry_app_component import SentryAppComponent
 from sentry.organizations.services.organization.model import (
     RpcOrganization,
     RpcUserOrganizationContext,
 )
 from sentry.sentry_apps.components import SentryAppComponentPreparer
+from sentry.sentry_apps.models.sentry_app_component import SentryAppComponent
 from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
 
 

diff --git a/src/sentry/api/serializers/models/sentry_app_component.py b/src/sentry/api/serializers/models/sentry_app_component.py
@@ -2,7 +2,7 @@
 
 from sentry.api.serializers import Serializer, register
 from sentry.api.serializers.base import serialize
-from sentry.models.integrations.sentry_app_component import SentryAppComponent
+from sentry.sentry_apps.models.sentry_app_component import SentryAppComponent
 from sentry.sentry_apps.services.app import SentryAppEventDataInterface
 
 

diff --git a/src/sentry/mediators/alert_rule_actions/creator.py b/src/sentry/mediators/alert_rule_actions/creator.py
@@ -8,7 +8,7 @@
 )
 from sentry.mediators.mediator import Mediator
 from sentry.mediators.param import Param
-from sentry.models.integrations.sentry_app_component import SentryAppComponent
+from sentry.sentry_apps.models.sentry_app_component import SentryAppComponent
 from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
 
 

diff --git a/src/sentry/models/integrations/__init__.py b/src/sentry/models/integrations/__init__.py
@@ -1,13 +1,11 @@
 __all__ = (
     "SentryApp",
-    "SentryAppComponent",
     "SentryAppInstallationForProvider",
 )
 
 
 # REQUIRED for migrations to run.
 from sentry.integrations.types import ExternalProviders  # NOQA
-from sentry.models.integrations.sentry_app_component import SentryAppComponent
 from sentry.models.integrations.sentry_app_installation_for_provider import (
     SentryAppInstallationForProvider,
 )

diff --git a/src/sentry/rules/actions/services.py b/src/sentry/rules/actions/services.py
@@ -45,7 +45,7 @@ def service_type(self) -> str:
         return "sentry_app"
 
     def has_alert_rule_action(self) -> bool:
-        from sentry.models.integrations.sentry_app_component import SentryAppComponent
+        from sentry.sentry_apps.models.sentry_app_component import SentryAppComponent
 
         exists: bool = SentryAppComponent.objects.filter(
             sentry_app_id=self.service.id, type="alert-rule-action"

diff --git a/src/sentry/sentry_apps/components.py b/src/sentry/sentry_apps/components.py
@@ -9,7 +9,7 @@
 from django.utils.http import urlencode
 
 from sentry.mediators.external_requests.select_requester import SelectRequester
-from sentry.models.integrations.sentry_app_component import SentryAppComponent
+from sentry.sentry_apps.models.sentry_app_component import SentryAppComponent
 from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
 from sentry.sentry_apps.services.app.model import RpcSentryAppComponent, RpcSentryAppInstallation
 from sentry.sentry_apps.services.app.serial import serialize_sentry_app_installation

diff --git a/src/sentry/sentry_apps/logic.py b/src/sentry/sentry_apps/logic.py
@@ -24,7 +24,6 @@
 from sentry.models.apiapplication import ApiApplication
 from sentry.models.apiscopes import add_scope_hierarchy
 from sentry.models.apitoken import ApiToken
-from sentry.models.integrations.sentry_app_component import SentryAppComponent
 from sentry.sentry_apps.installations import (
     SentryAppInstallationCreator,
     SentryAppInstallationTokenCreator,
@@ -36,6 +35,7 @@
     SentryApp,
     default_uuid,
 )
+from sentry.sentry_apps.models.sentry_app_component import SentryAppComponent
 from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
 from sentry.tasks.sentry_apps import create_or_update_service_hooks_for_sentry_app
 from sentry.users.models.user import User

diff --git a/src/sentry/sentry_apps/models/__init__.py b/src/sentry/sentry_apps/models/__init__.py
@@ -1,5 +1,6 @@
 from .sentry_app import SentryApp
+from .sentry_app_component import SentryAppComponent
 from .sentry_app_installation import SentryAppInstallation
 from .sentry_app_installation_token import SentryAppInstallationToken
 
-__all__ = ("SentryApp", "SentryAppInstallationToken", "SentryAppInstallation")
+__all__ = ("SentryApp", "SentryAppInstallationToken", "SentryAppInstallation", "SentryAppComponent")
diff --git a/...dels/integrations/sentry_app_component.py → ...entry_apps/models/sentry_app_component.py b/...dels/integrations/sentry_app_component.py → ...entry_apps/models/sentry_app_component.py
diff --git a/src/sentry/sentry_apps/models/sentry_app_installation.py b/src/sentry/sentry_apps/models/sentry_app_installation.py
@@ -22,7 +22,7 @@
 
 if TYPE_CHECKING:
     from sentry.models.apitoken import ApiToken
-    from sentry.models.integrations.sentry_app_component import SentryAppComponent
+    from sentry.sentry_apps.models.sentry_app_component import SentryAppComponent
     from sentry.models.project import Project
 
 from sentry.hybridcloud.models.outbox import ControlOutboxBase, outbox_context
@@ -193,7 +193,7 @@ def prepare_sentry_app_components(
     project_slug: str | None = None,
     values: list[Mapping[str, Any]] | None = None,
 ) -> SentryAppComponent | None:
-    from sentry.models.integrations.sentry_app_component import SentryAppComponent
+    from sentry.sentry_apps.models.sentry_app_component import SentryAppComponent
 
     try:
         component = SentryAppComponent.objects.get(

diff --git a/src/sentry/sentry_apps/services/app/impl.py b/src/sentry/sentry_apps/services/app/impl.py
@@ -11,9 +11,9 @@
 from sentry.constants import SentryAppInstallationStatus, SentryAppStatus
 from sentry.hybridcloud.rpc.filter_query import FilterQueryDatabaseImpl, OpaqueSerializedResponse
 from sentry.mediators import alert_rule_actions
-from sentry.models.integrations.sentry_app_component import SentryAppComponent
 from sentry.sentry_apps.logic import SentryAppCreator
 from sentry.sentry_apps.models.sentry_app import SentryApp
+from sentry.sentry_apps.models.sentry_app_component import SentryAppComponent
 from sentry.sentry_apps.models.sentry_app_installation import (
     SentryAppInstallation,
     prepare_sentry_app_components,

diff --git a/src/sentry/sentry_apps/services/app/serial.py b/src/sentry/sentry_apps/services/app/serial.py
@@ -1,8 +1,8 @@
 from sentry.constants import SentryAppStatus
 from sentry.models.apiapplication import ApiApplication
 from sentry.models.apitoken import ApiToken
-from sentry.models.integrations import SentryAppComponent
 from sentry.sentry_apps.models.sentry_app import SentryApp
+from sentry.sentry_apps.models.sentry_app_component import SentryAppComponent
 from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
 from sentry.sentry_apps.services.app import (
     RpcApiApplication,

diff --git a/tests/sentry/incidents/endpoints/test_organization_alert_rule_available_action_index.py b/tests/sentry/incidents/endpoints/test_organization_alert_rule_available_action_index.py
@@ -9,7 +9,7 @@
 from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.integrations.pagerduty.utils import add_service
 from sentry.integrations.services.integration.serial import serialize_integration
-from sentry.models.integrations import SentryAppComponent
+from sentry.sentry_apps.models.sentry_app_component import SentryAppComponent
 from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
 from sentry.sentry_apps.services.app.serial import serialize_sentry_app_installation
 from sentry.silo.base import SiloMode

diff --git a/tests/sentry/sentry_apps/test_sentry_app_creator.py b/tests/sentry/sentry_apps/test_sentry_app_creator.py
@@ -6,9 +6,9 @@
 from sentry.integrations.models.integration_feature import IntegrationFeature, IntegrationTypes
 from sentry.models.apiapplication import ApiApplication
 from sentry.models.auditlogentry import AuditLogEntry
-from sentry.models.integrations.sentry_app_component import SentryAppComponent
 from sentry.sentry_apps.logic import SentryAppCreator
 from sentry.sentry_apps.models.sentry_app import SentryApp
+from sentry.sentry_apps.models.sentry_app_component import SentryAppComponent
 from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
 from sentry.testutils.cases import TestCase
 from sentry.testutils.silo import control_silo_test

diff --git a/tests/sentry/sentry_apps/test_sentry_app_updater.py b/tests/sentry/sentry_apps/test_sentry_app_updater.py
@@ -6,10 +6,10 @@
 from sentry.constants import SentryAppStatus
 from sentry.coreapi import APIError
 from sentry.models.apitoken import ApiToken
-from sentry.models.integrations.sentry_app_component import SentryAppComponent
 from sentry.models.servicehook import ServiceHook
 from sentry.sentry_apps.logic import SentryAppUpdater, expand_events
 from sentry.sentry_apps.models.sentry_app import SentryApp
+from sentry.sentry_apps.models.sentry_app_component import SentryAppComponent
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
 from sentry.testutils.silo import assume_test_silo_mode, control_silo_test