ref: make condition_data / action_data param names match for create_p…

…roject_rule (#80781)

<!-- Describe your PR here. -->

src/sentry/testutils/fixtures.py

@@ -190,24 +190,10 @@ def create_project_key(self, project=None, *args, **kwargs):
             project = self.project
         return Factories.create_project_key(project=project, *args, **kwargs)
 
-    def create_project_rule(
-        self,
-        project=None,
-        action_match=None,
-        condition_match=None,
-        comparison_interval=None,
-        *args,
-        **kwargs,
-    ) -> Rule:
+    def create_project_rule(self, project=None, *args, **kwargs) -> Rule:
         if project is None:
             project = self.project
-        return Factories.create_project_rule(
-            project=project,
-            action_data=action_match,
-            condition_data=condition_match,
-            *args,
-            **kwargs,
-        )
+        return Factories.create_project_rule(project, *args, **kwargs)
 
     def create_slack_project_rule(
         self, project=None, integration_id=None, channel_id=None, channel_name=None, *args, **kwargs

tests/sentry/api/endpoints/test_project_rule_details.py

@@ -700,8 +700,8 @@ def test_remove_conditions(self):
         """Test that you can edit an alert rule to have no conditions (aka fire on every event)"""
         rule = self.create_project_rule(
             project=self.project,
-            action_match=self.notify_issue_owners_action,
-            condition_match=self.first_seen_condition,
+            action_data=self.notify_issue_owners_action,
+            condition_data=self.first_seen_condition,
             name="no conditions",
         )
         payload = {
@@ -729,8 +729,8 @@ def test_update_duplicate_rule(self):
         ]
         rule = self.create_project_rule(
             project=self.project,
-            action_match=self.notify_issue_owners_action,
-            condition_match=conditions,
+            action_data=self.notify_issue_owners_action,
+            condition_data=conditions,
         )
         conditions.append(
             {
@@ -742,8 +742,8 @@ def test_update_duplicate_rule(self):
         )
         rule2 = self.create_project_rule(
             project=self.project,
-            action_match=self.notify_issue_owners_action,
-            condition_match=conditions,
+            action_data=self.notify_issue_owners_action,
+            condition_data=conditions,
         )
         conditions.pop(1)
         payload = {
@@ -769,13 +769,13 @@ def test_duplicate_rule_environment(self):
         that does have one set, we consider this when determining if it's a duplicate"""
         self.create_project_rule(
             project=self.project,
-            action_match=self.notify_issue_owners_action,
-            condition_match=self.first_seen_condition,
+            action_data=self.notify_issue_owners_action,
+            condition_data=self.first_seen_condition,
         )
         env_rule = self.create_project_rule(
             project=self.project,
-            action_match=self.notify_issue_owners_action,
-            condition_match=self.first_seen_condition,
+            action_data=self.notify_issue_owners_action,
+            condition_data=self.first_seen_condition,
         )
         payload = {
             "name": "hello world",
@@ -812,15 +812,15 @@ def test_duplicate_rule_both_have_environments(self):
         """
         rule = self.create_project_rule(
             project=self.project,
-            action_match=self.notify_issue_owners_action,
-            condition_match=self.first_seen_condition,
+            action_data=self.notify_issue_owners_action,
+            condition_data=self.first_seen_condition,
             name="rule_with_env",
             environment_id=self.environment.id,
         )
         rule2 = self.create_project_rule(
             project=self.project,
-            action_match=self.notify_issue_owners_action,
-            condition_match=self.first_seen_condition,
+            action_data=self.notify_issue_owners_action,
+            condition_data=self.first_seen_condition,
             name="rule_wo_env",
         )
         payload = {
@@ -890,8 +890,8 @@ def test_edit_rule(self):
         ]
         self.create_project_rule(
             project=self.project,
-            action_match=self.notify_issue_owners_action,
-            condition_match=conditions,
+            action_data=self.notify_issue_owners_action,
+            condition_data=conditions,
         )
         conditions.append(
             {

tests/sentry/api/endpoints/test_project_rule_enable.py

@@ -72,11 +72,11 @@ def test_duplicate_rule(self):
             }
         ]
         rule = self.create_project_rule(
-            project=self.project, action_match=actions, condition_match=conditions
+            project=self.project, action_data=actions, condition_data=conditions
         )
 
         rule2 = self.create_project_rule(
-            project=self.project, action_match=actions, condition_match=conditions
+            project=self.project, action_data=actions, condition_data=conditions
         )
         rule2.status = ObjectStatus.DISABLED
         rule2.save()
@@ -114,15 +114,15 @@ def test_duplicate_rule_diff_env(self):
         )
         self.create_project_rule(
             project=self.project,
-            action_match=actions,
-            condition_match=conditions,
+            action_data=actions,
+            condition_data=conditions,
             environment_id=dev_env.id,
         )
 
         rule2 = self.create_project_rule(
             project=self.project,
-            action_match=actions,
-            condition_match=conditions,
+            action_data=actions,
+            condition_data=conditions,
             environment_id=prod_env.id,
         )
         rule2.status = ObjectStatus.DISABLED
@@ -154,15 +154,15 @@ def test_duplicate_rule_one_env_one_not(self):
         dev_env = self.create_environment(self.project, name="dev", organization=self.organization)
         self.create_project_rule(
             project=self.project,
-            action_match=actions,
-            condition_match=conditions,
+            action_data=actions,
+            condition_data=conditions,
             environment_id=dev_env.id,
         )
 
         rule2 = self.create_project_rule(
             project=self.project,
-            action_match=actions,
-            condition_match=conditions,
+            action_data=actions,
+            condition_data=conditions,
         )
         rule2.status = ObjectStatus.DISABLED
         rule2.save()

tests/sentry/integrations/repository/issue_alert/test_issue_alert_notification_message_repository.py

@@ -23,7 +23,7 @@ def setUp(self) -> None:
             }
         ]
         self.rule = self.create_project_rule(
-            project=self.project, action_match=self.notify_issue_owners_action
+            project=self.project, action_data=self.notify_issue_owners_action
         )
         self.event_id = 456
         self.notification_uuid = str(uuid4())

tests/sentry/integrations/slack/actions/notification/test_slack_notify_service_action.py

@@ -39,7 +39,7 @@ def setUp(self) -> None:
             "channel": "test-notifications",
             "uuid": self.uuid,
         }
-        self.rule = self.create_project_rule(project=self.project, action_match=[self.action_data])
+        self.rule = self.create_project_rule(project=self.project, action_data=[self.action_data])
         self.notification_uuid = str(uuid4())
         self.event = self.store_event(
             data={

tests/sentry/integrations/slack/notifications/test_issue_alert.py

@@ -315,7 +315,7 @@ def test_issue_alert_issue_owners_environment_block(self):
         )
         rule = self.create_project_rule(
             project=self.project,
-            action_match=[action_data],
+            action_data=[action_data],
             name="ja rule",
             environment_id=environment.id,
         )

tests/sentry/integrations/slack/service/test_slack_service.py

@@ -68,7 +68,7 @@ def setUp(self) -> None:
             }
         ]
         self.rule = self.create_project_rule(
-            project=self.project, action_match=self.notify_issue_owners_action
+            project=self.project, action_data=self.notify_issue_owners_action
         )
         self.rule_fire_history = RuleFireHistory.objects.create(
             project=self.project,
@@ -205,7 +205,7 @@ def setUp(self) -> None:
             "uuid": self.rule_action_uuid,
         }
         self.rule = self.create_project_rule(
-            project=self.project, action_match=self.notify_issue_owners_action
+            project=self.project, action_data=self.notify_issue_owners_action
         )
         self.rule_fire_history = RuleFireHistory.objects.create(
             project=self.project,
@@ -216,7 +216,7 @@ def setUp(self) -> None:
         )
 
         self.slack_rule = self.create_project_rule(
-            project=self.project, action_match=[self.slack_action]
+            project=self.project, action_data=[self.slack_action]
         )
         self.slack_rule_fire_history = RuleFireHistory.objects.create(
             project=self.project,
@@ -314,7 +314,7 @@ def test_raises_exception_when_rule_action_does_not_exist(self) -> None:
             }
         ]
         rule = self.create_project_rule(
-            project=self.project, action_match=notify_issue_owners_action
+            project=self.project, action_data=notify_issue_owners_action
         )
         rule_fire_history = RuleFireHistory.objects.create(
             project=self.project,

tests/sentry/migrations/test_0645_backfill_add_uuid_to_all_rule_actions.py

@@ -13,7 +13,7 @@ class BackfillAddUuidToAllRuleActions(TestMigrations):
     def setup_before_migration(self, apps):
         # Create your db state here
         self.notify_event_action = [{"id": "sentry.rules.actions.notify_event.NotifyEventAction"}]
-        self.rule = self.create_project_rule(action_match=self.notify_event_action)
+        self.rule = self.create_project_rule(action_data=self.notify_event_action)
 
     @pytest.mark.skip(
         reason="This reaches into code to create projects, rather than migration code. Don't need this test anymore"

tests/sentry/models/test_rule.py

@@ -24,7 +24,7 @@ def setUp(self) -> None:
             },
         ]
         self.rule = self.create_project_rule(
-            project=self.project, action_match=self.notify_issue_owners_action
+            project=self.project, action_data=self.notify_issue_owners_action
         )
 
     def test_simple(self) -> None:
@@ -38,15 +38,15 @@ def test_returns_none(self) -> None:
     def test_when_no_actions_are_in_rule(self) -> None:
         rule = self.create_project_rule(
             project=self.project,
-            action_match=[],
+            action_data=[],
         )
         result = rule.get_rule_action_details_by_uuid(str(uuid4()))
         assert result is None
 
     def test_when_actions_have_missing_uuid_key(self) -> None:
         rule = self.create_project_rule(
             project=self.project,
-            action_match=[
+            action_data=[
                 {
                     "targetType": "IssueOwners",
                     "fallthroughType": "ActiveMembers",
@@ -61,7 +61,7 @@ def test_when_actions_have_missing_uuid_key(self) -> None:
     def test_when_action_has_missing_uuid_value(self) -> None:
         rule = self.create_project_rule(
             project=self.project,
-            action_match=[
+            action_data=[
                 {
                     "targetType": "IssueOwners",
                     "fallthroughType": "ActiveMembers",