Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4.3 Backport: Handle Teams Notification fields with colon characters #1205

Merged
merged 3 commits into from Oct 25, 2022

Conversation

kingzacko1
Copy link
Contributor

Backport of non-breaking portion of #1202. This change leaves the Teams notification template parsing in tact but will correctly display values containing colons in key-value pairs. This will NOT address broken backlog messages that contain colons when templated by the default Teams notification template. That issue is fully addressed in the previously mentioned PR as part of breaking changes to existing Teams notifications.

Related to #1096 and #1200

  • The commit history must be preserved - please use the rebase-merge or standard merge option instead of squash-merge
  • Sync up with the author before merging

 Refactor MS Teams and Slack message objects to use AutoValue
Copy link
Contributor

@ryan-carroll-graylog ryan-carroll-graylog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me other than the one log message nit. I ran through some testing on 4.3 of Teams and Slack notifications and everything looks to be working correctly.

webhookUrl,
message.getJsonString());
"");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you want to add the message here:

Suggested change
"");
objectMapper.writeValueAsString(message));

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep! Good catch!

@kingzacko1 kingzacko1 merged commit cb1ee17 into 4.3 Oct 25, 2022
@kingzacko1 kingzacko1 deleted the backport-4.3/fix-msteams-notification-timestamp-issue branch October 25, 2022 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants