Fix demo alert for inbound email #2081
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vstpme
commented
Jun 1, 2023
| if payload is None: | ||
| payload = self.config.example_payload | ||
| if self.is_demo_alert_enabled: |
There was a problem hiding this comment.
I tried to simplify things a bit and reduce the number of indentation levels.
The only logical change is checking for if not self.is_demo_alert_enabled before anything else.
vstpme
commented
Jun 1, 2023
|
|
||
| if not demo_alert_payload: |
There was a problem hiding this comment.
AlertReceiveChannel.send_demo_alert handles payload=None cases
vstpme
added
the
pr:no public docs
joeyorlando
approved these changes
Jun 1, 2023
There was a problem hiding this comment.
LGTM! You might want to double check this integration file here in the private repo
| @@ -102,3 +102,26 @@ def test_default_templates_are_valid(): | |||
| jinja_template_env.from_string(template) | |||
| except TemplateSyntaxError as e: | |||
| pytest.fail(e.message) | |||
|
|
|||
|
|
|||
| @pytest.mark.parametrize("config", AlertReceiveChannel._config) | |||
| @@ -145,6 +146,21 @@ def test_send_demo_alert_alertmanager_payload_shape( | |||
| assert mocked_create_alert.call_args.args[1]["force_route_id"] is None | |||
|
|
|||
|
|
|||
| @mock.patch("apps.integrations.tasks.create_alert.apply_async", return_value=None) | |||
| @pytest.mark.parametrize( | |||
| "integration", [config.slug for config in AlertReceiveChannel._config if not config.is_demo_alert_enabled] | |||
iskhakov
approved these changes
Jun 2, 2023
# Conflicts: # CHANGELOG.md
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does
Fix HTTP 500 when sending demo alert for inbound integration email.
is_demo_alert_enabledandexample_payloadvaluesChecklist
pr:no public docsPR label added if not required)CHANGELOG.mdupdated (orpr:no changelogPR label added if not required)