Просмотр исходного кода

feat: Add notification_uuid to BaseNotification and issue alert URLs (#55808)

Add notification_uuid to BaseNotification and its instances.
Add notification_uuid to URLs from BaseNotification and its instances.
Add notification_uuid to URLs from RuleFireHistory (after functions)
Jodi Jang 1 год назад
Родитель
Сommit
2ce9eecdbf

+ 1 - 1
fixtures/emails/assigned.txt

@@ -7,7 +7,7 @@ foo@example.com assigned PROJECT-1 to foo@example.com
 
 goose smiling gobbler sterling feline
 
-http://testserver/organizations/organization/issues/1/?referrer=assigned_activity-email
+http://testserver/organizations/organization/issues/1/?referrer=assigned_activity-email&notification_uuid=6a372642-0ffc-43c6-b0d3-7ce2752f38a9
 
 
 Unsubscribe: javascript:alert("This is a preview page, what did you expect to happen?");

+ 1 - 1
fixtures/emails/assigned_self.txt

@@ -7,7 +7,7 @@ foo@example.com assigned PROJECT-1 to themselves
 
 goose smiling gobbler sterling feline
 
-http://testserver/organizations/organization/issues/1/?referrer=assigned_activity-email
+http://testserver/organizations/organization/issues/1/?referrer=assigned_activity-email&notification_uuid=6a372642-0ffc-43c6-b0d3-7ce2752f38a9
 
 
 Unsubscribe: javascript:alert("This is a preview page, what did you expect to happen?");

+ 1 - 1
fixtures/emails/note.txt

@@ -9,6 +9,6 @@ sincerely gobbler epic immensely katydid beloved stunning falcon mainly actively
 
 goose smiling gobbler sterling feline
 
-http://testserver/organizations/organization/issues/1/activity/?referrer=note_activity-email
+http://testserver/organizations/organization/issues/1/activity/?referrer=note_activity-email&notification_uuid=6a372642-0ffc-43c6-b0d3-7ce2752f38a9
 
 Unsubscribe: javascript:alert("This is a preview page, what did you expect to happen?");

+ 1 - 1
fixtures/emails/regression.txt

@@ -7,7 +7,7 @@ Sentry marked PROJECT-1 as a regression
 
 goose smiling gobbler sterling feline
 
-http://testserver/organizations/organization/issues/1/?referrer=regression_activity-email
+http://testserver/organizations/organization/issues/1/?referrer=regression_activity-email&notification_uuid=6a372642-0ffc-43c6-b0d3-7ce2752f38a9
 
 
 Unsubscribe: javascript:alert("This is a preview page, what did you expect to happen?");

+ 1 - 1
fixtures/emails/regression_with_version.txt

@@ -7,7 +7,7 @@ Sentry marked PROJECT-1 as a regression in abcdef
 
 goose smiling gobbler sterling feline
 
-http://testserver/organizations/organization/issues/1/?referrer=regression_activity-email
+http://testserver/organizations/organization/issues/1/?referrer=regression_activity-email&notification_uuid=6a372642-0ffc-43c6-b0d3-7ce2752f38a9
 
 
 Unsubscribe: javascript:alert("This is a preview page, what did you expect to happen?");

+ 1 - 1
fixtures/emails/resolved.txt

@@ -7,7 +7,7 @@ Sentry marked PROJECT-1 as resolved
 
 goose smiling gobbler sterling feline
 
-http://testserver/organizations/organization/issues/1/?referrer=resolved_activity-email
+http://testserver/organizations/organization/issues/1/?referrer=resolved_activity-email&notification_uuid=6a372642-0ffc-43c6-b0d3-7ce2752f38a9
 
 
 Unsubscribe: javascript:alert("This is a preview page, what did you expect to happen?");

+ 1 - 1
fixtures/emails/resolved_in_release.txt

@@ -7,7 +7,7 @@ Sentry marked PROJECT-1 as resolved in abcdef
 
 goose smiling gobbler sterling feline
 
-http://testserver/organizations/organization/issues/1/?referrer=resolved_in_release_activity-email
+http://testserver/organizations/organization/issues/1/?referrer=resolved_in_release_activity-email&notification_uuid=6a372642-0ffc-43c6-b0d3-7ce2752f38a9
 
 
 Unsubscribe: javascript:alert("This is a preview page, what did you expect to happen?");

+ 1 - 1
fixtures/emails/resolved_in_release_upcoming.txt

@@ -7,7 +7,7 @@ Sentry marked PROJECT-1 as resolved in an upcoming release
 
 goose smiling gobbler sterling feline
 
-http://testserver/organizations/organization/issues/1/?referrer=resolved_in_release_activity-email
+http://testserver/organizations/organization/issues/1/?referrer=resolved_in_release_activity-email&notification_uuid=6a372642-0ffc-43c6-b0d3-7ce2752f38a9
 
 
 Unsubscribe: javascript:alert("This is a preview page, what did you expect to happen?");

+ 1 - 1
fixtures/emails/unassigned.txt

@@ -7,7 +7,7 @@ foo@example.com unassigned PROJECT-1
 
 goose smiling gobbler sterling feline
 
-http://testserver/organizations/organization/issues/1/?referrer=unassigned_activity-email
+http://testserver/organizations/organization/issues/1/?referrer=unassigned_activity-email&notification_uuid=6a372642-0ffc-43c6-b0d3-7ce2752f38a9
 
 
 Unsubscribe: javascript:alert("This is a preview page, what did you expect to happen?");

+ 1 - 1
src/sentry/integrations/discord/actions/notification.py

@@ -53,7 +53,7 @@ class DiscordNotifyServiceAction(IntegrationEventAction):
 
             client = DiscordClient(integration_id=integration.id)
             try:
-                client.send_message(channel_id, message)
+                client.send_message(channel_id, message, notification_uuid=notification_uuid)
             except ApiError as e:
                 self.logger.error(
                     "rule.fail.discord_post",

Некоторые файлы не были показаны из-за большого количества измененных файлов