Revert "feat(hc): Set up hybrid cloud services for remote calling (#45447)"

This reverts commit c59fb6d522ec60cff3b5af158d1c965632609d96.

Co-authored-by: asottile-sentry <103459774+asottile-sentry@users.noreply.github.com>

mypy.ini

@@ -207,8 +207,6 @@ warn_redundant_casts=True
 warn_return_any=True
 no_implicit_reexport=True
 
-plugins = pydantic.mypy
-
 ; Set this to skip until more of the codebase is typed
 [mypy-sentry.*]
 follow_imports = skip

requirements-base.txt

@@ -40,7 +40,6 @@ progressbar2>=3.41.0
 python-rapidjson>=1.4
 psycopg2-binary>=2.8.6
 PyJWT>=2.4.0
-pydantic>=1.10.2
 python-dateutil>=2.8.1
 python-memcached>=1.59
 python-u2flib-server>=5.0.0

requirements-dev-frozen.txt

@@ -125,7 +125,6 @@ pyasn1-modules==0.2.4
 pycodestyle==2.10.0
 pycountry==17.5.14
 pycparser==2.21
-pydantic==1.10.2
 pyflakes==3.0.1
 pyjwt==2.4.0
 pyopenssl==23.0.0

requirements-frozen.txt

@@ -88,7 +88,6 @@ pyasn1==0.4.5
 pyasn1-modules==0.2.4
 pycountry==17.5.14
 pycparser==2.21
-pydantic==1.10.2
 pyjwt==2.4.0
 pyopenssl==23.0.0
 pyparsing==3.0.9

src/sentry/api/endpoints/organization_details.py

@@ -526,8 +526,7 @@ class OrganizationDetailsEndpoint(OrganizationEndpoint):
                         )
                     elif "name" in changed_data:
                         organization_mapping_service.update(
-                            organization_id=organization.id,
-                            update=RpcOrganizationMappingUpdate(name=organization.name),
+                            organization.id, RpcOrganizationMappingUpdate(name=organization.name)
                         )
             # TODO(hybrid-cloud): This will need to be a more generic error
             # when the internal RPC is implemented.

src/sentry/auth/access.py

@@ -467,9 +467,7 @@ class RpcBackedAccess(Access):
     def roles(self) -> Iterable[str] | None:
         if self.rpc_user_organization_context.member is None:
             return None
-        return organization_service.get_all_org_roles(
-            organization_member=self.rpc_user_organization_context.member
-        )
+        return organization_service.get_all_org_roles(self.rpc_user_organization_context.member)
 
     def has_role_in_organization(
         self, role: str, organization: Organization, user_id: int | None
@@ -828,7 +826,7 @@ class SystemAccess(OrganizationlessAccess):
     def __init__(self) -> None:
         super().__init__(
             auth_state=RpcAuthState(
-                sso_state=RpcMemberSsoState(is_required=False, is_valid=False),
+                sso_state=RpcMemberSsoState(False, False),
                 permissions=[],
             ),
         )

src/sentry/auth/helper.py

@@ -228,10 +228,7 @@ class AuthIdentityHandler:
 
     def _handle_new_membership(self, auth_identity: RpcAuthIdentity) -> RpcOrganizationMember:
         user, om = auth_service.handle_new_membership(
-            request=self.request,
-            organization=self.organization,
-            auth_identity=auth_identity,
-            auth_provider=self.auth_provider,
+            self.request, self.organization, auth_identity, self.auth_provider
         )
 
         if om is not None:

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

@@ -96,7 +96,7 @@ def build_tag_fields(
 
 
 def get_option_groups(group: Group) -> Sequence[Mapping[str, Any]]:
-    all_members = user_service.get_from_group(group=group)
+    all_members = user_service.get_from_group(group)
     members = list({m.id: m for m in all_members}.values())
     teams = group.project.teams.all()
 

src/sentry/integrations/utils/sync.py

@@ -80,7 +80,7 @@ def sync_group_assignee_inbound(
             GroupAssignee.objects.deassign(group)
         return affected_groups
 
-    users = user_service.get_many_by_email(emails=[email])
+    users = user_service.get_many_by_email([email])
     users_by_id = {user.id: user for user in users}
     projects_by_user = Project.objects.get_by_users(users)
 

src/sentry/models/commitauthor.py

@@ -38,7 +38,7 @@ class CommitAuthor(Model):
     def find_users(self) -> List["RpcUser"]:
         from sentry.models import OrganizationMember
 
-        users = user_service.get_many_by_email(emails=[self.email])
+        users = user_service.get_many_by_email([self.email])
         org_member_user_ids = set(
             OrganizationMember.objects.filter(
                 organization_id=self.organization_id, user_id__in={u.id for u in users}