sentry app install deletion outbox

Author: cathteng

src/sentry/deletions/defaults/sentry_app_installation.py

@@ -1,11 +1,8 @@
 from collections.abc import Sequence
 
-from sentry.constants import ObjectStatus
 from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
 from sentry.deletions.defaults.apigrant import ModelApiGrantDeletionTask
 from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
-from sentry.types.region import RegionMappingNotFound
-from sentry.workflow_engine.service.action import action_service
 
 
 class SentryAppInstallationDeletionTask(ModelDeletionTask[SentryAppInstallation]):
@@ -28,15 +25,3 @@ def get_child_relations(self, instance: SentryAppInstallation) -> list[BaseRelat
 
     def mark_deletion_in_progress(self, instance_list: Sequence[SentryAppInstallation]) -> None:
         pass
-
-    def delete_instance(self, instance: SentryAppInstallation) -> None:
-        try:
-            action_service.update_action_status_for_sentry_app_via_uuid(
-                organization_id=instance.organization_id,
-                status=ObjectStatus.DISABLED,
-                sentry_app_install_uuid=instance.uuid,
-            )
-        except RegionMappingNotFound:
-            pass
-
-        return super().delete_instance(instance)

src/sentry/hybridcloud/outbox/category.py

@@ -62,6 +62,7 @@ class OutboxCategory(IntEnum):
 
     SERVICE_HOOK_UPDATE = 40
     SENTRY_APP_DELETE = 41
+    SENTRY_APP_INSTALLATION_DELETE = 42
 
     @classmethod
     def as_choices(cls) -> Sequence[tuple[int, int]]:
@@ -304,6 +305,7 @@ class OutboxScope(IntEnum):
             OutboxCategory.SENTRY_APP_UPDATE,
             OutboxCategory.SERVICE_HOOK_UPDATE,
             OutboxCategory.SENTRY_APP_DELETE,
+            OutboxCategory.SENTRY_APP_INSTALLATION_DELETE,
         },
     )
     # No longer in use

src/sentry/receivers/outbox/control.py

@@ -83,6 +83,31 @@ def process_sentry_app_deletes(
         # TODO: also update webhook actions using object identifier (sentry app slug)
 
 
+@receiver(process_control_outbox, sender=OutboxCategory.SENTRY_APP_INSTALLATION_DELETE)
+def process_sentry_app_installation_deletes(
+    shard_identifier: int,
+    object_identifier: int,
+    region_name: str,
+    payload: Mapping[str, Any],
+    **kwds: Any,
+):
+    # This function should only be used when the sentry app is being deleted.
+    # Currently this receiver is only used for deletion.
+    if options.get("workflow_engine.sentry-app-actions-outbox"):
+        logger.info(
+            "sentry_app_installation_delete.update_action_status",
+            extra={
+                "region_name": region_name,
+                "sentry_app_install_uuid": payload["uuid"],
+            },
+        )
+        action_service.update_action_status_for_sentry_app_via_uuid__region(
+            region_name=region_name,
+            status=ObjectStatus.DISABLED,
+            sentry_app_install_uuid=payload["uuid"],
+        )
+
+
 @receiver(process_control_outbox, sender=OutboxCategory.API_APPLICATION_UPDATE)
 def process_api_application_updates(object_identifier: int, region_name: str, **kwds: Any):
     if (

src/sentry/sentry_apps/models/sentry_app_installation.py

@@ -16,17 +16,17 @@
 from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
 from sentry.db.models.manager.base_query_set import BaseQuerySet
 from sentry.db.models.paranoia import ParanoidManager, ParanoidModel
-from sentry.hybridcloud.models.outbox import ControlOutboxBase, outbox_context
+from sentry.hybridcloud.models.outbox import ControlOutbox, ControlOutboxBase, outbox_context
 from sentry.hybridcloud.outbox.base import ReplicatedControlModel
-from sentry.hybridcloud.outbox.category import OutboxCategory
+from sentry.hybridcloud.outbox.category import OutboxCategory, OutboxScope
 from sentry.projects.services.project import RpcProject
 from sentry.sentry_apps.services.app.model import RpcSentryAppComponent, RpcSentryAppInstallation
 from sentry.sentry_apps.utils.errors import (
     SentryAppError,
     SentryAppIntegratorError,
     SentryAppSentryError,
 )
-from sentry.types.region import find_regions_for_orgs
+from sentry.types.region import find_all_region_names, find_regions_for_orgs
 
 if TYPE_CHECKING:
     from sentry.models.project import Project
@@ -141,6 +141,19 @@ def outboxes_for_update(self, shard_identifier: int | None = None) -> list[Contr
         # these isn't so important in that case.
         return super().outboxes_for_update(shard_identifier=self.api_application_id or 0)
 
+    def outboxes_for_delete(self) -> list[ControlOutbox]:
+        return [
+            ControlOutbox(
+                shard_scope=OutboxScope.APP_SCOPE,
+                shard_identifier=self.id,
+                object_identifier=self.id,
+                category=OutboxCategory.SENTRY_APP_INSTALLATION_DELETE,
+                region_name=region_name,
+                payload={"uuid": self.uuid},
+            )
+            for region_name in find_all_region_names()
+        ]
+
     def prepare_ui_component(
         self,
         component: SentryAppComponent,