ref: make condition_data / action_data param names match for create_project_rule (#80781)

asottile-sentry · web-flow · commit 1b66eaaf4253 · 2024-11-15T08:38:54.000-08:00
&lt;!-- Describe your PR here. --&gt;
diff --git a/src/sentry/testutils/fixtures.py b/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
diff --git a/tests/sentry/api/endpoints/test_project_rule_details.py b/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(
             {
diff --git a/tests/sentry/api/endpoints/test_project_rule_enable.py b/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()
diff --git a/tests/sentry/integrations/repository/issue_alert/test_issue_alert_notification_message_repository.py b/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())
diff --git a/tests/sentry/integrations/slack/actions/notification/test_slack_notify_service_action.py b/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={
diff --git a/tests/sentry/integrations/slack/notifications/test_issue_alert.py b/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,
         )
diff --git a/tests/sentry/integrations/slack/service/test_slack_service.py b/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,
diff --git a/tests/sentry/migrations/test_0645_backfill_add_uuid_to_all_rule_actions.py b/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"
diff --git a/tests/sentry/models/test_rule.py b/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",
diff --git a/tests/sentry/rules/processing/test_delayed_processing.py b/tests/sentry/rules/processing/test_delayed_processing.py

Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,11 @@ def test_duplicate_rule(self):`
`72`	`72`	`}`
`73`	`73`	`]`
`74`	`74`	`rule = self.create_project_rule(`
`75`		`- project=self.project, action_match=actions, condition_match=conditions`
	`75`	`+ project=self.project, action_data=actions, condition_data=conditions`
`76`	`76`	`)`
`77`	`77`
`78`	`78`	`rule2 = self.create_project_rule(`
`79`		`- project=self.project, action_match=actions, condition_match=conditions`
	`79`	`+ project=self.project, action_data=actions, condition_data=conditions`
`80`	`80`	`)`
`81`	`81`	`rule2.status = ObjectStatus.DISABLED`
`82`	`82`	`rule2.save()`
`@@ -114,15 +114,15 @@ def test_duplicate_rule_diff_env(self):`
`114`	`114`	`)`
`115`	`115`	`self.create_project_rule(`
`116`	`116`	`project=self.project,`
`117`		`- action_match=actions,`
`118`		`- condition_match=conditions,`
	`117`	`+ action_data=actions,`
	`118`	`+ condition_data=conditions,`
`119`	`119`	`environment_id=dev_env.id,`
`120`	`120`	`)`
`121`	`121`
`122`	`122`	`rule2 = self.create_project_rule(`
`123`	`123`	`project=self.project,`
`124`		`- action_match=actions,`
`125`		`- condition_match=conditions,`
	`124`	`+ action_data=actions,`
	`125`	`+ condition_data=conditions,`
`126`	`126`	`environment_id=prod_env.id,`
`127`	`127`	`)`
`128`	`128`	`rule2.status = ObjectStatus.DISABLED`
`@@ -154,15 +154,15 @@ def test_duplicate_rule_one_env_one_not(self):`
`154`	`154`	`dev_env = self.create_environment(self.project, name="dev", organization=self.organization)`
`155`	`155`	`self.create_project_rule(`
`156`	`156`	`project=self.project,`
`157`		`- action_match=actions,`
`158`		`- condition_match=conditions,`
	`157`	`+ action_data=actions,`
	`158`	`+ condition_data=conditions,`
`159`	`159`	`environment_id=dev_env.id,`
`160`	`160`	`)`
`161`	`161`
`162`	`162`	`rule2 = self.create_project_rule(`
`163`	`163`	`project=self.project,`
`164`		`- action_match=actions,`
`165`		`- condition_match=conditions,`
	`164`	`+ action_data=actions,`
	`165`	`+ condition_data=conditions,`
`166`	`166`	`)`
`167`	`167`	`rule2.status = ObjectStatus.DISABLED`
`168`	`168`	`rule2.save()`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ def setUp(self) -> None:`
`23`	`23`	`}`
`24`	`24`	`]`
`25`	`25`	`self.rule = self.create_project_rule(`
`26`		`- project=self.project, action_match=self.notify_issue_owners_action`
	`26`	`+ project=self.project, action_data=self.notify_issue_owners_action`
`27`	`27`	`)`
`28`	`28`	`self.event_id = 456`
`29`	`29`	`self.notification_uuid = str(uuid4())`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ def setUp(self) -> None:`
`39`	`39`	`"channel": "test-notifications",`
`40`	`40`	`"uuid": self.uuid,`
`41`	`41`	`}`
`42`		`- self.rule = self.create_project_rule(project=self.project, action_match=[self.action_data])`
	`42`	`+ self.rule = self.create_project_rule(project=self.project, action_data=[self.action_data])`
`43`	`43`	`self.notification_uuid = str(uuid4())`
`44`	`44`	`self.event = self.store_event(`
`45`	`45`	`data={`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ def test_issue_alert_issue_owners_environment_block(self):`
`315`	`315`	`)`
`316`	`316`	`rule = self.create_project_rule(`
`317`	`317`	`project=self.project,`
`318`		`- action_match=[action_data],`
	`318`	`+ action_data=[action_data],`
`319`	`319`	`name="ja rule",`
`320`	`320`	`environment_id=environment.id,`
`321`	`321`	`)`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ def setUp(self) -> None:`
`68`	`68`	`}`
`69`	`69`	`]`
`70`	`70`	`self.rule = self.create_project_rule(`
`71`		`- project=self.project, action_match=self.notify_issue_owners_action`
	`71`	`+ project=self.project, action_data=self.notify_issue_owners_action`
`72`	`72`	`)`
`73`	`73`	`self.rule_fire_history = RuleFireHistory.objects.create(`
`74`	`74`	`project=self.project,`
`@@ -205,7 +205,7 @@ def setUp(self) -> None:`
`205`	`205`	`"uuid": self.rule_action_uuid,`
`206`	`206`	`}`
`207`	`207`	`self.rule = self.create_project_rule(`
`208`		`- project=self.project, action_match=self.notify_issue_owners_action`
	`208`	`+ project=self.project, action_data=self.notify_issue_owners_action`
`209`	`209`	`)`
`210`	`210`	`self.rule_fire_history = RuleFireHistory.objects.create(`
`211`	`211`	`project=self.project,`
`@@ -216,7 +216,7 @@ def setUp(self) -> None:`
`216`	`216`	`)`
`217`	`217`
`218`	`218`	`self.slack_rule = self.create_project_rule(`
`219`		`- project=self.project, action_match=[self.slack_action]`
	`219`	`+ project=self.project, action_data=[self.slack_action]`
`220`	`220`	`)`
`221`	`221`	`self.slack_rule_fire_history = RuleFireHistory.objects.create(`
`222`	`222`	`project=self.project,`
`@@ -314,7 +314,7 @@ def test_raises_exception_when_rule_action_does_not_exist(self) -> None:`
`314`	`314`	`}`
`315`	`315`	`]`
`316`	`316`	`rule = self.create_project_rule(`
`317`		`- project=self.project, action_match=notify_issue_owners_action`
	`317`	`+ project=self.project, action_data=notify_issue_owners_action`
`318`	`318`	`)`
`319`	`319`	`rule_fire_history = RuleFireHistory.objects.create(`
`320`	`320`	`project=self.project,`