ref(webhooks): remove legacy sentry_webhooks plugin

.github/codeowners-coverage-baseline.txt

@@ -2196,8 +2196,6 @@ tests/sentry/plugins/interfaces/__init__.py
 tests/sentry/plugins/interfaces/test_releasehook.py
 tests/sentry/plugins/sentry_useragents/__init__.py
 tests/sentry/plugins/sentry_useragents/test_models.py
-tests/sentry/plugins/sentry_webhooks/__init__.py
-tests/sentry/plugins/sentry_webhooks/test_plugin.py
 tests/sentry/plugins/test_config.py
 tests/sentry/plugins/test_helpers.py
 tests/sentry/plugins/test_integration_repository.py

pyproject.toml

@@ -1225,7 +1225,6 @@ module = [
     "sentry.plugins.sentry_interface_types.*",
     "sentry.plugins.sentry_urls.*",
     "sentry.plugins.sentry_useragents.*",
-    "sentry.plugins.sentry_webhooks.*",
     "sentry.plugins.utils",
     "sentry.processing.*",
     "sentry.processing_errors.*",

src/sentry/conf/server.py

@@ -488,7 +488,6 @@ def env(
     "sentry.plugins.sentry_interface_types.apps.Config",
     "sentry.plugins.sentry_urls.apps.Config",
     "sentry.plugins.sentry_useragents.apps.Config",
-    "sentry.plugins.sentry_webhooks.apps.Config",
     "social_auth",
     "sudo",
     "sentry.eventstream",

src/sentry/notifications/notification_action/action_validation.py

@@ -19,7 +19,10 @@
 from sentry.sentry_apps.utils.errors import SentryAppBaseError
 from sentry.utils import json
 from sentry.workflow_engine.models.action import Action
-from sentry.workflow_engine.processors.action import get_notification_plugins_for_org
+from sentry.workflow_engine.processors.action import (
+    get_legacy_webhook_service,
+    get_notification_plugins_for_org,
+)
 
 from .types import BaseActionValidatorHandler
 
@@ -257,6 +260,9 @@ class WebhookActionValidatorHandler(BaseActionValidatorHandler):
 
     def _get_services(self) -> list[Any]:
         plugins = get_notification_plugins_for_org(self.organization)
+        legacy_webhook = get_legacy_webhook_service(self.organization)
+        if legacy_webhook and not any(p.slug == "webhooks" for p in plugins):
+            plugins.append(legacy_webhook)
         sentry_apps = app_service.find_alertable_services(organization_id=self.organization.id)
         return [
             *plugins,

src/sentry/plugins/__init__.py

@@ -6,7 +6,6 @@
     "jira",
     "pagerduty",
     "opsgenie",
-    "webhooks",
     "amazon-sqs",
     "asana",
     "trello",

src/sentry/rules/actions/notify_event.py

@@ -1,6 +1,5 @@
 from collections.abc import Generator, Sequence
 
-from sentry import features
 from sentry.plugins.base import plugins
 from sentry.rules.actions.base import EventAction
 from sentry.rules.actions.services import LegacyPluginService
@@ -20,16 +19,10 @@ class NotifyEventAction(EventAction):
     def get_plugins(self) -> Sequence[LegacyPluginService]:
         from sentry.plugins.bases.notify import NotificationPlugin
 
-        skip_webhooks = features.has(
-            "organizations:legacy-webhook-disable-old-path", self.project.organization
-        )
-
         results = []
         for plugin in plugins.for_project(self.project, version=1):
             if not isinstance(plugin, NotificationPlugin):
                 continue
-            if skip_webhooks and plugin.slug == "webhooks":
-                continue
             results.append(LegacyPluginService(plugin))
 
         return results

src/sentry/workflow_engine/endpoints/organization_available_action_index.py

@@ -33,6 +33,7 @@
 from sentry.workflow_engine.processors.action import (
     get_available_action_integrations_for_org,
     get_integration_services,
+    get_legacy_webhook_service,
     get_notification_plugins_for_org,
 )
 from sentry.workflow_engine.registry import action_handler_registry
@@ -142,9 +143,12 @@ def get(
                     )
 
             # add webhook action
-            # service options include plugins and sentry apps without components
+            # service options include legacy webhooks, plugins, and sentry apps without components
             elif action_type == Action.Type.WEBHOOK:
                 plugins = get_notification_plugins_for_org(organization)
+                legacy_webhook = get_legacy_webhook_service(organization)
+                if legacy_webhook and not any(p.slug == "webhooks" for p in plugins):
+                    plugins.append(legacy_webhook)
                 sentry_apps: list[PluginService] = [
                     SentryAppService(context.installation.sentry_app)
                     for context in alertable_apps_without_components

src/sentry/workflow_engine/processors/action.py

@@ -14,6 +14,7 @@
 from sentry.integrations.services.integration import RpcIntegration, integration_service
 from sentry.integrations.types import IntegrationProviderSlug
 from sentry.models.group import Group
+from sentry.models.options.project_option import ProjectOption
 from sentry.models.organization import Organization
 from sentry.models.project import Project
 from sentry.plugins.base import plugins
@@ -365,6 +366,29 @@ def get_notification_plugins_for_org(organization: Organization) -> list[PluginS
     return list(plugin_map.values())
 
 
+class _LegacyWebhookStub:
+    slug = "webhooks"
+
+    def get_title(self) -> str:
+        return "WebHooks"
+
+
+def get_legacy_webhook_service(organization: Organization) -> PluginService | None:
+    """
+    Check if any project in the org has legacy webhooks enabled and return a
+    service for ACI discovery. This is independent of the plugin system.
+    """
+    has_webhooks = ProjectOption.objects.filter(
+        project__organization_id=organization.id,
+        project__status=ObjectStatus.ACTIVE,
+        key="webhooks:enabled",
+        value=True,
+    ).exists()
+    if has_webhooks:
+        return PluginService(_LegacyWebhookStub())
+    return None
+
+
 def get_integration_services(organization_id: int) -> dict[int, list[tuple[int, str]]]:
     """
     Get all Pagerduty services and Opsgenie teams for an organization's integrations.