ref(messaging): Updated Integration Types Imports (#72262)

Final PR to update the rest of the integration imports in sentry over to
the new module that I created. I edit 1 `__init__.py` file, plan is to
clean it up completely in a followup pr.

src/sentry/api/bases/external_actor.py

@@ -16,13 +16,14 @@
     validate_integration_id,
 )
 from sentry.api.validators.integrations import validate_provider
+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.services.hybrid_cloud.organization import organization_service
 from sentry.services.hybrid_cloud.user import RpcUser
 from sentry.services.hybrid_cloud.user.service import user_service
-from sentry.types.integrations import ExternalProviders, get_provider_choices
 
 AVAILABLE_PROVIDERS = {
     ExternalProviders.GITHUB,

src/sentry/api/endpoints/user_notification_settings_providers.py

@@ -10,12 +10,12 @@
 from sentry.api.exceptions import ParameterValidationError
 from sentry.api.serializers import serialize
 from sentry.api.validators.notifications import validate_type
+from sentry.integrations.types import PERSONAL_NOTIFICATION_PROVIDERS
 from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.user import User
 from sentry.notifications.serializers import NotificationSettingsProviderSerializer
 from sentry.notifications.types import NotificationSettingsOptionEnum
 from sentry.notifications.validators import UserNotificationSettingsProvidersDetailsSerializer
-from sentry.types.integrations import PERSONAL_NOTIFICATION_PROVIDERS
 
 
 @control_silo_endpoint

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

@@ -2,9 +2,9 @@
 from typing import Any, TypedDict
 
 from sentry.api.serializers import Serializer, register
+from sentry.integrations.utils.providers import get_provider_string
 from sentry.models.integrations.external_actor import ExternalActor
 from sentry.models.user import User
-from sentry.types.integrations import get_provider_string
 
 
 class ExternalActorResponseOptional(TypedDict, total=False):

src/sentry/api/validators/external_actor.py

@@ -4,9 +4,9 @@
 
 from sentry.api.exceptions import ParameterValidationError
 from sentry.api.validators.integrations import validate_provider
+from sentry.integrations.types import ExternalProviders
 from sentry.models.organization import Organization
 from sentry.services.hybrid_cloud.integration import integration_service
-from sentry.types.integrations import ExternalProviders
 
 EXTERNAL_ID_LENGTH_MIN = 1
 EXTERNAL_ID_LENGTH_MAX = 64

src/sentry/api/validators/integrations.py

@@ -1,5 +1,6 @@
 from sentry.api.exceptions import ParameterValidationError
-from sentry.types.integrations import ExternalProviders, get_provider_enum
+from sentry.integrations.types import ExternalProviders
+from sentry.integrations.utils.providers import get_provider_enum
 
 
 def validate_provider(

src/sentry/api/validators/project_codeowners.py

@@ -5,14 +5,14 @@
 
 from django.db.models import Subquery
 
+from sentry.integrations.types import ExternalProviders
 from sentry.models.integrations.external_actor import ExternalActor
 from sentry.models.organizationmember import OrganizationMember
 from sentry.models.organizationmemberteam import OrganizationMemberTeam
 from sentry.models.project import Project
 from sentry.models.team import Team
 from sentry.ownership.grammar import parse_code_owners
 from sentry.services.hybrid_cloud.user.service import user_service
-from sentry.types.integrations import ExternalProviders
 
 
 def validate_association_emails(

src/sentry/digests/utils.py

@@ -9,6 +9,7 @@
 
 from sentry.digests import Digest, Record
 from sentry.eventstore.models import Event
+from sentry.integrations.types import ExternalProviders
 from sentry.models.group import Group
 from sentry.models.project import Project
 from sentry.models.projectownership import ProjectOwnership
@@ -17,7 +18,6 @@
 from sentry.notifications.types import ActionTargetType, FallthroughChoiceType
 from sentry.notifications.utils.participants import get_send_to
 from sentry.types.actor import Actor
-from sentry.types.integrations import ExternalProviders
 
 
 def get_digest_metadata(

src/sentry/incidents/action_handlers.py

@@ -16,6 +16,7 @@
 from sentry.incidents.charts import build_metric_alert_chart
 from sentry.incidents.models.alert_rule import AlertRuleThresholdType, AlertRuleTriggerAction
 from sentry.incidents.models.incident import INCIDENT_STATUS, IncidentStatus, TriggerStatus
+from sentry.integrations.types import ExternalProviders
 from sentry.models.rulesnooze import RuleSnooze
 from sentry.models.user import User
 from sentry.notifications.types import NotificationSettingEnum
@@ -25,7 +26,6 @@
 from sentry.services.hybrid_cloud.user_option import RpcUserOption, user_option_service
 from sentry.snuba.metrics import format_mri_field, is_mri_field
 from sentry.types.actor import Actor, ActorType
-from sentry.types.integrations import ExternalProviders
 from sentry.utils.email import MessageBuilder, get_email_addresses
 
 

src/sentry/integrations/discord/message_builder/issues.py

@@ -17,11 +17,11 @@
     get_color,
     get_title_link,
 )
+from sentry.integrations.types import ExternalProviders
 from sentry.models.group import Group, GroupStatus
 from sentry.models.project import Project
 from sentry.models.rule import Rule
 from sentry.notifications.notifications.base import ProjectNotification
-from sentry.types.integrations import ExternalProviders
 
 from ..message_builder.base.component import DiscordComponentCustomIds as CustomIds
 

src/sentry/integrations/discord/views/link_identity.py

@@ -5,11 +5,11 @@
 from django.views.decorators.cache import never_cache
 
 from sentry import analytics
+from sentry.integrations.types import ExternalProviders
 from sentry.integrations.utils.identities import get_identity_or_404
 from sentry.models.identity import Identity
 from sentry.services.hybrid_cloud.integration.model import RpcIntegration
 from sentry.types.actor import ActorType
-from sentry.types.integrations import ExternalProviders
 from sentry.utils.http import absolute_uri
 from sentry.utils.signing import sign, unsign
 from sentry.web.frontend.base import BaseView, control_silo_view

src/sentry/integrations/discord/views/unlink_identity.py

@@ -6,11 +6,11 @@
 from django.views.decorators.cache import never_cache
 
 from sentry import analytics
+from sentry.integrations.types import ExternalProviders
 from sentry.integrations.utils.identities import get_identity_or_404
 from sentry.models.identity import Identity
 from sentry.services.hybrid_cloud.integration.model import RpcIntegration
 from sentry.types.actor import ActorType
-from sentry.types.integrations import ExternalProviders
 from sentry.utils.http import absolute_uri
 from sentry.utils.signing import sign, unsign
 from sentry.web.frontend.base import BaseView, control_silo_view

src/sentry/integrations/github/client.py

@@ -17,6 +17,7 @@
 )
 from sentry.integrations.github.utils import get_jwt, get_next_link
 from sentry.integrations.mixins.commit_context import FileBlameInfo, SourceLineInfo
+from sentry.integrations.types import EXTERNAL_PROVIDERS, ExternalProviders
 from sentry.integrations.utils.code_mapping import (
     MAX_CONNECTION_ERRORS,
     Repo,
@@ -31,7 +32,6 @@
 from sentry.shared_integrations.client.proxy import IntegrationProxyClient
 from sentry.shared_integrations.exceptions import ApiError, ApiRateLimitedError
 from sentry.shared_integrations.response.mapping import MappingApiResponse
-from sentry.types.integrations import EXTERNAL_PROVIDERS, ExternalProviders
 from sentry.utils import metrics
 from sentry.utils.cache import cache
 

src/sentry/integrations/issue_alert_image_builder.py

@@ -9,14 +9,14 @@
     get_approx_start_time,
     get_relative_time,
 )
+from sentry.integrations.types import ExternalProviderEnum
 from sentry.issues.grouptype import (
     PerformanceP95EndpointRegressionGroupType,
     ProfileFunctionRegressionType,
 )
 from sentry.models.apikey import ApiKey
 from sentry.models.group import Group
 from sentry.snuba.referrer import Referrer
-from sentry.types.integrations import ExternalProviderEnum
 from sentry.utils import metrics
 from sentry.utils.performance_issues.detectors.utils import escape_transaction
 

src/sentry/integrations/jira/integration.py

@@ -37,7 +37,7 @@
     IntegrationError,
     IntegrationFormError,
 )
-from sentry.tasks.integrations import migrate_issues
+from sentry.tasks.integrations.migrate_issues import migrate_issues
 from sentry.utils.strings import truncatechars
 
 from .client import JiraCloudClient

src/sentry/integrations/jira_server/integration.py

@@ -44,7 +44,7 @@
     IntegrationError,
     IntegrationFormError,
 )
-from sentry.tasks.integrations import migrate_issues
+from sentry.tasks.integrations.migrate_issues import migrate_issues
 from sentry.utils.hashlib import sha1_text
 from sentry.utils.http import absolute_uri
 from sentry.web.helpers import render_to_response

src/sentry/integrations/message_builder.py

@@ -6,6 +6,7 @@
 from sentry import features
 from sentry.eventstore.models import GroupEvent
 from sentry.integrations.slack.message_builder import LEVEL_TO_COLOR, SLACK_URL_FORMAT
+from sentry.integrations.types import EXTERNAL_PROVIDERS, ExternalProviders
 from sentry.issues.grouptype import GroupCategory
 from sentry.models.environment import Environment
 from sentry.models.group import Group
@@ -15,7 +16,6 @@
 from sentry.notifications.notifications.base import BaseNotification
 from sentry.notifications.notifications.rules import AlertRuleNotification
 from sentry.services.hybrid_cloud.user import RpcUser
-from sentry.types.integrations import EXTERNAL_PROVIDERS, ExternalProviders
 from sentry.utils.http import absolute_uri
 
 

src/sentry/integrations/msteams/card_builder/notifications.py

@@ -11,11 +11,11 @@
 from sentry.integrations.msteams.card_builder import MSTEAMS_URL_FORMAT
 from sentry.integrations.msteams.card_builder.base import MSTeamsMessageBuilder
 from sentry.integrations.msteams.card_builder.block import OpenUrlAction
+from sentry.integrations.types import ExternalProviders
 from sentry.notifications.notifications.activity.base import GroupActivityNotification
 from sentry.notifications.notifications.base import BaseNotification
 from sentry.notifications.utils.actions import MessageAction
 from sentry.types.actor import Actor
-from sentry.types.integrations import ExternalProviders
 
 from .block import (
     Action,

src/sentry/integrations/msteams/link_identity.py

@@ -5,9 +5,9 @@
 from django.views.decorators.cache import never_cache
 from rest_framework.request import Request
 
+from sentry.integrations.types import ExternalProviders
 from sentry.integrations.utils import get_identity_or_404
 from sentry.models.identity import Identity
-from sentry.types.integrations import ExternalProviders
 from sentry.utils.http import absolute_uri
 from sentry.utils.signing import sign, unsign
 from sentry.web.frontend.base import BaseView, control_silo_view

src/sentry/integrations/msteams/notifications.py

@@ -9,6 +9,7 @@
 from sentry.integrations.msteams.card_builder.block import AdaptiveCard
 from sentry.integrations.msteams.utils import get_user_conversation_id
 from sentry.integrations.notifications import get_context, get_integrations_by_channel_by_recipient
+from sentry.integrations.types import ExternalProviders
 from sentry.models.team import Team
 from sentry.models.user import User
 from sentry.notifications.notifications.activity.assigned import AssignedActivityNotification
@@ -25,7 +26,6 @@
 from sentry.notifications.notifications.rules import AlertRuleNotification
 from sentry.notifications.notify import register_notification_provider
 from sentry.types.actor import Actor
-from sentry.types.integrations import ExternalProviders
 from sentry.utils import metrics
 
 from .card_builder.notifications import (

src/sentry/integrations/notifications.py

@@ -5,6 +5,7 @@
 from typing import Any
 
 from sentry.constants import ObjectStatus
+from sentry.integrations.types import EXTERNAL_PROVIDERS, ExternalProviders
 from sentry.models.integrations.external_actor import ExternalActor
 from sentry.models.organization import Organization
 from sentry.models.team import Team
@@ -13,7 +14,6 @@
 from sentry.services.hybrid_cloud.integration import RpcIntegration, integration_service
 from sentry.services.hybrid_cloud.user import RpcUser
 from sentry.types.actor import Actor
-from sentry.types.integrations import EXTERNAL_PROVIDERS, ExternalProviders
 
 
 def get_context(

src/sentry/integrations/pagerduty/actions/form.py

@@ -6,8 +6,8 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
 
+from sentry.integrations.types import ExternalProviders
 from sentry.services.hybrid_cloud.integration import integration_service
-from sentry.types.integrations import ExternalProviders
 
 
 def _validate_int_field(field: str, cleaned_data: Mapping[str, Any]) -> int | None:

src/sentry/integrations/slack/client.py

@@ -9,10 +9,10 @@
 from sentry.constants import ObjectStatus
 from sentry.db.postgres.transactions import in_test_hide_transaction_boundary
 from sentry.integrations.client import ApiClient
+from sentry.integrations.types import EXTERNAL_PROVIDERS, ExternalProviders
 from sentry.services.hybrid_cloud.integration import integration_service
 from sentry.shared_integrations.client import BaseApiResponse
 from sentry.shared_integrations.exceptions import ApiError
-from sentry.types.integrations import EXTERNAL_PROVIDERS, ExternalProviders
 from sentry.utils import json, metrics
 
 SLACK_DATADOG_METRIC = "integrations.slack.http_response"

src/sentry/integrations/slack/message_builder/image_block_builder.py

@@ -2,12 +2,12 @@
 from sentry.integrations.issue_alert_image_builder import IssueAlertImageBuilder
 from sentry.integrations.slack.message_builder import SlackBlock
 from sentry.integrations.slack.message_builder.base.block import BlockSlackMessageBuilder
+from sentry.integrations.types import ExternalProviderEnum
 from sentry.issues.grouptype import (
     PerformanceP95EndpointRegressionGroupType,
     ProfileFunctionRegressionType,
 )
 from sentry.models.group import Group
-from sentry.types.integrations import ExternalProviderEnum
 
 IMAGE_ALT = {
     PerformanceP95EndpointRegressionGroupType: "P95(transaction.duration)",

src/sentry/integrations/slack/message_builder/issues.py

@@ -34,6 +34,7 @@
 from sentry.integrations.slack.message_builder.image_block_builder import ImageBlockBuilder
 from sentry.integrations.slack.message_builder.time_utils import get_approx_start_time, time_since
 from sentry.integrations.slack.utils.escape import escape_slack_markdown_text, escape_slack_text
+from sentry.integrations.types import ExternalProviders
 from sentry.issues.grouptype import (
     GroupCategory,
     PerformanceP95EndpointRegressionGroupType,
@@ -59,7 +60,6 @@
 from sentry.snuba.referrer import Referrer
 from sentry.types.actor import Actor
 from sentry.types.group import SUBSTATUS_TO_STR
-from sentry.types.integrations import ExternalProviders
 
 STATUSES = {"resolved": "resolved", "ignored": "ignored", "unresolved": "re-opened"}
 SUPPORTED_COMMIT_PROVIDERS = (

src/sentry/integrations/slack/message_builder/notifications/base.py

@@ -8,9 +8,9 @@
 from sentry.integrations.slack.message_builder import SlackBlock
 from sentry.integrations.slack.message_builder.base.block import BlockSlackMessageBuilder
 from sentry.integrations.slack.utils.escape import escape_slack_text
+from sentry.integrations.types import ExternalProviders
 from sentry.notifications.notifications.base import BaseNotification
 from sentry.types.actor import Actor
-from sentry.types.integrations import ExternalProviders
 
 
 class SlackNotificationsMessageBuilder(BlockSlackMessageBuilder):

src/sentry/integrations/slack/message_builder/notifications/daily_summary.py

@@ -11,12 +11,12 @@
 from sentry.integrations.message_builder import build_attachment_text, build_attachment_title
 from sentry.integrations.slack.message_builder import SlackBlock
 from sentry.integrations.slack.utils.escape import escape_slack_text
+from sentry.integrations.types import ExternalProviders
 from sentry.models.project import Project
 from sentry.models.release import Release
 from sentry.notifications.notifications.base import BaseNotification
 from sentry.tasks.summaries.utils import COMPARISON_PERIOD
 from sentry.types.actor import Actor
-from sentry.types.integrations import ExternalProviders
 from sentry.utils.http import absolute_uri
 
 from .base import SlackNotificationsMessageBuilder

src/sentry/integrations/slack/notifications.py

@@ -13,6 +13,7 @@
 from sentry.integrations.slack.message_builder import SlackBlock
 from sentry.integrations.slack.message_builder.base.block import BlockSlackMessageBuilder
 from sentry.integrations.slack.message_builder.notifications import get_message_builder
+from sentry.integrations.types import ExternalProviders
 from sentry.models.integrations.integration import Integration
 from sentry.notifications.additional_attachment_manager import get_additional_attachment
 from sentry.notifications.notifications.base import BaseNotification
@@ -21,7 +22,6 @@
 from sentry.silo.base import SiloMode
 from sentry.tasks.integrations.slack import post_message, post_message_control
 from sentry.types.actor import Actor
-from sentry.types.integrations import ExternalProviders
 from sentry.utils import metrics
 
 logger = logging.getLogger("sentry.notifications")

src/sentry/integrations/slack/service.py

@@ -15,6 +15,7 @@
     AssignedActivityNotification,
     ExternalIssueCreatedActivityNotification,
 )
+from sentry.integrations.types import ExternalProviderEnum
 from sentry.integrations.utils.common import get_active_integration_for_organization
 from sentry.models.activity import Activity
 from sentry.models.options.organization_option import OrganizationOption
@@ -31,7 +32,6 @@
 from sentry.notifications.notifications.activity.unassigned import UnassignedActivityNotification
 from sentry.notifications.notifications.activity.unresolved import UnresolvedActivityNotification
 from sentry.types.activity import ActivityType
-from sentry.types.integrations import ExternalProviderEnum
 
 _default_logger = getLogger(__name__)
 

src/sentry/integrations/slack/views/link_identity.py

@@ -3,12 +3,12 @@
 from django.utils.decorators import method_decorator
 from rest_framework.request import Request
 
+from sentry.integrations.types import ExternalProviderEnum, ExternalProviders
 from sentry.integrations.utils import get_identity_or_404
 from sentry.models.identity import Identity
 from sentry.notifications.notificationcontroller import NotificationController
 from sentry.notifications.notifications.integration_nudge import IntegrationNudgeNotification
 from sentry.services.hybrid_cloud.integration.model import RpcIntegration
-from sentry.types.integrations import ExternalProviderEnum, ExternalProviders
 from sentry.utils.signing import unsign
 from sentry.web.frontend.base import BaseView, control_silo_view
 from sentry.web.helpers import render_to_response