ref(control_silo): Move UserRole model to users module (#76125)

Part of moving control silo user related resources into the usersmodule, this PR does not include an old UserRole import shim as it's not used in getsentry. Includes adding of types for functions.

Apart of (#73856)

src/sentry/api/endpoints/user_role_details.py

@@ -11,7 +11,7 @@ from sentry.api.bases.user import UserEndpoint
 from sentry.api.decorators import sudo_required
 from sentry.api.permissions import SuperuserPermission
 from sentry.api.serializers import serialize
-from sentry.models.userrole import UserRole, UserRoleUser
+from sentry.users.models.userrole import UserRole, UserRoleUser
 
 audit_logger = logging.getLogger("sentry.audit.user")
 

src/sentry/api/endpoints/user_roles.py

@@ -6,7 +6,7 @@ from sentry.api.base import control_silo_endpoint
 from sentry.api.bases.user import UserEndpoint
 from sentry.api.permissions import SuperuserPermission
 from sentry.api.serializers import serialize
-from sentry.models.userrole import UserRole
+from sentry.users.models.userrole import UserRole
 
 
 @control_silo_endpoint

src/sentry/api/endpoints/userroles_details.py

@@ -10,7 +10,7 @@ from sentry.api.decorators import sudo_required
 from sentry.api.permissions import SuperuserPermission
 from sentry.api.serializers import serialize
 from sentry.api.validators.userrole import UserRoleValidator
-from sentry.models.userrole import UserRole
+from sentry.users.models.userrole import UserRole
 
 audit_logger = logging.getLogger("sentry.audit.user")
 

src/sentry/api/endpoints/userroles_index.py

@@ -10,7 +10,7 @@ from sentry.api.decorators import sudo_required
 from sentry.api.permissions import SuperuserPermission
 from sentry.api.serializers import serialize
 from sentry.api.validators.userrole import UserRoleValidator
-from sentry.models.userrole import UserRole
+from sentry.users.models.userrole import UserRole
 
 audit_logger = logging.getLogger("sentry.audit.user")
 

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

@@ -25,10 +25,10 @@ from sentry.models.organizationmapping import OrganizationMapping
 from sentry.models.organizationmembermapping import OrganizationMemberMapping
 from sentry.models.useremail import UserEmail
 from sentry.models.userpermission import UserPermission
-from sentry.models.userrole import UserRoleUser
 from sentry.organizations.services.organization import RpcOrganizationSummary
 from sentry.users.models.authenticator import Authenticator
 from sentry.users.models.user import User
+from sentry.users.models.userrole import UserRoleUser
 from sentry.users.services.user import RpcUser
 from sentry.utils.avatar import get_gravatar_url
 

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

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

src/sentry/backup/services/import_export/impl.py

@@ -48,9 +48,9 @@ from sentry.hybridcloud.models.outbox import outbox_context
 from sentry.models.importchunk import ControlImportChunk, RegionImportChunk
 from sentry.models.organizationmember import OrganizationMember
 from sentry.models.userpermission import UserPermission
-from sentry.models.userrole import UserRoleUser
 from sentry.silo.base import SiloMode
 from sentry.users.models.user import User
+from sentry.users.models.userrole import UserRoleUser
 
 logger = logging.getLogger(__name__)
 

src/sentry/models/__init__.py

@@ -1,6 +1,7 @@
 from sentry.users.models.authenticator import *  # NOQA
 from sentry.users.models.email import *  # NOQA
 from sentry.users.models.user import *  # NOQA
+from sentry.users.models.userrole import *  # NOQA
 
 from .activity import *  # NOQA
 from .apiapplication import *  # NOQA
@@ -123,4 +124,3 @@ from .useremail import *  # NOQA
 from .userip import *  # NOQA
 from .userpermission import *  # NOQA
 from .userreport import *  # NOQA
-from .userrole import *  # NOQA

src/sentry/runner/commands/createuser.py

@@ -53,7 +53,7 @@ def _set_superadmin(user: User) -> None:
     superadmin role approximates superuser (model attribute) but leveraging
     Sentry's role system.
     """
-    from sentry.models.userrole import UserRole, UserRoleUser
+    from sentry.users.models.userrole import UserRole, UserRoleUser
 
     role = UserRole.objects.get(name="Super Admin")
     UserRoleUser.objects.create(user=user, role=role)

src/sentry/testutils/factories.py

@@ -141,7 +141,6 @@ from sentry.models.team import Team
 from sentry.models.useremail import UserEmail
 from sentry.models.userpermission import UserPermission
 from sentry.models.userreport import UserReport
-from sentry.models.userrole import UserRole
 from sentry.organizations.services.organization import RpcOrganization, RpcUserOrganizationContext
 from sentry.sentry_apps.apps import SentryAppCreator
 from sentry.sentry_apps.installations import (
@@ -168,6 +167,7 @@ from sentry.uptime.models import (
     UptimeSubscription,
 )
 from sentry.users.models.user import User
+from sentry.users.models.userrole import UserRole
 from sentry.users.services.user import RpcUser
 from sentry.utils import loremipsum
 from sentry.utils.performance_issues.performance_problem import PerformanceProblem