-
Notifications
You must be signed in to change notification settings - Fork 66
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
Adds webhook format check for Slack #814
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We used mock data to perform integration test. And the mock data may can not pass the new validation. Please also fix the tests in this repo and dashboards-notifications.
I've (hopefully) fixed the integtests in this repo. |
Also, I just noticed the 'Unverified' tags on my commits. I was messing around with the automatic signing off feature and I think I messed up some settings which is leading to all my commits appearing as unverified |
@Noir01 please follow the guide in https://github.com/opensearch-project/notifications/pull/814/checks?check_run_id=18584633999 to fix DCO and there has a unit test failure, can you fix it as well. |
Can I close this PR and re-open another with the correct signing-off email? |
You don't have to. Follow the guide mentioned in link https://github.com/opensearch-project/notifications/pull/814/checks?check_run_id=18584633999
|
b099c60
to
1867a8a
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #814 +/- ##
============================================
+ Coverage 66.85% 66.89% +0.03%
- Complexity 263 265 +2
============================================
Files 39 39
Lines 1738 1740 +2
Branches 165 165
============================================
+ Hits 1162 1164 +2
Misses 453 453
Partials 123 123
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
I was trying to update this branch, and rebased it, but it got rid of the Verified tag. How can I fix this? Also, how do I deal with the failed codecov tests? |
The DCO failed with reason
|
I just did both of those steps |
@Noir01 after this, please follow the steps in https://github.com/opensearch-project/notifications/pull/814/checks?check_run_id=18694631981 to fix DCO |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good work, but I think we should add more tests cases. Can we add unit test cases to test more success cases and fail cases for url validation? And the integ test case for exception message?
* Added feature support for microsoft teams webhoo Signed-off-by: danielkyalo599 <[email protected]> * Added feature support for microsoft teams webhook ,removed valid webhooks Signed-off-by: danielkyalo599 <[email protected]> * Added feature support for Microsoft teams webhook Signed-off-by: danielkyalo599 <[email protected]> * Refactored feature support for ms teams and added unit and integTest Signed-off-by: danielkyalo599 <[email protected]> * fix build in core Signed-off-by: zhichao-aws <[email protected]> * fix core-spi build Signed-off-by: zhichao-aws <[email protected]> * fix notifications main code Signed-off-by: zhichao-aws <[email protected]> * fix mappings, add IT Signed-off-by: zhichao-aws <[email protected]> * add auto upgrade mapping logic Signed-off-by: zhichao-aws <[email protected]> * put load mapping to initialize step Signed-off-by: zhichao-aws <[email protected]> * add schema_version field Signed-off-by: zhichao-aws <[email protected]> * add integ test Signed-off-by: zhichao-aws <[email protected]> * adjust with auto upgrade mapping logic Signed-off-by: zhichao-aws <[email protected]> * add bwc Signed-off-by: zhichao-aws <[email protected]> * modify bwc Signed-off-by: zhichao-aws <[email protected]> * modify bwc Signed-off-by: zhichao-aws <[email protected]> * resolve comments Signed-off-by: zhichao-aws <[email protected]> * add license header Signed-off-by: zhichao-aws <[email protected]> * fix microsoft teams sample url in IT to adapt url validation Signed-off-by: zhichao-aws <[email protected]> --------- Signed-off-by: danielkyalo599 <[email protected]> Signed-off-by: zhichao-aws <[email protected]> Co-authored-by: danielkyalo599 <[email protected]> Signed-off-by: Aniruddh <[email protected]>
* add validation failure message for Microsoft Teams Signed-off-by: zhichao-aws <[email protected]> * modify integtest Signed-off-by: zhichao-aws <[email protected]> --------- Signed-off-by: zhichao-aws <[email protected]> Signed-off-by: Aniruddh <[email protected]>
Signed-off-by: Hailong Cui <[email protected]> Signed-off-by: Aniruddh <[email protected]>
Signed-off-by: Darshit Chanpura <[email protected]> Signed-off-by: Aniruddh <[email protected]>
* Add 2.10.0 release notes Signed-off-by: Hailong Cui <[email protected]> * update release notes Signed-off-by: Hailong Cui <[email protected]> * Update opensearch-notifications.release-notes-2.10.0.0.md Signed-off-by: Hailong Cui <[email protected]> * fix wrong PR number Signed-off-by: Hailong Cui <[email protected]> --------- Signed-off-by: Hailong Cui <[email protected]> Signed-off-by: Aniruddh <[email protected]>
Signed-off-by: Hailong Cui <[email protected]> Signed-off-by: Aniruddh <[email protected]>
Signed-off-by: yuye-aws <[email protected]> Signed-off-by: Aniruddh <[email protected]>
…x warning (opensearch-project#784) * Fix integration test failure by allowing direct access to system index warning Signed-off-by: gaobinlong <[email protected]> * Fix bwc test failure of throwing direct access to system index when getting mapping Signed-off-by: gaobinlong <[email protected]> --------- Signed-off-by: gaobinlong <[email protected]> Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh <[email protected]>
You know we're adding tests to make sure the code behavior are as expected. And here we want to make sure the url check reject wrong url, and return correct message to help users fix it. You can write test cases just like this example, but I think you should modify these mock urls to adapt to you regex expression |
Oh yeah, of course. |
Signed-off-by: Aniruddh <[email protected]>
Signed-off-by: Aniruddh <[email protected]>
Signed-off-by: Aniruddh <[email protected]>
Signed-off-by: Aniruddh <[email protected]>
Signed-off-by: Aniruddh <[email protected]>
Done. |
The validation happens when create new slack channel or update existing slack channel. To be compatible with existing data, we may want to add a condition for update case, only if webhook url has changed, we do the validation. we can have this in follow up PR and remove the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
@Hailong-am Shall I open a new issue for this? |
sure, thanks |
|
* Microsoft teams (#676) * Added feature support for microsoft teams webhoo Signed-off-by: danielkyalo599 <[email protected]> * Added feature support for microsoft teams webhook ,removed valid webhooks Signed-off-by: danielkyalo599 <[email protected]> * Added feature support for Microsoft teams webhook Signed-off-by: danielkyalo599 <[email protected]> * Refactored feature support for ms teams and added unit and integTest Signed-off-by: danielkyalo599 <[email protected]> * fix build in core Signed-off-by: zhichao-aws <[email protected]> * fix core-spi build Signed-off-by: zhichao-aws <[email protected]> * fix notifications main code Signed-off-by: zhichao-aws <[email protected]> * fix mappings, add IT Signed-off-by: zhichao-aws <[email protected]> * add auto upgrade mapping logic Signed-off-by: zhichao-aws <[email protected]> * put load mapping to initialize step Signed-off-by: zhichao-aws <[email protected]> * add schema_version field Signed-off-by: zhichao-aws <[email protected]> * add integ test Signed-off-by: zhichao-aws <[email protected]> * adjust with auto upgrade mapping logic Signed-off-by: zhichao-aws <[email protected]> * add bwc Signed-off-by: zhichao-aws <[email protected]> * modify bwc Signed-off-by: zhichao-aws <[email protected]> * modify bwc Signed-off-by: zhichao-aws <[email protected]> * resolve comments Signed-off-by: zhichao-aws <[email protected]> * add license header Signed-off-by: zhichao-aws <[email protected]> * fix microsoft teams sample url in IT to adapt url validation Signed-off-by: zhichao-aws <[email protected]> --------- Signed-off-by: danielkyalo599 <[email protected]> Signed-off-by: zhichao-aws <[email protected]> Co-authored-by: danielkyalo599 <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Add microsoft teams validation error message (#746) * add validation failure message for Microsoft Teams Signed-off-by: zhichao-aws <[email protected]> * modify integtest Signed-off-by: zhichao-aws <[email protected]> --------- Signed-off-by: zhichao-aws <[email protected]> Signed-off-by: Aniruddh <[email protected]> * onboard system and hidden index (#742) Signed-off-by: Hailong Cui <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Updates demo certs used in integ tests (#756) Signed-off-by: Darshit Chanpura <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Add 2.10.0 release notes (#755) * Add 2.10.0 release notes Signed-off-by: Hailong Cui <[email protected]> * update release notes Signed-off-by: Hailong Cui <[email protected]> * Update opensearch-notifications.release-notes-2.10.0.0.md Signed-off-by: Hailong Cui <[email protected]> * fix wrong PR number Signed-off-by: Hailong Cui <[email protected]> --------- Signed-off-by: Hailong Cui <[email protected]> Signed-off-by: Aniruddh <[email protected]> * bump bwc version to 2.11 (#763) Signed-off-by: Hailong Cui <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Add 2.11 release notes (#774) Signed-off-by: yuye-aws <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Fix integration test failure by allowing direct access to system index warning (#784) * Fix integration test failure by allowing direct access to system index warning Signed-off-by: gaobinlong <[email protected]> * Fix bwc test failure of throwing direct access to system index when getting mapping Signed-off-by: gaobinlong <[email protected]> --------- Signed-off-by: gaobinlong <[email protected]> Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Re-enable detekt Bumped version of `io.gitlab.arturbosch.detekt:detekt-gradle-plugin` to `1.23.0` Signed-off-by: Aniruddh <[email protected]> Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh <[email protected]> * bump bwc version to 2.12 (#793) Signed-off-by: Hailong Cui <[email protected]> Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Update dependency org.json:json to v20231013 (#795) Signed-off-by: gaobinlong <[email protected]> Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Impove security plugin enabling check (#792) Signed-off-by: Hailong Cui <[email protected]> Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Add github workflow to auto bump bwc version (#799) * Adding bump bwc version github workflow Signed-off-by: Hailong Cui <[email protected]> * revert app id Signed-off-by: Hailong Cui <[email protected]> --------- Signed-off-by: Hailong Cui <[email protected]> Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Replace the TestMailServer to GreenMail server (#801) * Add 2.11 release notes (#774) Signed-off-by: yuye-aws <[email protected]> Signed-off-by: rdani <[email protected]> * Fix integration test failure by allowing direct access to system index warning (#784) * Fix integration test failure by allowing direct access to system index warning Signed-off-by: gaobinlong <[email protected]> * Fix bwc test failure of throwing direct access to system index when getting mapping Signed-off-by: gaobinlong <[email protected]> --------- Signed-off-by: gaobinlong <[email protected]> Signed-off-by: rdani <[email protected]> * Replace the TestMailServer to GreenMail server Signed-off-by: rdani <[email protected]> * bump bwc version to 2.12 (#793) Signed-off-by: Hailong Cui <[email protected]> Signed-off-by: rdani <[email protected]> * Update dependency org.json:json to v20231013 (#795) Signed-off-by: gaobinlong <[email protected]> Signed-off-by: rdani <[email protected]> * Re-enable detekt (#796) Bumped version of `io.gitlab.arturbosch.detekt:detekt-gradle-plugin` to `1.23.0` Signed-off-by: Aniruddh <[email protected]> Co-authored-by: Hailong Cui <[email protected]> Signed-off-by: rdani <[email protected]> * Add assertion for retrieval of notification Signed-off-by: rdani <[email protected]> * Update to stable version Signed-off-by: rdani <[email protected]> * Update to stable version Signed-off-by: rdani <[email protected]> * Update to suggested version Signed-off-by: rdani <[email protected]> --------- Signed-off-by: yuye-aws <[email protected]> Signed-off-by: rdani <[email protected]> Signed-off-by: gaobinlong <[email protected]> Signed-off-by: Hailong Cui <[email protected]> Signed-off-by: Aniruddh <[email protected]> Co-authored-by: Yuye Zhu <[email protected]> Co-authored-by: gaobinlong <[email protected]> Co-authored-by: rdani <[email protected]> Co-authored-by: Hailong Cui <[email protected]> Co-authored-by: Aniruddh <[email protected]> Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Onboard prod jenkins docker image to github actions (#809) * Onboard prod jenkins docker image to github actions Signed-off-by: Peter Zhu <[email protected]> * Add more Signed-off-by: Peter Zhu <[email protected]> --------- Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Added org.apache.logging.log4j:log4j-slf4j-impl to classpath (#791) * Added slf4j-jdk14.jar to classpath Adding binding for SLF4J that should fix StaticLoggerBinder being not loaded. Followed instructions from warning messages that appear. Signed-off-by: Noir <[email protected]> * Undid 80fc198 Removed slf4j-jdk14.jar from classpath Signed-off-by: Aniruddh <[email protected]> * Added org.apache.logging.log4j:log4j-slf4j-impl to classpath Signed-off-by: Aniruddh <[email protected]> --------- Signed-off-by: Noir <[email protected]> Signed-off-by: Aniruddh <[email protected]> Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Added Slack webhook URL validation regex Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Replaced wrongly formatted dummy Slack URL with properly formatted dummy Slack URL Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Replaced more wrongly formatted dummy Slack URL with properly formatted dummy Slack URL Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Replaced even more wrongly formatted dummy Slack URL with properly formatted dummy Slack URL Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Replace path of mock Slack URL with `sample_slack_url` Signed-off-by: Aniruddh <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Remove slackId from domainIds Signed-off-by: Aniruddh <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Replace wrongly formatted dummy Slack URL with properly formatted dummy Slack URL Signed-off-by: Aniruddh <[email protected]> Signed-off-by: Aniruddh <[email protected]> * Add tests for wrong Slack URLs Signed-off-by: Aniruddh <[email protected]> * Add validation tests for Slack URL Signed-off-by: Aniruddh <[email protected]> * Format Signed-off-by: Aniruddh <[email protected]> * GovSlack apps can use the slack-gov.com domain Signed-off-by: Aniruddh <[email protected]> * Add validation for gov-slack.com domain Signed-off-by: Aniruddh <[email protected]> --------- Signed-off-by: danielkyalo599 <[email protected]> Signed-off-by: zhichao-aws <[email protected]> Signed-off-by: Aniruddh <[email protected]> Signed-off-by: Hailong Cui <[email protected]> Signed-off-by: Darshit Chanpura <[email protected]> Signed-off-by: yuye-aws <[email protected]> Signed-off-by: gaobinlong <[email protected]> Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh <[email protected]> Signed-off-by: rdani <[email protected]> Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: Noir <[email protected]> Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh <[email protected]> Co-authored-by: zhichao-aws <[email protected]> Co-authored-by: danielkyalo599 <[email protected]> Co-authored-by: Hailong Cui <[email protected]> Co-authored-by: Darshit Chanpura <[email protected]> Co-authored-by: Yuye Zhu <[email protected]> Co-authored-by: gaobinlong <[email protected]> Co-authored-by: Rachana Dani <[email protected]> Co-authored-by: rdani <[email protected]> Co-authored-by: Peter Zhu <[email protected]> (cherry picked from commit 87109a0) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* Microsoft teams (#676) * Added feature support for microsoft teams webhoo * Added feature support for microsoft teams webhook ,removed valid webhooks * Added feature support for Microsoft teams webhook * Refactored feature support for ms teams and added unit and integTest * fix build in core * fix core-spi build * fix notifications main code * fix mappings, add IT * add auto upgrade mapping logic * put load mapping to initialize step * add schema_version field * add integ test * adjust with auto upgrade mapping logic * add bwc * modify bwc * modify bwc * resolve comments * add license header * fix microsoft teams sample url in IT to adapt url validation --------- * Add microsoft teams validation error message (#746) * add validation failure message for Microsoft Teams * modify integtest --------- * onboard system and hidden index (#742) * Updates demo certs used in integ tests (#756) * Add 2.10.0 release notes (#755) * Add 2.10.0 release notes * update release notes * Update opensearch-notifications.release-notes-2.10.0.0.md * fix wrong PR number --------- * bump bwc version to 2.11 (#763) * Add 2.11 release notes (#774) * Fix integration test failure by allowing direct access to system index warning (#784) * Fix integration test failure by allowing direct access to system index warning * Fix bwc test failure of throwing direct access to system index when getting mapping --------- * Re-enable detekt Bumped version of `io.gitlab.arturbosch.detekt:detekt-gradle-plugin` to `1.23.0` * bump bwc version to 2.12 (#793) * Update dependency org.json:json to v20231013 (#795) * Impove security plugin enabling check (#792) * Add github workflow to auto bump bwc version (#799) * Adding bump bwc version github workflow * revert app id --------- * Replace the TestMailServer to GreenMail server (#801) * Add 2.11 release notes (#774) * Fix integration test failure by allowing direct access to system index warning (#784) * Fix integration test failure by allowing direct access to system index warning * Fix bwc test failure of throwing direct access to system index when getting mapping --------- * Replace the TestMailServer to GreenMail server * bump bwc version to 2.12 (#793) * Update dependency org.json:json to v20231013 (#795) * Re-enable detekt (#796) Bumped version of `io.gitlab.arturbosch.detekt:detekt-gradle-plugin` to `1.23.0` * Add assertion for retrieval of notification * Update to stable version * Update to stable version * Update to suggested version --------- * Onboard prod jenkins docker image to github actions (#809) * Onboard prod jenkins docker image to github actions * Add more --------- * Added org.apache.logging.log4j:log4j-slf4j-impl to classpath (#791) * Added slf4j-jdk14.jar to classpath Adding binding for SLF4J that should fix StaticLoggerBinder being not loaded. Followed instructions from warning messages that appear. * Undid 80fc198 Removed slf4j-jdk14.jar from classpath * Added org.apache.logging.log4j:log4j-slf4j-impl to classpath --------- * Added Slack webhook URL validation regex * Replaced wrongly formatted dummy Slack URL with properly formatted dummy Slack URL * Replaced more wrongly formatted dummy Slack URL with properly formatted dummy Slack URL * Replaced even more wrongly formatted dummy Slack URL with properly formatted dummy Slack URL * Replace path of mock Slack URL with `sample_slack_url` * Remove slackId from domainIds * Replace wrongly formatted dummy Slack URL with properly formatted dummy Slack URL * Add tests for wrong Slack URLs * Add validation tests for Slack URL * Format * GovSlack apps can use the slack-gov.com domain * Add validation for gov-slack.com domain --------- (cherry picked from commit 87109a0) Signed-off-by: danielkyalo599 <[email protected]> Signed-off-by: zhichao-aws <[email protected]> Signed-off-by: Aniruddh <[email protected]> Signed-off-by: Hailong Cui <[email protected]> Signed-off-by: Darshit Chanpura <[email protected]> Signed-off-by: yuye-aws <[email protected]> Signed-off-by: gaobinlong <[email protected]> Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh <[email protected]> Signed-off-by: rdani <[email protected]> Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: Noir <[email protected]> Signed-off-by: Aniruddh Srivastava <[email protected]> Signed-off-by: Aniruddh <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: zhichao-aws <[email protected]> Co-authored-by: danielkyalo599 <[email protected]> Co-authored-by: Hailong Cui <[email protected]> Co-authored-by: Darshit Chanpura <[email protected]> Co-authored-by: Yuye Zhu <[email protected]> Co-authored-by: gaobinlong <[email protected]> Co-authored-by: Rachana Dani <[email protected]> Co-authored-by: rdani <[email protected]> Co-authored-by: Peter Zhu <[email protected]>
Description
Adds webhook format check for Slack
Issues Resolved
fixes #787
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.