Slack: assume any non-JSON response is an incoming webhook #67
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
Slack returns these responses as text/html while Mattermost returns them
as text/plain. To support both, we need to either add another clause to
the if:
|| strings.HasPrefix(content, "text/plain")
either reverse the current logic, as does this commit.
|
|
|
@yuri-tceretian @grobinson-grafana Can you please take a look into this pull request to get notifications working again correctly in Mattermost? |
There was a problem hiding this comment.
LGTM. Will leave to @grobinson-grafana to give a formal approval as we apply the practice of two reviewers per PR. Thanks for contribution!
|
I think this will need to be backported to 9.4.x branch after this one is merged. I can take care of it. |
grobinson-grafana
approved these changes
Mar 28, 2023
yuri-tceretian
pushed a commit
that referenced
this pull request
Mar 28, 2023
* Fix typo in test name * TestSendSlackRequest: test with content-type header * Slack: assume any non-JSON response is an incoming webhook. Slack returns these responses as text/html while Mattermost returns them as text/plain. # Conflicts: # alerting/notifier/channels/slack_test.go
This was referenced Mar 28, 2023
yuri-tceretian
pushed a commit
that referenced
this pull request
Apr 28, 2023
* Fix typo in test name * TestSendSlackRequest: test with content-type header * Slack: assume any non-JSON response is an incoming webhook. Slack returns these responses as text/html while Mattermost returns them as text/plain.
yuri-tceretian
added a commit
that referenced
this pull request
Apr 28, 2023
…) (#84) Co-authored-by: Baptiste Fontaine <b@ptistefontaine.fr>
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.
Slack returns these responses as
text/htmlwhile Mattermost returns them astext/plain(see grafana/grafana#64079 (comment)). To support both, we need to either add another clause to the if (|| strings.HasPrefix(content, "text/plain")), either reverse the current logic, as does this PR.I also added tests on the
Content-Typeheader as they were missing. This fixes grafana/grafana#64079.