chore(scm): remove indirect imports for bitbucket and gitlab (#77609)

getsentry · Sep 17, 2024 · 9549192 · 9549192
1 parent e13e984
commit 9549192
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 32 deletions.
diff --git a/src/sentry/conf/server.py b/src/sentry/conf/server.py
@@ -2478,12 +2478,12 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
 SENTRY_USE_X_FORWARDED_FOR = True
 
 SENTRY_DEFAULT_INTEGRATIONS = (
-    "sentry.integrations.bitbucket.BitbucketIntegrationProvider",
-    "sentry.integrations.bitbucket_server.BitbucketServerIntegrationProvider",
+    "sentry.integrations.bitbucket.integration.BitbucketIntegrationProvider",
+    "sentry.integrations.bitbucket_server.integration.BitbucketServerIntegrationProvider",
     "sentry.integrations.slack.SlackIntegrationProvider",
     "sentry.integrations.github.integration.GitHubIntegrationProvider",
     "sentry.integrations.github_enterprise.integration.GitHubEnterpriseIntegrationProvider",
-    "sentry.integrations.gitlab.GitlabIntegrationProvider",
+    "sentry.integrations.gitlab.integration.GitlabIntegrationProvider",
     "sentry.integrations.jira.JiraIntegrationProvider",
     "sentry.integrations.jira_server.JiraServerIntegrationProvider",
     "sentry.integrations.vsts.VstsIntegrationProvider",

diff --git a/src/sentry/integrations/bitbucket/__init__.py b/src/sentry/integrations/bitbucket/__init__.py
@@ -1,11 +0,0 @@
-from .client import *  # noqa: F401,F403
-from .constants import *  # noqa: F401,F403
-from .descriptor import *  # noqa: F401,F403
-from .installed import *  # noqa: F401,F403
-from .integration import *  # noqa: F401,F403
-from .issues import *  # noqa: F401,F403
-from .repository import *  # noqa: F401,F403
-from .search import *  # noqa: F401,F403
-from .uninstalled import *  # noqa: F401,F403
-from .urls import *  # noqa: F401,F403
-from .webhook import *  # noqa: F401,F403

diff --git a/src/sentry/integrations/bitbucket_server/__init__.py b/src/sentry/integrations/bitbucket_server/__init__.py
@@ -1,5 +0,0 @@
-from .client import *  # noqa: F401,F403
-from .integration import *  # noqa: F401,F403
-from .repository import *  # noqa: F401,F403
-from .urls import *  # noqa: F401,F403
-from .webhook import *  # noqa: F401,F403

diff --git a/src/sentry/integrations/gitlab/__init__.py b/src/sentry/integrations/gitlab/__init__.py
@@ -1,7 +0,0 @@
-from .client import *  # noqa: F401,F403
-from .integration import *  # noqa: F401,F403
-from .issues import *  # noqa: F401,F403
-from .repository import *  # noqa: F401,F403
-from .search import *  # noqa: F401,F403
-from .urls import *  # noqa: F401,F403
-from .webhooks import *  # noqa: F401,F403

diff --git a/src/sentry/middleware/integrations/parsers/bitbucket.py b/src/sentry/middleware/integrations/parsers/bitbucket.py
@@ -4,7 +4,7 @@
 from typing import Any
 
 from sentry.hybridcloud.outbox.category import WebhookProviderIdentifier
-from sentry.integrations.bitbucket import BitbucketWebhookEndpoint
+from sentry.integrations.bitbucket.webhook import BitbucketWebhookEndpoint
 from sentry.integrations.middleware.hybrid_cloud.parser import BaseRequestParser
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.types.region import RegionResolutionError, get_region_by_name

diff --git a/tests/sentry/integrations/bitbucket/test_integration.py b/tests/sentry/integrations/bitbucket/test_integration.py
@@ -3,7 +3,7 @@
 import responses
 from django.urls import reverse
 
-from sentry.integrations.bitbucket import BitbucketIntegrationProvider
+from sentry.integrations.bitbucket.integration import BitbucketIntegrationProvider
 from sentry.integrations.models.integration import Integration
 from sentry.models.repository import Repository
 from sentry.silo.base import SiloMode

diff --git a/tests/sentry/integrations/bitbucket_server/test_integration.py b/tests/sentry/integrations/bitbucket_server/test_integration.py
@@ -2,7 +2,7 @@
 from requests.exceptions import ReadTimeout
 
 from fixtures.bitbucket_server import EXAMPLE_PRIVATE_KEY
-from sentry.integrations.bitbucket_server import BitbucketServerIntegrationProvider
+from sentry.integrations.bitbucket_server.integration import BitbucketServerIntegrationProvider
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.testutils.cases import IntegrationTestCase

diff --git a/tests/sentry/integrations/gitlab/test_integration.py b/tests/sentry/integrations/gitlab/test_integration.py
@@ -10,10 +10,9 @@
 from django.test import override_settings
 
 from fixtures.gitlab import GET_COMMIT_RESPONSE, GitLabTestCase
-from sentry.integrations.gitlab import GitlabIntegrationProvider
 from sentry.integrations.gitlab.blame import GitLabCommitResponse, GitLabFileBlameResponseItem
 from sentry.integrations.gitlab.client import GitLabApiClient, GitLabSetupApiClient
-from sentry.integrations.gitlab.integration import GitlabIntegration
+from sentry.integrations.gitlab.integration import GitlabIntegration, GitlabIntegrationProvider
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.integrations.source_code_management.commit_context import (

diff --git a/tests/sentry/integrations/test_pipeline.py b/tests/sentry/integrations/test_pipeline.py
@@ -438,7 +438,7 @@ def test_disabled_plugin_when_fully_migrated(self, call, *args):
 
 @control_silo_test
 @patch(
-    "sentry.integrations.gitlab.GitlabIntegrationProvider.build_integration",
+    "sentry.integrations.gitlab.integration.GitlabIntegrationProvider.build_integration",
     side_effect=naive_build_integration,
 )
 class GitlabFinishPipelineTest(IntegrationTestCase):