Browse Source

ref: remove * imports from sentry.silo (#69341)

the star imports in sentry.silo.* are causing an import cycle which
breaks mypy's inference of settings


<!-- Describe your PR here. -->
anthony sottile 10 months ago
parent
commit
2c6aca129e

+ 1 - 1
fixtures/gitlab.py

@@ -3,7 +3,7 @@ from time import time
 from sentry.models.identity import Identity, IdentityProvider
 from sentry.models.integrations.integration import Integration
 from sentry.models.repository import Repository
-from sentry.silo import SiloMode
+from sentry.silo.base import SiloMode
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.silo import assume_test_silo_mode
 

+ 2 - 2
src/sentry/analytics/__init__.py

@@ -20,8 +20,8 @@ __all__ = (
 
 backend = LazyServiceWrapper(
     backend_base=Analytics,
-    backend_path=get_backend_path(options.get("analytics.backend")),  # type: ignore[has-type]  # mypy is confused by a circular import
-    options=options.get("analytics.options"),  # type: ignore[has-type]  # mypy is confused by a circular import
+    backend_path=get_backend_path(options.get("analytics.backend")),
+    options=options.get("analytics.options"),
 )
 
 record = backend.record

+ 1 - 1
src/sentry/api/authentication.py

@@ -39,7 +39,7 @@ from sentry.services.hybrid_cloud.auth import AuthenticatedToken
 from sentry.services.hybrid_cloud.rpc import compare_signature
 from sentry.services.hybrid_cloud.user import RpcUser
 from sentry.services.hybrid_cloud.user.service import user_service
-from sentry.silo import SiloLimit, SiloMode
+from sentry.silo.base import SiloLimit, SiloMode
 from sentry.utils.linksign import process_signature
 from sentry.utils.sdk import configure_scope
 from sentry.utils.security.orgauthtoken_token import SENTRY_ORG_AUTH_TOKEN_PREFIX, hash_token

+ 1 - 1
src/sentry/api/base.py

@@ -32,7 +32,7 @@ from sentry.auth import access
 from sentry.auth.staff import has_staff_option
 from sentry.models.environment import Environment
 from sentry.ratelimits.config import DEFAULT_RATE_LIMIT_CONFIG, RateLimitConfig
-from sentry.silo import SiloLimit, SiloMode
+from sentry.silo.base import SiloLimit, SiloMode
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
 from sentry.utils import json
 from sentry.utils.audit import create_audit_entry

+ 1 - 1
src/sentry/api/utils.py

@@ -40,7 +40,7 @@ from sentry.services.hybrid_cloud.organization import (
     RpcUserOrganizationContext,
     organization_service,
 )
-from sentry.silo import SiloMode
+from sentry.silo.base import SiloMode
 from sentry.types.region import get_local_region
 from sentry.utils.dates import parse_stats_period
 from sentry.utils.sdk import capture_exception, merge_context_into_scope

+ 1 - 1
src/sentry/backup/dependencies.py

@@ -12,7 +12,7 @@ from django.db.models.fields.related import ForeignKey, OneToOneField
 
 from sentry.backup.helpers import EXCLUDED_APPS
 from sentry.backup.scopes import RelocationScope
-from sentry.silo import SiloMode
+from sentry.silo.base import SiloMode
 from sentry.utils import json
 
 

+ 1 - 1
src/sentry/data_export/tasks.py

@@ -15,7 +15,7 @@ from sentry.models.files.file import File
 from sentry.models.files.fileblob import FileBlob
 from sentry.models.files.fileblobindex import FileBlobIndex
 from sentry.models.files.utils import DEFAULT_BLOB_SIZE, MAX_FILE_SIZE, AssembleChecksumMismatch
-from sentry.silo import SiloMode
+from sentry.silo.base import SiloMode
 from sentry.tasks.base import instrumented_task
 from sentry.utils import metrics
 from sentry.utils.db import atomic_transaction

+ 1 - 1
src/sentry/db/models/base.py

@@ -18,7 +18,7 @@ from sentry.backup.dependencies import (
 from sentry.backup.helpers import ImportFlags
 from sentry.backup.sanitize import SanitizableField, Sanitizer
 from sentry.backup.scopes import ImportScope, RelocationScope
-from sentry.silo import SiloLimit, SiloMode
+from sentry.silo.base import SiloLimit, SiloMode
 from sentry.utils.json import JSONData
 
 from .fields.bounded import BoundedBigAutoField

+ 1 - 1
src/sentry/db/models/manager/base.py

@@ -18,7 +18,7 @@ from sentry.db.models.manager import M, make_key
 from sentry.db.models.manager.base_query_set import BaseQuerySet
 from sentry.db.models.query import create_or_update
 from sentry.db.postgres.transactions import django_test_transaction_water_mark
-from sentry.silo import SiloLimit
+from sentry.silo.base import SiloLimit
 from sentry.utils.cache import cache
 from sentry.utils.hashlib import md5_text
 

+ 1 - 1
src/sentry/db/models/outboxes.py

@@ -11,7 +11,7 @@ from sentry_sdk.api import capture_exception
 
 from sentry.db.models import BaseManager, Model
 from sentry.signals import post_upgrade
-from sentry.silo import SiloMode
+from sentry.silo.base import SiloMode
 from sentry.types.region import find_regions_for_orgs, find_regions_for_user
 from sentry.utils.env import in_test_environment
 from sentry.utils.snowflake import SnowflakeIdMixin

Some files were not shown because too many files changed in this diff