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

[Backport 2.10] Adds webhook format check for Slack #944

Merged
merged 1 commit into from
Aug 23, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 87109a0 from #814.

* Microsoft teams (#676)

* Added feature support for microsoft teams webhoo

Signed-off-by: danielkyalo599 <johbiento@gmail.com>

* Added feature support for microsoft teams webhook ,removed valid webhooks

Signed-off-by: danielkyalo599 <johbiento@gmail.com>

* Added feature support for Microsoft teams webhook

Signed-off-by: danielkyalo599 <johbiento@gmail.com>

* Refactored feature support for  ms teams and added unit and integTest

Signed-off-by: danielkyalo599 <johbiento@gmail.com>

* fix build in core

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* fix core-spi build

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* fix notifications main code

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* fix mappings, add IT

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* add auto upgrade mapping logic

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* put load mapping to initialize step

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* add schema_version field

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* add integ test

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* adjust with auto upgrade mapping logic

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* add bwc

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* modify bwc

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* modify bwc

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* resolve  comments

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* add license header

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* fix microsoft teams sample url in IT to adapt url validation

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

---------

Signed-off-by: danielkyalo599 <johbiento@gmail.com>
Signed-off-by: zhichao-aws <zhichaog@amazon.com>
Co-authored-by: danielkyalo599 <johbiento@gmail.com>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Add microsoft teams validation error message (#746)

* add validation failure message for Microsoft Teams

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* modify integtest

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

---------

Signed-off-by: zhichao-aws <zhichaog@amazon.com>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* onboard system and hidden index (#742)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Updates demo certs used in integ tests (#756)

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Add 2.10.0 release notes (#755)

* Add 2.10.0 release notes

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* update release notes

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* Update opensearch-notifications.release-notes-2.10.0.0.md

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* fix wrong PR number

Signed-off-by: Hailong Cui <ihailong@amazon.com>

---------

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* bump bwc version to 2.11 (#763)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Add 2.11 release notes (#774)

Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* 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 <gbinlong@amazon.com>

* Fix bwc test failure of throwing direct access to system index when getting mapping

Signed-off-by: gaobinlong <gbinlong@amazon.com>

---------

Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Aniruddh Srivastava <aniruddh@purdue.edu>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Re-enable detekt

Bumped version of `io.gitlab.arturbosch.detekt:detekt-gradle-plugin` to `1.23.0`

Signed-off-by: Aniruddh <63553175+Noir01@users.noreply.github.com>
Signed-off-by: Aniruddh Srivastava <aniruddh@purdue.edu>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* bump bwc version to 2.12 (#793)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Aniruddh Srivastava <aniruddh@purdue.edu>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Update dependency org.json:json to v20231013 (#795)

Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Aniruddh Srivastava <aniruddh@purdue.edu>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Impove security plugin enabling check (#792)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Aniruddh Srivastava <aniruddh@purdue.edu>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Add github workflow to auto bump bwc version  (#799)

* Adding bump bwc version github workflow

Signed-off-by: Hailong Cui <ihailong@amazon.com>

* revert app id

Signed-off-by: Hailong Cui <ihailong@amazon.com>

---------

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Aniruddh Srivastava <aniruddh@purdue.edu>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Replace the TestMailServer to GreenMail server (#801)

* Add 2.11 release notes (#774)

Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Signed-off-by: rdani <rachana_sudhindradani@intuit.com>

* 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 <gbinlong@amazon.com>

* Fix bwc test failure of throwing direct access to system index when getting mapping

Signed-off-by: gaobinlong <gbinlong@amazon.com>

---------

Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: rdani <rachana_sudhindradani@intuit.com>

* Replace the TestMailServer to GreenMail server

Signed-off-by: rdani <rachana_sudhindradani@intuit.com>

* bump bwc version to 2.12 (#793)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: rdani <rachana_sudhindradani@intuit.com>

* Update dependency org.json:json to v20231013 (#795)

Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: rdani <rachana_sudhindradani@intuit.com>

* Re-enable detekt (#796)

Bumped version of `io.gitlab.arturbosch.detekt:detekt-gradle-plugin` to `1.23.0`

Signed-off-by: Aniruddh <63553175+Noir01@users.noreply.github.com>
Co-authored-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: rdani <rachana_sudhindradani@intuit.com>

* Add assertion for retrieval of notification

Signed-off-by: rdani <rachana_sudhindradani@intuit.com>

* Update to stable version

Signed-off-by: rdani <rachana_sudhindradani@intuit.com>

* Update to stable version

Signed-off-by: rdani <rachana_sudhindradani@intuit.com>

* Update to suggested version

Signed-off-by: rdani <rachana_sudhindradani@intuit.com>

---------

Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Signed-off-by: rdani <rachana_sudhindradani@intuit.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Aniruddh <63553175+Noir01@users.noreply.github.com>
Co-authored-by: Yuye Zhu <yuyezhu@amazon.com>
Co-authored-by: gaobinlong <gbinlong@amazon.com>
Co-authored-by: rdani <rachana_sudhindradani@intuit.com>
Co-authored-by: Hailong Cui <ihailong@amazon.com>
Co-authored-by: Aniruddh <63553175+Noir01@users.noreply.github.com>
Signed-off-by: Aniruddh Srivastava <aniruddh@purdue.edu>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Onboard prod jenkins docker image to github actions (#809)

* Onboard prod jenkins docker image to github actions

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add more

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Aniruddh Srivastava <aniruddh@purdue.edu>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* 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 <63553175+Noir01@users.noreply.github.com>

* Undid 80fc198

Removed slf4j-jdk14.jar from classpath

Signed-off-by: Aniruddh <63553175+Noir01@users.noreply.github.com>

* Added org.apache.logging.log4j:log4j-slf4j-impl to classpath

Signed-off-by: Aniruddh <63553175+Noir01@users.noreply.github.com>

---------

Signed-off-by: Noir <63553175+Noir01@users.noreply.github.com>
Signed-off-by: Aniruddh <63553175+Noir01@users.noreply.github.com>
Signed-off-by: Aniruddh Srivastava <aniruddh@purdue.edu>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Added Slack webhook URL validation regex

Signed-off-by: Aniruddh Srivastava <aniruddh@purdue.edu>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Replaced wrongly formatted dummy Slack URL with properly formatted dummy Slack URL

Signed-off-by: Aniruddh Srivastava <ansriv2005@gmail.com>
Signed-off-by: Aniruddh Srivastava <aniruddh@purdue.edu>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Replaced more wrongly formatted dummy Slack URL with properly formatted dummy Slack URL

Signed-off-by: Aniruddh Srivastava <aniruddh@purdue.edu>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Replaced even more wrongly formatted dummy Slack URL with properly formatted dummy Slack URL

Signed-off-by: Aniruddh Srivastava <aniruddh@purdue.edu>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Replace path of mock Slack URL with `sample_slack_url`

Signed-off-by: Aniruddh <aniruddh@purdue.edu>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Remove slackId from domainIds

Signed-off-by: Aniruddh <aniruddh@purdue.edu>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Replace wrongly formatted dummy Slack URL with properly formatted dummy Slack URL

Signed-off-by: Aniruddh <aniruddh@purdue.edu>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Add tests for wrong Slack URLs

Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Add validation tests for Slack URL

Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Format

Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* GovSlack apps can use the slack-gov.com domain

Signed-off-by: Aniruddh <ansriv2005@gmail.com>

* Add validation for gov-slack.com domain

Signed-off-by: Aniruddh <ansriv2005@gmail.com>

---------

Signed-off-by: danielkyalo599 <johbiento@gmail.com>
Signed-off-by: zhichao-aws <zhichaog@amazon.com>
Signed-off-by: Aniruddh <ansriv2005@gmail.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Aniruddh Srivastava <aniruddh@purdue.edu>
Signed-off-by: Aniruddh <63553175+Noir01@users.noreply.github.com>
Signed-off-by: rdani <rachana_sudhindradani@intuit.com>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Noir <63553175+Noir01@users.noreply.github.com>
Signed-off-by: Aniruddh Srivastava <ansriv2005@gmail.com>
Signed-off-by: Aniruddh <aniruddh@purdue.edu>
Co-authored-by: zhichao-aws <zhichaog@amazon.com>
Co-authored-by: danielkyalo599 <johbiento@gmail.com>
Co-authored-by: Hailong Cui <ihailong@amazon.com>
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Co-authored-by: Yuye Zhu <yuyezhu@amazon.com>
Co-authored-by: gaobinlong <gbinlong@amazon.com>
Co-authored-by: Rachana Dani <36135368+rachana-dani@users.noreply.github.com>
Co-authored-by: rdani <rachana_sudhindradani@intuit.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 87109a0)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@amsiglan amsiglan merged commit 8203ad6 into 2.10 Aug 23, 2024
17 of 22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants