ref(messaging): Removing Integration Namespace Imports

src/sentry/api/endpoints/group_integrations.py

@@ -7,12 +7,13 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from sentry import features, integrations
+from sentry import features
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases import GroupEndpoint
 from sentry.api.serializers import IntegrationSerializer, serialize
 from sentry.integrations.base import IntegrationFeatures
+from sentry.integrations.manager import default_manager as integrations
 from sentry.models.group import Group
 from sentry.models.grouplink import GroupLink
 from sentry.models.integrations.external_issue import ExternalIssue

src/sentry/api/endpoints/integrations/index.py

@@ -1,13 +1,14 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from sentry import features, integrations
+from sentry import features
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.organization import OrganizationEndpoint
 from sentry.api.serializers import serialize
 from sentry.api.serializers.models.integration import IntegrationProviderSerializer
+from sentry.integrations.manager import default_manager as integrations
 
 
 @region_silo_endpoint

src/sentry/api/endpoints/integrations/install_request.py

@@ -3,11 +3,11 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from sentry import integrations
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.organization_request_change import OrganizationRequestChangeEndpoint
+from sentry.integrations.manager import default_manager as integrations
 from sentry.notifications.notifications.organization_request.integration_request import (
     IntegrationRequestNotification,
 )

src/sentry/api/endpoints/project_repo_path_parsing.py

@@ -5,12 +5,12 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from sentry import integrations
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.project import ProjectEndpoint, ProjectPermission
 from sentry.api.serializers.rest_framework.base import CamelSnakeSerializer
 from sentry.integrations.base import IntegrationFeatures
+from sentry.integrations.manager import default_manager as integrations
 from sentry.integrations.utils.code_mapping import find_roots
 from sentry.models.repository import Repository
 from sentry.services.hybrid_cloud.integration import RpcIntegration, integration_service

src/sentry/api/serializers/models/user_identity_config.py

@@ -8,12 +8,12 @@
 
 from django.db.models.base import Model
 
-import sentry.integrations
 from sentry.api.serializers import Serializer, register, serialize
 from sentry.api.serializers.models import ControlSiloOrganizationSerializer
 from sentry.auth.provider import Provider
 from sentry.exceptions import NotRegistered
 from sentry.identity import is_login_provider
+from sentry.integrations.manager import default_manager as integrations
 from sentry.models.authidentity import AuthIdentity
 from sentry.models.identity import Identity
 from sentry.services.hybrid_cloud.organization_mapping import organization_mapping_service
@@ -88,7 +88,7 @@ def base(**kwargs):
             try:
                 provider = identity.get_provider()
             except NotRegistered:
-                provider = sentry.integrations.get(identity.idp.type)
+                provider = integrations.get(identity.idp.type)
 
             return base(
                 provider=UserIdentityProvider.adapt(provider),

src/sentry/integrations/__init__.py

@@ -34,12 +34,3 @@
 from .analytics import register_analytics
 
 register_analytics()
-
-from .manager import IntegrationManager
-
-default_manager = IntegrationManager()
-all = default_manager.all
-get = default_manager.get
-exists = default_manager.exists
-register = default_manager.register
-unregister = default_manager.unregister

src/sentry/integrations/manager.py

@@ -46,3 +46,11 @@ def unregister(self, cls: type[IntegrationProvider]) -> None:
             # we gracefully handle a missing provider
             return
         del self.__values[cls.key]
+
+
+default_manager = IntegrationManager()
+all = default_manager.all
+get = default_manager.get
+exists = default_manager.exists
+register = default_manager.register
+unregister = default_manager.unregister

src/sentry/integrations/pipeline.py

@@ -26,7 +26,7 @@
 
 logger = logging.getLogger(__name__)
 
-from . import default_manager
+from sentry.integrations.manager import default_manager
 
 
 def ensure_integration(key, data):

src/sentry/models/integrations/utils.py

@@ -15,7 +15,7 @@
 
 
 def get_provider(instance: Integration | RpcIntegration) -> IntegrationProvider:
-    from sentry import integrations
+    from sentry.integrations.manager import default_manager as integrations
 
     return integrations.get(instance.provider)
 

src/sentry/notifications/utils/__init__.py

@@ -14,10 +14,10 @@
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 
-from sentry import integrations
 from sentry.eventstore.models import Event, GroupEvent
 from sentry.incidents.models.alert_rule import AlertRuleTriggerAction
 from sentry.integrations.base import IntegrationFeatures, IntegrationProvider
+from sentry.integrations.manager import default_manager as integrations
 from sentry.issues.grouptype import (
     PerformanceConsecutiveDBQueriesGroupType,
     PerformanceNPlusOneAPICallsGroupType,

src/sentry/runner/initializer.py

@@ -53,7 +53,7 @@ def register_plugins(settings: Any, raise_on_plugin_load_failure: bool = False)
     for plugin in plugins.all(version=None):
         init_plugin(plugin)
 
-    from sentry import integrations
+    from sentry.integrations.manager import default_manager as integrations
     from sentry.utils.imports import import_string
 
     for integration_path in settings.SENTRY_DEFAULT_INTEGRATIONS:

src/sentry/testutils/pytest/sentry.py

@@ -313,7 +313,6 @@ def register_extensions() -> None:
 
     plugins.register(TestIssuePlugin2)
 
-    from sentry import integrations
     from sentry.integrations.example import (
         AlertRuleIntegrationProvider,
         AliasedIntegrationProvider,
@@ -322,6 +321,7 @@ def register_extensions() -> None:
         FeatureFlagIntegration,
         ServerExampleProvider,
     )
+    from sentry.integrations.manager import default_manager as integrations
 
     integrations.register(ExampleIntegrationProvider)
     integrations.register(AliasedIntegrationProvider)

src/sentry/web/frontend/integration_extension_configuration.py

@@ -7,7 +7,8 @@
 from django.urls import reverse
 from django.utils.http import urlencode
 
-from sentry import features, integrations
+from sentry import features
+from sentry.integrations.manager import default_manager as integrations
 from sentry.integrations.pipeline import IntegrationPipeline
 from sentry.services.hybrid_cloud.organization import organization_service
 from sentry.services.hybrid_cloud.user.service import user_service

tests/sentry/integrations/test_manager.py

@@ -1,4 +1,4 @@
-from sentry import integrations
+from sentry.integrations.manager import default_manager as integrations
 from sentry.integrations.vsts_extension import VstsExtensionIntegrationProvider
 from sentry.testutils.cases import TestCase