Browse Source

ref(control_silo): Consolidate integrations models and models' tests (#74745)

Moves all integrations models and related tests to the sentry/integrations/models or tests/sentry/integrations/models
directories. Updates imports to reflect the new path.

ref(#73859)
Christinarlong 7 months ago
parent
commit
9894a930b6

+ 1 - 1
fixtures/gitlab.py

@@ -1,8 +1,8 @@
 from time import time
 
 from sentry.integrations.gitlab.integration import GitlabIntegration
+from sentry.integrations.models.integration import Integration
 from sentry.models.identity import Identity, IdentityProvider
-from sentry.models.integrations.integration import Integration
 from sentry.models.repository import Repository
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import APITestCase

+ 1 - 1
fixtures/vsts.py

@@ -6,9 +6,9 @@ from urllib.parse import parse_qs, urlencode, urlparse
 import pytest
 import responses
 
+from sentry.integrations.models.integration import Integration
 from sentry.integrations.vsts import VstsIntegrationProvider
 from sentry.integrations.vsts.integration import VstsIntegration
-from sentry.models.integrations.integration import Integration
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import IntegrationTestCase
 from sentry.testutils.helpers.integrations import get_installation_of_type

+ 0 - 1
pyproject.toml

@@ -338,7 +338,6 @@ module = [
     "sentry.middleware.auth",
     "sentry.middleware.ratelimit",
     "sentry.middleware.superuser",
-    "sentry.models.integrations.external_issue",
     "sentry.models.integrations.sentry_app_installation",
     "sentry.models.organizationaccessrequest",
     "sentry.monitors.consumers.monitor_consumer",

+ 1 - 1
src/sentry/api/bases/doc_integrations.py

@@ -10,7 +10,7 @@ from sentry.api.bases.integration import PARANOID_GET
 from sentry.api.permissions import SentryPermission, StaffPermissionMixin
 from sentry.api.validators.doc_integration import METADATA_PROPERTIES
 from sentry.auth.superuser import is_active_superuser
-from sentry.models.integrations.doc_integration import DocIntegration
+from sentry.integrations.models.doc_integration import DocIntegration
 from sentry.utils.sdk import Scope
 
 

+ 1 - 1
src/sentry/api/bases/external_actor.py

@@ -16,9 +16,9 @@ from sentry.api.validators.external_actor import (
     validate_integration_id,
 )
 from sentry.api.validators.integrations import validate_provider
+from sentry.integrations.models.external_actor import ExternalActor
 from sentry.integrations.types import ExternalProviders
 from sentry.integrations.utils.providers import get_provider_choices
-from sentry.models.integrations.external_actor import ExternalActor
 from sentry.models.organization import Organization
 from sentry.models.team import Team
 from sentry.organizations.services.organization import organization_service

+ 2 - 2
src/sentry/api/bases/organization_integrations.py

@@ -7,13 +7,13 @@ from rest_framework.request import Request
 
 from sentry.api.bases.integration import IntegrationEndpoint, RegionIntegrationEndpoint
 from sentry.api.bases.organization import OrganizationIntegrationsPermission
+from sentry.integrations.models.integration import Integration
+from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.integrations.services.integration import (
     RpcIntegration,
     RpcOrganizationIntegration,
     integration_service,
 )
-from sentry.models.integrations.integration import Integration
-from sentry.models.integrations.organization_integration import OrganizationIntegration
 
 
 class OrganizationIntegrationBaseEndpoint(IntegrationEndpoint):

+ 1 - 1
src/sentry/api/endpoints/avatar/doc_integration.py

@@ -4,7 +4,7 @@ from sentry.api.base import control_silo_endpoint
 from sentry.api.bases.avatar import AvatarMixin
 from sentry.api.bases.doc_integrations import DocIntegrationBaseEndpoint
 from sentry.api.serializers.rest_framework.doc_integration import DocIntegrationAvatarSerializer
-from sentry.models.avatars.doc_integration_avatar import DocIntegrationAvatar
+from sentry.integrations.models.doc_integration_avatar import DocIntegrationAvatar
 
 
 @control_silo_endpoint

+ 1 - 1
src/sentry/api/endpoints/codeowners/__init__.py

@@ -10,7 +10,7 @@ from rest_framework.request import Request
 from sentry import analytics, features
 from sentry.api.serializers.rest_framework.base import CamelSnakeModelSerializer
 from sentry.api.validators.project_codeowners import validate_codeowners_associations
-from sentry.models.integrations.repository_project_path_config import RepositoryProjectPathConfig
+from sentry.integrations.models.repository_project_path_config import RepositoryProjectPathConfig
 from sentry.models.project import Project
 from sentry.models.projectcodeowners import ProjectCodeOwners
 from sentry.ownership.grammar import convert_codeowners_syntax, create_schema_from_issue_owners

+ 1 - 1
src/sentry/api/endpoints/codeowners/external_actor/team_details.py

@@ -11,7 +11,7 @@ from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.external_actor import ExternalActorEndpointMixin, ExternalTeamSerializer
 from sentry.api.bases.team import TeamEndpoint
 from sentry.api.serializers import serialize
-from sentry.models.integrations.external_actor import ExternalActor
+from sentry.integrations.models.external_actor import ExternalActor
 from sentry.models.team import Team
 
 logger = logging.getLogger(__name__)

+ 1 - 1
src/sentry/api/endpoints/codeowners/external_actor/user_details.py

@@ -13,7 +13,7 @@ from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.external_actor import ExternalActorEndpointMixin, ExternalUserSerializer
 from sentry.api.bases.organization import OrganizationEndpoint
 from sentry.api.serializers import serialize
-from sentry.models.integrations.external_actor import ExternalActor
+from sentry.integrations.models.external_actor import ExternalActor
 from sentry.models.organization import Organization
 
 logger = logging.getLogger(__name__)

Some files were not shown because too many files changed in this diff