do event checking with cast

src/sentry/sentry_apps/tasks/sentry_apps.py

@@ -28,7 +28,7 @@
     SentryAppInteractionType,
     SentryAppWebhookFailureReason,
 )
-from sentry.sentry_apps.models.sentry_app import VALID_EVENTS, SentryApp
+from sentry.sentry_apps.models.sentry_app import SentryApp
 from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
 from sentry.sentry_apps.models.servicehook import ServiceHook, ServiceHookProject
 from sentry.sentry_apps.services.app.model import RpcSentryAppInstallation
@@ -234,15 +234,15 @@ def _process_resource_change(
         # Looks up the human name for the model. Defaults to the model name.
         name = RESOURCE_RENAMES.get(model.__name__, model.__name__.lower())
 
-    event = f"{name}.{action}"
-    if event not in VALID_EVENTS:
+    try:
+        event = SentryAppEventType(f"{name}.{action}")
+    except ValueError as e:
         raise SentryAppSentryError(
             message=f"{SentryAppWebhookFailureReason.INVALID_EVENT}",
-        )
+        ) from e
 
     with SentryAppInteractionEvent(
-        operation_type=SentryAppInteractionType.PREPARE_WEBHOOK,
-        event_type=SentryAppEventType(event),
+        operation_type=SentryAppInteractionType.PREPARE_WEBHOOK, event_type=event
     ).capture():
         project_id: int | None = kwargs.get("project_id", None)
         group_id: int | None = kwargs.get("group_id", None)
@@ -300,7 +300,7 @@ def _process_resource_change(
 
                 # Trigger a new task for each webhook
                 send_resource_change_webhook.delay(
-                    installation_id=installation.id, event=event, data=data
+                    installation_id=installation.id, event=str(event), data=data
                 )
 
 
@@ -514,13 +514,15 @@ def notify_sentry_app(event: GroupEvent, futures: Sequence[RuleFuture]):
 
 
 def send_webhooks(installation: RpcSentryAppInstallation, event: str, **kwargs: Any) -> None:
-    if event not in VALID_EVENTS:
+    try:
+        event = SentryAppEventType(event)
+    except ValueError as e:
         raise SentryAppSentryError(
             message=f"{SentryAppWebhookFailureReason.INVALID_EVENT}",
-        )
+        ) from e
 
     with SentryAppInteractionEvent(
-        operation_type=SentryAppInteractionType.SEND_WEBHOOK, event_type=SentryAppEventType(event)
+        operation_type=SentryAppInteractionType.SEND_WEBHOOK, event_type=event
     ).capture():
         servicehook: ServiceHook
         try:

src/sentry/utils/sentry_apps/webhooks.py

@@ -15,8 +15,13 @@
 from sentry.integrations.notify_disable import notify_disable
 from sentry.integrations.request_buffer import IntegrationRequestBuffer
 from sentry.models.organization import Organization
-from sentry.sentry_apps.metrics import SentryAppEventType, SentryAppWebhookHaltReason
+from sentry.sentry_apps.metrics import (
+    SentryAppEventType,
+    SentryAppWebhookFailureReason,
+    SentryAppWebhookHaltReason,
+)
 from sentry.sentry_apps.models.sentry_app import SentryApp, track_response_code
+from sentry.sentry_apps.utils.errors import SentryAppSentryError
 from sentry.shared_integrations.exceptions import ApiHostError, ApiTimeoutError, ClientError
 from sentry.utils.audit import create_system_audit_entry
 from sentry.utils.sentry_apps import SentryAppWebhookRequestsBuffer
@@ -129,9 +134,15 @@ def send_and_save_webhook_request(
     """
     from sentry.sentry_apps.metrics import SentryAppInteractionEvent, SentryAppInteractionType
 
-    event = f"{app_platform_event.resource}.{app_platform_event.action}"
+    try:
+        event = SentryAppEventType(f"{app_platform_event.resource}.{app_platform_event.action}")
+    except ValueError as e:
+        raise SentryAppSentryError(
+            message=f"{SentryAppWebhookFailureReason.INVALID_EVENT}",
+        ) from e
+
     with SentryAppInteractionEvent(
-        operation_type=SentryAppInteractionType.SEND_WEBHOOK, event_type=SentryAppEventType(event)
+        operation_type=SentryAppInteractionType.SEND_WEBHOOK, event_type=event
     ).capture() as lifecycle:
         buffer = SentryAppWebhookRequestsBuffer(sentry_app)