chore(hybrid-cloud): ORM decorators updated. (#40022)

Updating model decorator names reflecting newest hybrid cloud requirements.

src/sentry/data_export/models.py

@@ -12,7 +12,7 @@
     FlexibleForeignKey,
     JSONField,
     Model,
-    region_silo_model,
+    region_silo_only_model,
     sane_repr,
 )
 from sentry.utils import json
@@ -23,7 +23,7 @@
 logger = logging.getLogger(__name__)
 
 
-@region_silo_model
+@region_silo_only_model
 class ExportedData(Model):
     """
     Stores references to asynchronous data export jobs
@@ -139,7 +139,7 @@ class Meta:
     __repr__ = sane_repr("query_type", "query_info")
 
 
-@region_silo_model
+@region_silo_only_model
 class ExportedDataBlob(Model):
     __include_in_export__ = False
 

src/sentry/db/models/base.py

@@ -19,9 +19,9 @@
     "DefaultFieldsModel",
     "sane_repr",
     "get_model_if_available",
-    "control_silo_model",
-    "region_silo_model",
-    "all_silo_model",
+    "control_silo_with_replication_model",
+    "control_silo_only_model",
+    "region_silo_only_model",
 )
 
 
@@ -224,11 +224,6 @@ def __call__(self, model_class: Any) -> type:
         return model_class
 
 
-control_silo_model = ModelSiloLimit(SiloMode.CONTROL, read_only=SiloMode.REGION)
-region_silo_model = ModelSiloLimit(SiloMode.REGION)
-
-# Tags a model that is readable and writable in all silos. This should be used only
-# for data that is private to this particular Django stack and is not of concern to
-# the rest of the platform. This is experimental and may be reverted as we proceed
-# with work on the multi-region architecture.
-all_silo_model = ModelSiloLimit(*SiloMode)
+control_silo_with_replication_model = ModelSiloLimit(SiloMode.CONTROL, read_only=SiloMode.REGION)
+control_silo_only_model = ModelSiloLimit(SiloMode.CONTROL)
+region_silo_only_model = ModelSiloLimit(SiloMode.REGION)

src/sentry/discover/models.py

@@ -2,15 +2,15 @@
 from django.db.models import Q, UniqueConstraint
 from django.utils import timezone
 
-from sentry.db.models import FlexibleForeignKey, Model, region_silo_model, sane_repr
+from sentry.db.models import FlexibleForeignKey, Model, region_silo_only_model, sane_repr
 from sentry.db.models.fields import JSONField
 from sentry.db.models.fields.bounded import BoundedBigIntegerField
 
 MAX_KEY_TRANSACTIONS = 10
 MAX_TEAM_KEY_TRANSACTIONS = 100
 
 
-@region_silo_model
+@region_silo_only_model
 class DiscoverSavedQueryProject(Model):
     __include_in_export__ = False
 
@@ -23,7 +23,7 @@ class Meta:
         unique_together = (("project", "discover_saved_query"),)
 
 
-@region_silo_model
+@region_silo_only_model
 class DiscoverSavedQuery(Model):
     """
     A saved Discover query
@@ -76,7 +76,7 @@ def set_projects(self, project_ids):
             )
 
 
-@region_silo_model
+@region_silo_only_model
 class TeamKeyTransaction(Model):
     __include_in_export__ = False
 

src/sentry/incidents/models.py

@@ -14,8 +14,8 @@
     Model,
     OneToOneCascadeDeletes,
     UUIDField,
-    control_silo_model,
-    region_silo_model,
+    control_silo_with_replication_model,
+    region_silo_only_model,
     sane_repr,
 )
 from sentry.db.models.manager import BaseManager
@@ -25,7 +25,7 @@
 from sentry.utils.retries import TimedRetryPolicy
 
 
-@region_silo_model
+@region_silo_only_model
 class IncidentProject(Model):
     __include_in_export__ = False
 
@@ -38,7 +38,7 @@ class Meta:
         unique_together = (("project", "incident"),)
 
 
-@region_silo_model
+@region_silo_only_model
 class IncidentSeen(Model):
     __include_in_export__ = False
 
@@ -149,7 +149,7 @@ class IncidentStatusMethod(Enum):
 }
 
 
-@region_silo_model
+@region_silo_only_model
 class Incident(Model):
     __include_in_export__ = True
 
@@ -196,7 +196,7 @@ def duration(self):
         return self.current_end_date - self.date_started
 
 
-@region_silo_model
+@region_silo_only_model
 class PendingIncidentSnapshot(Model):
     __include_in_export__ = True
 
@@ -209,7 +209,7 @@ class Meta:
         db_table = "sentry_pendingincidentsnapshot"
 
 
-@region_silo_model
+@region_silo_only_model
 class IncidentSnapshot(Model):
     __include_in_export__ = True
 
@@ -224,7 +224,7 @@ class Meta:
         db_table = "sentry_incidentsnapshot"
 
 
-@control_silo_model
+@control_silo_with_replication_model
 class TimeSeriesSnapshot(Model):
     __include_in_export__ = True
 
@@ -246,7 +246,7 @@ class IncidentActivityType(Enum):
     DETECTED = 4
 
 
-@region_silo_model
+@region_silo_only_model
 class IncidentActivity(Model):
     __include_in_export__ = True
 
@@ -263,7 +263,7 @@ class Meta:
         db_table = "sentry_incidentactivity"
 
 
-@region_silo_model
+@region_silo_only_model
 class IncidentSubscription(Model):
     __include_in_export__ = True
 
@@ -341,7 +341,7 @@ def clear_alert_rule_subscription_caches(cls, instance, **kwargs):
             )
 
 
-@region_silo_model
+@region_silo_only_model
 class AlertRuleExcludedProjects(Model):
     __include_in_export__ = True
 
@@ -355,7 +355,7 @@ class Meta:
         unique_together = (("alert_rule", "project"),)
 
 
-@region_silo_model
+@region_silo_only_model
 class AlertRule(Model):
     __include_in_export__ = True
 
@@ -440,7 +440,7 @@ def clear_incident_trigger_cache(cls, instance, **kwargs):
         cache.delete(cls._build_cache_key(instance.incident_id))
 
 
-@region_silo_model
+@region_silo_only_model
 class IncidentTrigger(Model):
     __include_in_export__ = True
 
@@ -486,7 +486,7 @@ def clear_alert_rule_trigger_cache(cls, instance, **kwargs):
         cache.delete(cls._build_trigger_cache_key(instance.id))
 
 
-@region_silo_model
+@region_silo_only_model
 class AlertRuleTrigger(Model):
     __include_in_export__ = True
 
@@ -508,7 +508,7 @@ class Meta:
         unique_together = (("alert_rule", "label"),)
 
 
-@region_silo_model
+@region_silo_only_model
 class AlertRuleTriggerExclusion(Model):
     __include_in_export__ = True
 
@@ -522,7 +522,7 @@ class Meta:
         unique_together = (("alert_rule_trigger", "query_subscription"),)
 
 
-@region_silo_model
+@region_silo_only_model
 class AlertRuleTriggerAction(Model):
     """
     This model represents an action that occurs when a trigger is fired. This is
@@ -650,7 +650,7 @@ class AlertRuleActivityType(Enum):
     SNAPSHOT = 6
 
 
-@region_silo_model
+@region_silo_only_model
 class AlertRuleActivity(Model):
     __include_in_export__ = True
 

src/sentry/models/activity.py

@@ -14,7 +14,7 @@
     FlexibleForeignKey,
     GzippedDictField,
     Model,
-    region_silo_model,
+    region_silo_only_model,
     sane_repr,
 )
 from sentry.tasks import activity
@@ -76,7 +76,7 @@ def create_group_activity(
         return activity
 
 
-@region_silo_model
+@region_silo_only_model
 class Activity(Model):
     __include_in_export__ = False
 

src/sentry/models/actor.py

@@ -5,7 +5,7 @@
 from django.db.models.signals import pre_save
 from rest_framework import serializers
 
-from sentry.db.models import Model, all_silo_model
+from sentry.db.models import Model, region_silo_only_model
 
 if TYPE_CHECKING:
     from sentry.models import Team, User
@@ -31,7 +31,7 @@ def actor_type_to_string(type: int) -> Optional[str]:
     return None
 
 
-@all_silo_model
+@region_silo_only_model
 class Actor(Model):
     __include_in_export__ = True
 

src/sentry/models/apiapplication.py

@@ -11,7 +11,7 @@
     BoundedPositiveIntegerField,
     FlexibleForeignKey,
     Model,
-    region_silo_model,
+    region_silo_only_model,
     sane_repr,
 )
 
@@ -31,7 +31,7 @@ class ApiApplicationStatus:
     deletion_in_progress = 3
 
 
-@region_silo_model
+@region_silo_only_model
 class ApiApplication(Model):
     __include_in_export__ = True
 

src/sentry/models/apiauthorization.py

@@ -1,11 +1,11 @@
 from django.db import models
 from django.utils import timezone
 
-from sentry.db.models import FlexibleForeignKey, Model, region_silo_model, sane_repr
+from sentry.db.models import FlexibleForeignKey, Model, region_silo_only_model, sane_repr
 from sentry.models.apiscopes import HasApiScopes
 
 
-@region_silo_model
+@region_silo_only_model
 class ApiAuthorization(Model, HasApiScopes):
     """
     Tracks which scopes a user has authorized for a given application.

src/sentry/models/apigrant.py

@@ -5,7 +5,7 @@
 from django.utils import timezone
 
 from bitfield import BitField
-from sentry.db.models import ArrayField, FlexibleForeignKey, Model, region_silo_model
+from sentry.db.models import ArrayField, FlexibleForeignKey, Model, region_silo_only_model
 
 DEFAULT_EXPIRATION = timedelta(minutes=10)
 
@@ -18,7 +18,7 @@ def generate_code():
     return uuid4().hex
 
 
-@region_silo_model
+@region_silo_only_model
 class ApiGrant(Model):
     """
     A grant represents a token with a short lifetime that can

src/sentry/models/apikey.py

@@ -11,7 +11,7 @@
     BoundedPositiveIntegerField,
     FlexibleForeignKey,
     Model,
-    control_silo_model,
+    control_silo_only_model,
     sane_repr,
 )
 
@@ -22,7 +22,7 @@ class ApiKeyStatus:
     INACTIVE = 1
 
 
-@control_silo_model
+@control_silo_only_model
 class ApiKey(Model):
     __include_in_export__ = True
 

src/sentry/models/apitoken.py

@@ -5,7 +5,13 @@
 from django.utils import timezone
 from django.utils.encoding import force_text
 
-from sentry.db.models import BaseManager, FlexibleForeignKey, Model, region_silo_model, sane_repr
+from sentry.db.models import (
+    BaseManager,
+    FlexibleForeignKey,
+    Model,
+    region_silo_only_model,
+    sane_repr,
+)
 from sentry.models.apiscopes import HasApiScopes
 
 DEFAULT_EXPIRATION = timedelta(days=30)
@@ -19,7 +25,7 @@ def generate_token():
     return uuid4().hex + uuid4().hex
 
 
-@region_silo_model
+@region_silo_only_model
 class ApiToken(Model, HasApiScopes):
     __include_in_export__ = True
 

src/sentry/models/appconnectbuilds.py

@@ -1,4 +1,4 @@
-from sentry.db.models import region_silo_model
+from sentry.db.models import region_silo_only_model
 
 """Database models to keep track of the App Store Connect builds for a project.
 
@@ -12,7 +12,7 @@
 from sentry.db.models import FlexibleForeignKey, Model
 
 
-@region_silo_model
+@region_silo_only_model
 class AppConnectBuild(Model):
     """A single build that exists or has existed on App Store Connect.
 

src/sentry/models/assistant.py

@@ -5,12 +5,12 @@
     BoundedPositiveIntegerField,
     FlexibleForeignKey,
     Model,
-    region_silo_model,
+    region_silo_only_model,
     sane_repr,
 )
 
 
-@region_silo_model
+@region_silo_only_model
 class AssistantActivity(Model):
     """Records user interactions with the assistant guides."""