From 2355fa3a3ce37380f56a33266ae0c1841feba73b Mon Sep 17 00:00:00 2001 From: toro_ponz Date: Sun, 2 Oct 2022 00:45:01 +0900 Subject: [PATCH 1/2] fix failure of "Format Alert" button on Slack. --- engine/apps/slack/scenarios/alertgroup_appearance.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/engine/apps/slack/scenarios/alertgroup_appearance.py b/engine/apps/slack/scenarios/alertgroup_appearance.py index 7b772a0e..c4c4236b 100644 --- a/engine/apps/slack/scenarios/alertgroup_appearance.py +++ b/engine/apps/slack/scenarios/alertgroup_appearance.py @@ -57,7 +57,8 @@ class OpenAlertAppearanceDialogStep( # This is a special case for amazon sns notifications in str format CHEKED if ( - AlertReceiveChannel.INTEGRATION_AMAZON_SNS is not None + hasattr(AlertReceiveChannel, "INTEGRATION_AMAZON_SNS") + and AlertReceiveChannel.INTEGRATION_AMAZON_SNS is not None and alert_group.channel.integration == AlertReceiveChannel.INTEGRATION_AMAZON_SNS and raw_request_data == "{}" ): From a8a88f5c00b763753c6392d7b5e26494d47776ae Mon Sep 17 00:00:00 2001 From: toro_ponz Date: Mon, 3 Oct 2022 18:54:56 +0900 Subject: [PATCH 2/2] remove wasted condition check. --- engine/apps/slack/scenarios/alertgroup_appearance.py | 1 - 1 file changed, 1 deletion(-) diff --git a/engine/apps/slack/scenarios/alertgroup_appearance.py b/engine/apps/slack/scenarios/alertgroup_appearance.py index c4c4236b..8a335fcd 100644 --- a/engine/apps/slack/scenarios/alertgroup_appearance.py +++ b/engine/apps/slack/scenarios/alertgroup_appearance.py @@ -58,7 +58,6 @@ class OpenAlertAppearanceDialogStep( # This is a special case for amazon sns notifications in str format CHEKED if ( hasattr(AlertReceiveChannel, "INTEGRATION_AMAZON_SNS") - and AlertReceiveChannel.INTEGRATION_AMAZON_SNS is not None and alert_group.channel.integration == AlertReceiveChannel.INTEGRATION_AMAZON_SNS and raw_request_data == "{}" ):