Skip to content

Commit 9dba4e4

Browse files
ref(control_silo): Move various users endpoints to users module
Part of moving control silo user related resources into the users module. Moves endpoints & tests and updates and refs. Apart of (#73856)
1 parent 3a79696 commit 9dba4e4

17 files changed

+12
-10
lines changed

src/sentry/api/urls.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,13 @@
259259
from sentry.scim.endpoints.teams import OrganizationSCIMTeamDetails, OrganizationSCIMTeamIndex
260260
from sentry.uptime.endpoints.project_uptime_alert_details import ProjectUptimeAlertDetailsEndpoint
261261
from sentry.uptime.endpoints.project_uptime_alert_index import ProjectUptimeAlertIndexEndpoint
262+
from sentry.users.api.endpoints.authenticator_index import AuthenticatorIndexEndpoint
263+
from sentry.users.api.endpoints.user_authenticator_details import UserAuthenticatorDetailsEndpoint
264+
from sentry.users.api.endpoints.user_authenticator_enroll import UserAuthenticatorEnrollEndpoint
265+
from sentry.users.api.endpoints.user_authenticator_index import UserAuthenticatorIndexEndpoint
266+
from sentry.users.api.endpoints.user_details import UserDetailsEndpoint
267+
from sentry.users.api.endpoints.user_emails import UserEmailsEndpoint
268+
from sentry.users.api.endpoints.user_emails_confirm import UserEmailsConfirmEndpoint
262269

263270
from .endpoints.accept_organization_invite import AcceptOrganizationInvite
264271
from .endpoints.accept_project_transfer import AcceptProjectTransferEndpoint
@@ -276,7 +283,6 @@
276283
from .endpoints.auth_index import AuthIndexEndpoint
277284
from .endpoints.auth_login import AuthLoginEndpoint
278285
from .endpoints.auth_validate import AuthValidateEndpoint
279-
from .endpoints.authenticator_index import AuthenticatorIndexEndpoint
280286
from .endpoints.avatar import (
281287
OrganizationAvatarEndpoint,
282288
SentryAppAvatarEndpoint,
@@ -639,12 +645,6 @@
639645
from .endpoints.team_stats import TeamStatsEndpoint
640646
from .endpoints.team_time_to_resolution import TeamTimeToResolutionEndpoint
641647
from .endpoints.team_unresolved_issue_age import TeamUnresolvedIssueAgeEndpoint
642-
from .endpoints.user_authenticator_details import UserAuthenticatorDetailsEndpoint
643-
from .endpoints.user_authenticator_enroll import UserAuthenticatorEnrollEndpoint
644-
from .endpoints.user_authenticator_index import UserAuthenticatorIndexEndpoint
645-
from .endpoints.user_details import UserDetailsEndpoint
646-
from .endpoints.user_emails import UserEmailsEndpoint
647-
from .endpoints.user_emails_confirm import UserEmailsConfirmEndpoint
648648
from .endpoints.user_identity import UserIdentityEndpoint
649649
from .endpoints.user_identity_config import (
650650
UserIdentityConfigDetailsEndpoint,

src/sentry/users/models/user.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ def write_relocation_import(
481481
) -> tuple[int, ImportKind] | None:
482482
# Internal function that factors our some common logic.
483483
def do_write() -> tuple[int, ImportKind]:
484-
from sentry.api.endpoints.user_details import (
484+
from sentry.users.api.endpoints.user_details import (
485485
BaseUserSerializer,
486486
SuperuserUserSerializer,
487487
UserSerializer,

src/sentry/users/models/user_option.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ def write_relocation_import(
243243
) -> tuple[int, ImportKind] | None:
244244
# TODO(getsentry/team-ospo#190): This circular import is a bit gross. See if we can't find a
245245
# better place for this logic to live.
246-
from sentry.api.endpoints.user_details import UserOptionsSerializer
246+
from sentry.users.api.endpoints.user_details import UserOptionsSerializer
247247

248248
serializer_options = UserOptionsSerializer(data={self.key: self.value}, partial=True)
249249
serializer_options.is_valid(raise_exception=True)

tests/sentry/api/endpoints/test_user_authenticator_enroll.py renamed to tests/sentry/users/api/endpoints/test_user_authenticator_enroll.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
from sentry.testutils.silo import assume_test_silo_mode, control_silo_test
2121
from sentry.users.models.authenticator import Authenticator
2222
from sentry.users.models.useremail import UserEmail
23-
from tests.sentry.api.endpoints.test_user_authenticator_details import assert_security_email_sent
23+
from tests.sentry.users.api.endpoints.test_user_authenticator_details import (
24+
assert_security_email_sent,
25+
)
2426

2527

2628
@control_silo_test

0 commit comments

Comments
 (0)