Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions tests/sentry/digests/test_utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ def test_get_event_from_groups_in_digest(self) -> None:
def test_event_to_record_with_workflow_id(self) -> None:
project = self.create_project(fire_project_created=True)
rule = self.create_project_rule(project, include_legacy_rule_id=False)
origin = create_notification_origin(rule)
workflow_id = origin.workflow_id
assert workflow_id is not None

event = self.store_event(
data={"fingerprint": ["group1"], "timestamp": before_now(minutes=2).isoformat()},
Expand All @@ -99,14 +102,15 @@ def test_event_to_record_with_workflow_id(self) -> None:
assert len(records) == 1
record = records[0]
assert record.value.identifier_key == IdentifierKey.WORKFLOW
assert record.value.rules == [rule.data["actions"][0]["workflow_id"]]
assert record.value.rules == [workflow_id]

def test_get_rules_from_workflows_uses_workflow_environment_for_linked_rule(self) -> None:
project = self.create_project(fire_project_created=True)
development = self.create_environment(project=project, name="development")
production = self.create_environment(project=project, name="production")
rule = self.create_project_rule(project=project, environment_id=development.id)
workflow_id = int(rule.data["actions"][0]["workflow_id"])
workflow_id = create_notification_origin(rule).workflow_id
assert workflow_id is not None
workflow = Workflow.objects.get(id=workflow_id)
workflow.update(name="Renamed workflow", environment_id=production.id)

Expand All @@ -121,7 +125,8 @@ def test_get_rules_from_workflows_uses_unset_workflow_environment(self) -> None:
project = self.create_project(fire_project_created=True)
environment = self.create_environment(project=project)
rule = self.create_project_rule(project=project, environment_id=environment.id)
workflow_id = int(rule.data["actions"][0]["workflow_id"])
workflow_id = create_notification_origin(rule).workflow_id
assert workflow_id is not None
Workflow.objects.filter(id=workflow_id).update(environment_id=None)

rendered_rule = get_rules_from_workflows(project, {workflow_id})[workflow_id]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
from sentry.silo.base import SiloMode
from sentry.testutils.asserts import assert_mock_called_once_with_partial, assert_slo_metric
from sentry.testutils.cases import APITestCase
from sentry.testutils.helpers.notifications import create_notification_origin
from sentry.testutils.silo import assume_test_silo_mode
from sentry.testutils.skips import requires_snuba
from sentry.users.models.identity import Identity, IdentityStatus
Expand Down Expand Up @@ -244,7 +245,8 @@ def test_rule_lookup_metric_with_workflow(
self, verify: MagicMock, metrics_incr: MagicMock
) -> None:
rule = self.create_project_rule(project=self.project1)
workflow_id = int(rule.data["actions"][0]["workflow_id"])
workflow_id = create_notification_origin(rule).workflow_id
assert workflow_id is not None

response = self.post_webhook(
action_type=ACTION_TYPE.ARCHIVE,
Expand Down
11 changes: 8 additions & 3 deletions tests/sentry/integrations/msteams/test_message_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
from sentry.models.group import GroupStatus
from sentry.models.groupassignee import GroupAssignee
from sentry.models.organization import Organization
from sentry.notifications.types import NotificationOrigin
from sentry.testutils.cases import TestCase
from sentry.testutils.helpers.notifications import (
DummyNotification,
Expand Down Expand Up @@ -424,14 +425,18 @@ def test_issue_message_builder(self) -> None:
assert card_json[0] == "{" and card_json[-1] == "}"

def test_issue_action_payload_includes_workflow_ids_only(self) -> None:
self.rules[0].data["actions"][0].update(
{"legacy_rule_id": self.rules[0].id, "workflow_id": 123}
origin = self.origins[0]
rule = NotificationOrigin(
label=origin.label,
environment_id=origin.environment_id,
legacy_rule_id=origin.legacy_rule_id,
workflow_id=123,
)

payload = MSTeamsIssueMessageBuilder(
group=self.group1,
event=self.event1,
rules=[create_notification_origin(self.rules[0])],
rules=[rule],
integration=self.integration,
).generate_action_payload(ACTION_TYPE.RESOLVE)["payload"]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,8 @@ def test_issue_alert_uses_environment_from_workflow_rule(self) -> None:
name="ja rule",
environment_id=development.id,
)
workflow_id = int(legacy_rule.data["actions"][0]["workflow_id"])
workflow_id = create_notification_origin(legacy_rule).workflow_id
assert workflow_id is not None
Workflow.objects.filter(id=workflow_id).update(environment_id=production.id)
workflow_rule = get_rules_from_workflows(self.project, {workflow_id})[workflow_id]

Expand Down
25 changes: 17 additions & 8 deletions tests/sentry/integrations/slack/test_message_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
from sentry.models.rule import Rule as IssueAlertRule
from sentry.models.team import Team
from sentry.monitors.grouptype import MonitorIncidentType
from sentry.notifications.types import NotificationOrigin
from sentry.notifications.utils.actions import MessageAction
from sentry.services.eventstore.models import Event
from sentry.silo.base import SiloMode
Expand Down Expand Up @@ -381,16 +382,19 @@ def test_build_group_block_noa(self) -> None:
self.project.save(update_fields=["flags"])
more_tags = {"escape": "`room`", "foo": "bar", "release": release.version}
notes = "hey @colleen fix it"
origin = create_notification_origin(rule)
assert origin.legacy_rule_id is not None
assert origin.workflow_id is not None

assert SlackIssuesMessageBuilder(
group, rules=[create_notification_origin(rule)]
group, rules=[origin]
).build() == build_test_message_blocks(
teams={self.team},
users={self.user},
group=group,
rule=rule,
legacy_rule_id=rule.data["actions"][0]["legacy_rule_id"],
workflow_id=rule.data["actions"][0]["workflow_id"],
legacy_rule_id=origin.legacy_rule_id,
workflow_id=origin.workflow_id,
)

# add extra tag to message
Expand Down Expand Up @@ -455,12 +459,17 @@ def test_build_group_block_noa(self) -> None:

def test_build_group_block_with_workflow_only(self) -> None:
rule = self.create_project_rule(project=self.project)
workflow_id = rule.data["actions"][0]["workflow_id"]
rule.data["actions"][0].pop("legacy_rule_id")
rule_origin = create_notification_origin(rule)
workflow_id = rule_origin.workflow_id
assert workflow_id is not None
origin = NotificationOrigin(
label=rule.label,
environment_id=rule.environment_id,
workflow_id=workflow_id,
legacy_rule_id=None,
)

blocks = SlackIssuesMessageBuilder(
self.group, rules=[create_notification_origin(rule)]
).build()["blocks"]
blocks = SlackIssuesMessageBuilder(self.group, rules=[origin]).build()["blocks"]

assert orjson.loads(blocks[0]["block_id"]) == {
"issue": self.group.id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
from sentry.silo.safety import unguarded_write
from sentry.testutils.cases import PerformanceIssueTestCase
from sentry.testutils.helpers.datetime import before_now, freeze_time
from sentry.testutils.helpers.notifications import create_notification_origin
from sentry.testutils.hybrid_cloud import HybridCloudTestMixin
from sentry.testutils.silo import assume_test_silo_mode
from sentry.testutils.skips import requires_snuba
Expand Down Expand Up @@ -922,7 +923,8 @@ def test_resolve_in_next_release_through_unfurl(self, mock_tags: MagicMock) -> N
def test_response_differs_on_bot_message(self, _mock_view_updates_open: MagicMock) -> None:
status_action = self.get_archive_status_action()
original_message = self.get_original_message(self.group.id)
workflow_id = self.rule.data["actions"][0]["workflow_id"]
workflow_id = create_notification_origin(self.rule).workflow_id
assert workflow_id is not None
callback_id = orjson.dumps({"issue": self.group.id, "workflow": workflow_id}).decode()

resp = self.post_webhook_block_kit(
Expand Down Expand Up @@ -1247,7 +1249,8 @@ def test_rule_from_same_organization_resolves_workflow(self, mock_tags: MagicMoc
assert resp.status_code == 200, resp.content

blocks = self.mock_post.call_args.kwargs["blocks"]
workflow_id = int(self.rule.data["actions"][0]["workflow_id"])
workflow_id = create_notification_origin(self.rule).workflow_id
assert workflow_id is not None
assert f"workflow_id={workflow_id}" in blocks[0]["text"]["text"]

@patch("sentry.utils.metrics.backend.inner.incr")
Expand Down
4 changes: 3 additions & 1 deletion tests/sentry/mail/test_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -1634,8 +1634,10 @@ def test_digest(self, mock_logger: MagicMock, digests: MagicMock) -> None:
self.adapter.rule_notify(as_group_event(event), futures, ActionTargetType.ISSUE_OWNERS)
assert digests.backend.add.call_count == 1
record = digests.backend.add.call_args.args[1]
workflow_id = futures[0].context.origin.workflow_id
assert workflow_id is not None
assert record.value.identifier_key == IdentifierKey.WORKFLOW
assert record.value.rules == [int(rule.data["actions"][0]["workflow_id"])]
assert record.value.rules == [workflow_id]
assert event.group
mock_logger.info.assert_called_with(
"mail.adapter.notification.%s",
Expand Down
3 changes: 2 additions & 1 deletion tests/sentry/notifications/test_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ def test_get_rules_uses_workflow_identity_without_legacy_rule(self) -> None:

[rule_details] = get_rules([origin], self.organization, self.project)

workflow_id = int(rule.data["actions"][0]["workflow_id"])
workflow_id = origin.workflow_id
assert workflow_id is not None
assert rule_details.id == workflow_id
assert rule_details.status_url == (
f"/organizations/{self.organization.slug}/monitors/alerts/{workflow_id}/"
Expand Down
10 changes: 7 additions & 3 deletions tests/sentry/notifications/utils/test_rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
get_workflow_url,
)
from sentry.testutils.cases import TestCase
from sentry.testutils.helpers.notifications import create_notification_origin
from sentry.workflow_engine.models import Workflow


Expand Down Expand Up @@ -62,7 +63,8 @@ class GetNotificationOriginsTest(TestCase):
def test_resolves_workflow_with_legacy_identity(self) -> None:
environment = self.create_environment(project=self.project)
rule = self.create_project_rule(project=self.project)
workflow_id = int(rule.data["actions"][0]["workflow_id"])
workflow_id = create_notification_origin(rule).workflow_id
assert workflow_id is not None
Workflow.objects.filter(id=workflow_id).update(environment_id=environment.id)

origins = get_notification_origins(self.project, workflow_ids=[workflow_id])
Expand All @@ -74,7 +76,8 @@ def test_resolves_workflow_with_legacy_identity(self) -> None:

def test_maps_legacy_identity_to_workflow(self) -> None:
rule = self.create_project_rule(project=self.project)
workflow_id = int(rule.data["actions"][0]["workflow_id"])
workflow_id = create_notification_origin(rule).workflow_id
assert workflow_id is not None

origins = get_notification_origins(self.project, legacy_rule_ids=[rule.id])

Expand All @@ -84,7 +87,8 @@ def test_maps_legacy_identity_to_workflow(self) -> None:

def test_deduplicates_dual_identity(self) -> None:
rule = self.create_project_rule(project=self.project)
workflow_id = int(rule.data["actions"][0]["workflow_id"])
workflow_id = create_notification_origin(rule).workflow_id
assert workflow_id is not None

origins = get_notification_origins(
self.project, workflow_ids=[workflow_id], legacy_rule_ids=[rule.id]
Expand Down
Loading