fix mock in test, don't need to pass rules

Author: ceorourke

src/sentry/api/endpoints/project_rule_details.py

@@ -41,7 +41,6 @@
 from sentry.models.scheduledeletion import RegionScheduledDeletion
 from sentry.models.team import Team
 from sentry.models.user import User
-from sentry.rules import rules as rule_registry
 from sentry.rules.actions import trigger_sentry_app_action_creators_for_issues
 from sentry.signals import alert_rule_edited
 from sentry.tasks.integrations.slack import find_channel_id_for_rule
@@ -368,7 +367,7 @@ def put(self, request: Request, project, rule) -> Response:
             if features.has(
                 "organizations:rule-create-edit-confirm-notification", project.organization
             ):
-                send_confirmation_notification(rule=rule, new=False, rules=rule_registry)
+                send_confirmation_notification(rule=rule, new=False)
             return Response(serialize(updated_rule, request.user))
 
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

src/sentry/api/endpoints/project_rules.py

@@ -30,19 +30,17 @@
 from sentry.models.rule import Rule, RuleActivity, RuleActivityType
 from sentry.models.team import Team
 from sentry.models.user import User
-from sentry.rules import rules as rule_registry
 from sentry.rules.actions import trigger_sentry_app_action_creators_for_issues
 from sentry.rules.actions.base import instantiate_action
 from sentry.rules.processor import is_condition_slow
-from sentry.rules.registry import RuleRegistry
 from sentry.signals import alert_rule_created
 from sentry.tasks.integrations.slack import find_channel_id_for_rule
 from sentry.utils.safe import safe_execute
 
 
-def send_confirmation_notification(rule: Rule, new: bool, rules: RuleRegistry):
+def send_confirmation_notification(rule: Rule, new: bool):
     for action in rule.data.get("actions", ()):
-        action_inst = instantiate_action(rule, action, rules)
+        action_inst = instantiate_action(rule, action)
         safe_execute(
             action_inst.send_confirmation_notification,
             rule=rule,
@@ -846,6 +844,6 @@ def post(self, request: Request, project) -> Response:
         if features.has(
             "organizations:rule-create-edit-confirm-notification", project.organization
         ):
-            send_confirmation_notification(rule=rule, new=True, rules=rule_registry)
+            send_confirmation_notification(rule=rule, new=True)
 
         return Response(serialize(rule, request.user))

src/sentry/rules/actions/base.py

@@ -7,12 +7,13 @@
 from sentry.eventstore.models import GroupEvent
 from sentry.models.rule import Rule
 from sentry.rules.base import CallbackFuture, EventState, RuleBase
-from sentry.rules.registry import RuleRegistry
 
 logger = logging.getLogger("sentry.rules")
 
 
-def instantiate_action(rule: Rule, action, rules: RuleRegistry):
+def instantiate_action(rule: Rule, action):
+    from sentry.rules import rules
+
     action_cls = rules.get(action["id"])
     if action_cls is None:
         logger.warning("Unregistered action %r", action["id"])

src/sentry/rules/processor.py

@@ -268,7 +268,7 @@ def apply_rule(self, rule: Rule, status: GroupRuleStatus) -> None:
     def activate_downstream_actions(self, rule: Rule, notification_uuid: str | None = None) -> None:
         state = self.get_state()
         for action in rule.data.get("actions", ()):
-            action_inst = instantiate_action(rule, action, rules)
+            action_inst = instantiate_action(rule, action)
             if not action_inst:
                 continue
 

tests/sentry/tasks/test_post_process.py

@@ -403,12 +403,11 @@ def test_rule_processor_buffer_values(self):
         MOCK_RULES = ("sentry.rules.filters.issue_occurrences.IssueOccurrencesFilter",)
 
         redis_buffer = RedisBuffer()
-        with (
-            mock.patch("sentry.buffer.backend.get", redis_buffer.get),
-            mock.patch("sentry.buffer.backend.incr", redis_buffer.incr),
-            patch("sentry.constants._SENTRY_RULES", MOCK_RULES),
-            patch("sentry.rules.processor.rules", init_registry()) as rules,
-        ):
+        with mock.patch("sentry.buffer.backend.get", redis_buffer.get), mock.patch(
+            "sentry.buffer.backend.incr", redis_buffer.incr
+        ), patch("sentry.constants._SENTRY_RULES", MOCK_RULES), patch(
+            "sentry.rules.rules", init_registry()
+        ) as rules:
             MockAction = mock.Mock()
             MockAction.id = "tests.sentry.tasks.post_process.tests.MockAction"
             MockAction.return_value = mock.Mock(spec=EventAction)