ref(control_silo): Move Identitiy model to users module (#76272)

Part of moving control silo user related resources into the usersmodule. Includes adding import shim for any getsentry refs. Also addsminor typing to some identity functions.

Apart of (#73856)

Author: Christinarlong

fixtures/gitlab.py

@@ -2,12 +2,12 @@
 
 from sentry.integrations.gitlab.integration import GitlabIntegration
 from sentry.integrations.models.integration import Integration
-from sentry.models.identity import Identity, IdentityProvider
 from sentry.models.repository import Repository
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.helpers.integrations import get_installation_of_type
 from sentry.testutils.silo import assume_test_silo_mode
+from sentry.users.models.identity import Identity, IdentityProvider
 
 EXTERNAL_ID = "example.gitlab.com:group-x"
 WEBHOOK_SECRET = "secret-token-value"

src/sentry/api/endpoints/user_identity.py

@@ -6,7 +6,7 @@
 from sentry.api.bases.user import UserEndpoint
 from sentry.api.paginator import OffsetPaginator
 from sentry.api.serializers import serialize
-from sentry.models.identity import Identity
+from sentry.users.models.identity import Identity
 
 
 @control_silo_endpoint

src/sentry/api/endpoints/user_identity_config.py

@@ -16,7 +16,7 @@
     supports_login,
 )
 from sentry.models.authidentity import AuthIdentity
-from sentry.models.identity import Identity
+from sentry.users.models.identity import Identity
 from sentry.users.models.user import User
 from social_auth.models import UserSocialAuth
 

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

@@ -1,5 +1,5 @@
 from sentry.api.serializers import Serializer, register, serialize
-from sentry.models.identity import Identity
+from sentry.users.models.identity import Identity
 
 
 @register(Identity)

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

@@ -1,5 +1,5 @@
 from sentry.api.serializers import Serializer, register
-from sentry.models.identity import IdentityProvider
+from sentry.users.models.identity import IdentityProvider
 
 
 @register(IdentityProvider)

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

@@ -16,7 +16,7 @@
 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.users.models.identity import Identity
 from social_auth.models import UserSocialAuth
 
 from . import user_social_auth

src/sentry/deletions/defaults/organizationintegration.py

@@ -11,7 +11,7 @@ def should_proceed(self, instance):
         return instance.status in {ObjectStatus.DELETION_IN_PROGRESS, ObjectStatus.PENDING_DELETION}
 
     def get_child_relations(self, instance):
-        from sentry.models.identity import Identity
+        from sentry.users.models.identity import Identity
 
         relations = []
 

src/sentry/identity/pipeline.py

@@ -5,8 +5,8 @@
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
-from sentry.models.identity import Identity, IdentityProvider
 from sentry.pipeline import Pipeline
+from sentry.users.models.identity import Identity, IdentityProvider
 from sentry.utils import metrics
 
 from . import default_manager

src/sentry/identity/services/identity/impl.py

@@ -15,7 +15,7 @@
 from sentry.identity.services.identity.serial import serialize_identity, serialize_identity_provider
 from sentry.identity.services.identity.service import IdentityService
 from sentry.models.authidentity import AuthIdentity
-from sentry.models.identity import Identity
+from sentry.users.models.identity import Identity
 
 
 class DatabaseBackedIdentityService(IdentityService):
@@ -26,7 +26,7 @@ def get_provider(
         provider_type: str | None = None,
         provider_ext_id: str | None = None,
     ) -> RpcIdentityProvider | None:
-        from sentry.models.identity import IdentityProvider
+        from sentry.users.models.identity import IdentityProvider
 
         # If an id is provided, use that -- otherwise, use the type and external_id
         idp_kwargs: Any = (
@@ -57,7 +57,7 @@ def get_user_identities_by_provider_type(
     ) -> list[RpcIdentity]:
         from django.db.models import F
 
-        from sentry.models.identity import Identity
+        from sentry.users.models.identity import Identity
 
         identities = Identity.objects.filter(user=user_id, idp__type=provider_type)
 

src/sentry/identity/services/identity/model.py

@@ -28,7 +28,7 @@ class RpcIdentity(RpcModel):
     def get_identity(self) -> "Provider":
         from sentry.identity import get
         from sentry.identity.services.identity import identity_service
-        from sentry.models.identity import IdentityProvider
+        from sentry.users.models.identity import IdentityProvider
 
         identity_provider = identity_service.get_provider(provider_id=self.idp_id)
         if identity_provider is None:

src/sentry/identity/services/identity/serial.py

@@ -3,7 +3,7 @@
 from sentry.identity.services.identity import RpcIdentity, RpcIdentityProvider
 
 if TYPE_CHECKING:
-    from sentry.models.identity import Identity, IdentityProvider
+    from sentry.users.models.identity import Identity, IdentityProvider
 
 
 def serialize_identity_provider(identity_provider: "IdentityProvider") -> RpcIdentityProvider:

src/sentry/integrations/base.py

@@ -20,7 +20,6 @@
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.notify_disable import notify_disable
 from sentry.integrations.request_buffer import IntegrationRequestBuffer
-from sentry.models.identity import Identity
 from sentry.models.team import Team
 from sentry.organizations.services.organization import (
     RpcOrganization,
@@ -42,6 +41,7 @@
     IntegrationFormError,
     UnsupportedResponseType,
 )
+from sentry.users.models.identity import Identity
 from sentry.utils.audit import create_audit_entry, create_system_audit_entry
 from sentry.utils.sdk import Scope
 

src/sentry/integrations/bitbucket_server/integration.py

@@ -26,11 +26,11 @@
 from sentry.integrations.services.repository.model import RpcRepository
 from sentry.integrations.source_code_management.repository import RepositoryIntegration
 from sentry.integrations.tasks.migrate_repo import migrate_repo
-from sentry.models.identity import Identity
 from sentry.models.repository import Repository
 from sentry.organizations.services.organization import RpcOrganizationSummary
 from sentry.pipeline import PipelineView
 from sentry.shared_integrations.exceptions import ApiError, IntegrationError
+from sentry.users.models.identity import Identity
 from sentry.web.helpers import render_to_response
 
 from .client import BitbucketServerClient, BitbucketServerSetupClient

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

@@ -8,8 +8,8 @@
 from sentry.integrations.services.integration.model import RpcIntegration
 from sentry.integrations.types import ExternalProviders
 from sentry.integrations.utils.identities import get_identity_or_404
-from sentry.models.identity import Identity
 from sentry.types.actor import ActorType
+from sentry.users.models.identity import Identity
 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

@@ -9,8 +9,8 @@
 from sentry.integrations.services.integration.model import RpcIntegration
 from sentry.integrations.types import ExternalProviders
 from sentry.integrations.utils.identities import get_identity_or_404
-from sentry.models.identity import Identity
 from sentry.types.actor import ActorType
+from sentry.users.models.identity import Identity
 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/gitlab/integration.py

@@ -19,14 +19,14 @@
 from sentry.integrations.services.repository.model import RpcRepository
 from sentry.integrations.source_code_management.commit_context import CommitContextIntegration
 from sentry.integrations.source_code_management.repository import RepositoryIntegration
-from sentry.models.identity import Identity
 from sentry.models.repository import Repository
 from sentry.pipeline import NestedPipelineView, PipelineView
 from sentry.shared_integrations.exceptions import (
     ApiError,
     IntegrationError,
     IntegrationProviderError,
 )
+from sentry.users.models.identity import Identity
 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/jira_server/integration.py

@@ -32,7 +32,6 @@
 from sentry.integrations.models.integration_external_project import IntegrationExternalProject
 from sentry.integrations.services.integration import integration_service
 from sentry.models.group import Group
-from sentry.models.identity import Identity
 from sentry.organizations.services.organization.service import organization_service
 from sentry.pipeline import PipelineView
 from sentry.shared_integrations.exceptions import (
@@ -43,6 +42,7 @@
     IntegrationFormError,
 )
 from sentry.silo.base import all_silo_function
+from sentry.users.models.identity import Identity
 from sentry.users.services.user import RpcUser
 from sentry.users.services.user.service import user_service
 from sentry.utils.hashlib import sha1_text

src/sentry/integrations/msteams/link_identity.py

@@ -7,7 +7,7 @@
 
 from sentry.integrations.types import ExternalProviders
 from sentry.integrations.utils import get_identity_or_404
-from sentry.models.identity import Identity
+from sentry.users.models.identity import Identity
 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/unlink_identity.py

@@ -4,7 +4,7 @@
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import never_cache
 
-from sentry.models.identity import Identity
+from sentry.users.models.identity import Identity
 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/pipeline.py

@@ -13,12 +13,12 @@
 from sentry.integrations.manager import default_manager
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.models.organization_integration import OrganizationIntegration
-from sentry.models.identity import Identity, IdentityProvider, IdentityStatus
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.organizations.absolute_url import generate_organization_url
 from sentry.pipeline import Pipeline, PipelineAnalyticsEntry
 from sentry.shared_integrations.exceptions import IntegrationError, IntegrationProviderError
 from sentry.silo.base import SiloMode
+from sentry.users.models.identity import Identity, IdentityProvider, IdentityStatus
 from sentry.web.helpers import render_to_response
 
 __all__ = ["IntegrationPipeline"]

src/sentry/integrations/slack/tasks/link_slack_user_identities.py

@@ -8,10 +8,10 @@
 from sentry.integrations.services.integration import integration_service
 from sentry.integrations.slack.utils.users import SlackUserData, get_slack_data_by_user
 from sentry.integrations.utils import get_identities_by_user
-from sentry.models.identity import Identity, IdentityProvider, IdentityStatus
 from sentry.organizations.services.organization import organization_service
 from sentry.silo.base import SiloMode
 from sentry.tasks.base import instrumented_task
+from sentry.users.models.identity import Identity, IdentityProvider, IdentityStatus
 from sentry.users.models.user import User
 from sentry.users.models.useremail import UserEmail
 

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

@@ -18,9 +18,9 @@
 from sentry.integrations.slack.views.types import IdentityParams
 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.users.models.identity import Identity
 from sentry.utils import metrics
 from sentry.utils.signing import unsign
 from sentry.web.frontend.base import BaseView, control_silo_view

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

@@ -1,8 +1,8 @@
 from dataclasses import dataclass
 
 from sentry.integrations.models.integration import Integration
-from sentry.models.identity import IdentityProvider
 from sentry.organizations.services.organization import RpcOrganization
+from sentry.users.models.identity import IdentityProvider
 
 
 @dataclass(frozen=True)

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

@@ -17,7 +17,7 @@
 from sentry.integrations.slack.views.types import IdentityParams
 from sentry.integrations.types import ExternalProviders
 from sentry.integrations.utils import get_identity_or_404
-from sentry.models.identity import Identity
+from sentry.users.models.identity import Identity
 from sentry.utils import metrics
 from sentry.utils.signing import unsign
 from sentry.web.frontend.base import BaseView, control_silo_view

src/sentry/integrations/source_code_management/commit_context.py

@@ -8,8 +8,8 @@
 
 from sentry.auth.exceptions import IdentityNotValid
 from sentry.integrations.models.repository_project_path_config import RepositoryProjectPathConfig
-from sentry.models.identity import Identity
 from sentry.models.repository import Repository
+from sentry.users.models.identity import Identity
 
 
 @dataclass

src/sentry/integrations/source_code_management/repository.py

@@ -9,10 +9,10 @@
 from sentry.auth.exceptions import IdentityNotValid
 from sentry.integrations.base import IntegrationInstallation
 from sentry.integrations.services.repository import RpcRepository
-from sentry.models.identity import Identity
 from sentry.models.repository import Repository
 from sentry.shared_integrations.client.base import BaseApiResponseX
 from sentry.shared_integrations.exceptions import ApiError, IntegrationError
+from sentry.users.models.identity import Identity
 from sentry.utils import metrics
 
 REPOSITORY_INTEGRATION_CHECK_FILE_METRIC = "repository_integration.check_file.{result}"

src/sentry/integrations/utils/identities.py

@@ -7,9 +7,9 @@
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.integrations.types import EXTERNAL_PROVIDERS, ExternalProviders
-from sentry.models.identity import Identity, IdentityProvider, IdentityStatus
 from sentry.organizations.services.organization import RpcOrganization, organization_service
 from sentry.silo.base import control_silo_function
+from sentry.users.models.identity import Identity, IdentityProvider, IdentityStatus
 from sentry.users.models.user import User
 from sentry.users.services.user.service import user_service
 

src/sentry/integrations/vsts/client.py

@@ -12,11 +12,11 @@
 from sentry.integrations.base import IntegrationFeatureNotImplementedError
 from sentry.integrations.client import ApiClient
 from sentry.integrations.source_code_management.repository import RepositoryClient
-from sentry.models.identity import Identity
 from sentry.models.repository import Repository
 from sentry.shared_integrations.client.base import BaseApiResponseX
 from sentry.shared_integrations.client.proxy import IntegrationProxyClient
 from sentry.silo.base import control_silo_function
+from sentry.users.models.identity import Identity
 from sentry.utils.http import absolute_uri
 
 if TYPE_CHECKING:

src/sentry/models/__init__.py

@@ -1,5 +1,6 @@
 from sentry.users.models.authenticator import *  # NOQA
 from sentry.users.models.email import *  # NOQA
+from sentry.users.models.identity import *  # NOQA
 from sentry.users.models.lostpasswordhash import *  # NOQA
 from sentry.users.models.user import *  # NOQA
 from sentry.users.models.useremail import *  # NOQA
@@ -66,7 +67,6 @@
 from .groupsnooze import *  # NOQA
 from .groupsubscription import *  # NOQA
 from .grouptombstone import *  # NOQA
-from .identity import *  # NOQA
 from .importchunk import *  # NOQA
 from .integrations import *  # NOQA
 from .latestreporeleaseenvironment import *  # NOQA