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.

Sign up for GitHub

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

Jump to bottom

Make 1.1 branch at par with the main branch #65

Closed
wants to merge 18 commits into from
Closed

Make 1.1 branch at par with the main branch #65

wants to merge 18 commits into from

Conversation

adityaj1107
Copy link
Contributor

@adityaj1107 adityaj1107 commented Sep 9, 2021 •
edited
Loading

Description

Merges commits from the main branch to the 1.1 branch.

Issues Resolved

#64

Build Suceeded

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

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.

adityaj1107 and others added 16 commits July 1, 2021 17:47
@adityaj1107
Update Release Notes for GA (#36)
d27d52c 
* Update Release Notes for GA

* Update Release Notes for GA include RC1 Changes as well.

Signed-off-by: Aditya Jindal <[email protected]>
@zhongnansu
add method type in CustomWebhook data model (#39)
62de872 
Signed-off-by: Zhongnan Su <[email protected]>
@dai-chen @joshuali925
Fix class loader issue for notifications response (#40)
4ef189d 
* Fix class loader issue for notifications

Signed-off-by: Joshua Li <[email protected]>

* Fix formatting

Signed-off-by: Joshua Li <[email protected]>

* Refactor creation of action listener object

Signed-off-by: Joshua Li <[email protected]>

* Fix indentation

Signed-off-by: Joshua Li <[email protected]>

* Remove unused suppresses

Signed-off-by: Joshua Li <[email protected]>

* Add UT for notification API

Signed-off-by: Chen Dai <[email protected]>

* Add UT for notification API

Signed-off-by: Chen Dai <[email protected]>

* Add UT for send notification API

Signed-off-by: Chen Dai <[email protected]>

* Fix Github workflow failure

Signed-off-by: Chen Dai <[email protected]>

* Fix Github workflow failure

Signed-off-by: Chen Dai <[email protected]>

* Refactor UT code

Signed-off-by: Chen Dai <[email protected]>

Co-authored-by: Joshua Li <[email protected]>
@zhongnansu
remove restrictions on webhook url protocols to also include http (#43)
0af72bf
@saratvemulapalli
Bumping common-utils to build with OpenSearch(main) 1.1.0 (#48)
bf2bfb3 
Signed-off-by: Sarat Vemulapalli <[email protected]>
@thalurur
Adding an utility method that allows consumers to set custom thread c…
28e688b 
…ontext property in InjectSecurity class (#47)

Signed-off-by: Ravi Thaluru <[email protected]>
@joshuali925
Add Notifications SNS model (#50)
b18a489
@akbhatta
Added support for SesAccount (#54)
d79c53d 
Also updated Feature to be simple string for future plugin easy addition

[Tests]
Added unit tests for SesAccount
Updated Unit tests for changes

Signed-off-by: @akbhatta
@dbbaughe
Adds legacy chime, slack, custom webhook messages, request/response f (…
4b1c21c 
…#53)

* Adds legacy chime, slack, custom webhook messages, request/response for publishing legacy notifications, and method for executing transport action

Signed-off-by: Drew Baugher <[email protected]>

* Fixes import and removes username/password that is not used by ISM

Signed-off-by: Drew Baugher <[email protected]>

* Throws error for toXContent for legacy notification response

Signed-off-by: Drew Baugher <[email protected]>

* Renames legacy destination types to have legacy prefix

Signed-off-by: Drew Baugher <[email protected]>

* Obfuscates message to remove from logs in toString method

Signed-off-by: Drew Baugher <[email protected]>

* Makes destinationt type private and updates places to use getter

Signed-off-by: Drew Baugher <[email protected]>

* Inlines destination type

Signed-off-by: Drew Baugher <[email protected]>

* Makes base message content final

Signed-off-by: Drew Baugher <[email protected]>

* Requires url to be defined in LegacyCustomWebhookMessage for use across transport wire and only writes the full url instead of each individual part

Signed-off-by: Drew Baugher <[email protected]>
@VachaShah
Using 1.1 snapshot version for OpenSearch (#57)
401802d 
Signed-off-by: Vacha <[email protected]>
Add themed logo to README (#41)
4f30425 
Signed-off-by: Miki <[email protected]>
@dblock
Build snapshot build by default with the same version as OpenSearch. (#…
cc02f23 
…58)

Signed-off-by: dblock <[email protected]>
@akbhatta
BugFix: Allow null values for role_arn in json parsing (#60)
3913d70 
Signed-off-by: @akbhatta
@adityaj1107 @zhongnansu
@dai-chen @joshuali925
Merge changes in the main branch to the 1.x branch. (#42)
8ad9d4c 
* Update Release Notes for GA (#36)

* Update Release Notes for GA

* Update Release Notes for GA include RC1 Changes as well.

Signed-off-by: Aditya Jindal <[email protected]>

* add method type in CustomWebhook data model (#39)

Signed-off-by: Zhongnan Su <[email protected]>

* Fix class loader issue for notifications response (#40)

* Fix class loader issue for notifications

Signed-off-by: Joshua Li <[email protected]>

* Fix formatting

Signed-off-by: Joshua Li <[email protected]>

* Refactor creation of action listener object

Signed-off-by: Joshua Li <[email protected]>

* Fix indentation

Signed-off-by: Joshua Li <[email protected]>

* Remove unused suppresses

Signed-off-by: Joshua Li <[email protected]>

* Add UT for notification API

Signed-off-by: Chen Dai <[email protected]>

* Add UT for notification API

Signed-off-by: Chen Dai <[email protected]>

* Add UT for send notification API

Signed-off-by: Chen Dai <[email protected]>

* Fix Github workflow failure

Signed-off-by: Chen Dai <[email protected]>

* Fix Github workflow failure

Signed-off-by: Chen Dai <[email protected]>

* Refactor UT code

Signed-off-by: Chen Dai <[email protected]>

Co-authored-by: Joshua Li <[email protected]>

Co-authored-by: Zhongnan Su <[email protected]>
Co-authored-by: Chen Dai <[email protected]>
Co-authored-by: Joshua Li <[email protected]>
@saratvemulapalli
[1.x] Bumping common-utils to build with OpenSearch(1.x) 1.1.0 (#52)
9f4faa6 
* Bumping common-utils to build with OpenSearch(main) 1.1.0 (#48)

Signed-off-by: Sarat Vemulapalli <[email protected]>

* Updating 1.x to work with OpenSearch 1.x

Signed-off-by: Sarat Vemulapalli <[email protected]>
@adityaj1107
Merge branch '1.1' into 1.1
935a9f1
@adityaj1107 adityaj1107 changed the title Merge commits in the main branch to 1.1 for the bundle build Make 1.1 branch at par with the main branch Sep 9, 2021
@adityaj1107 adityaj1107 marked this pull request as draft September 9, 2021 19:09
@adityaj1107 adityaj1107 marked this pull request as ready for review September 9, 2021 19:57
@adityaj1107 adityaj1107 requested review from peternied and skkosuri-amzn and removed request for peternied September 9, 2021 19:58
@adityaj1107 adityaj1107 mentioned this pull request Sep 9, 2021
Merged
1 task
@adityaj1107
Copy link
Contributor Author

Marking this as a Draft PR as per offline conversation with @skkosuri-amzn

@adityaj1107 adityaj1107 marked this pull request as draft September 9, 2021 20:45
@adityaj1107 adityaj1107 marked this pull request as ready for review September 9, 2021 20:55
@adityaj1107 adityaj1107 requested a review from akbhatta September 9, 2021 20:56
@skkosuri-amzn
Copy link
Contributor

@akbhatta Could you pls review approve this merge from main to 1.x and 1.1.

This was referenced Sep 9, 2021
Closed
Merged
Closed
@adityaj1107 adityaj1107 marked this pull request as draft September 10, 2021 04:24
@peternied
Copy link
Member

Cannot approve with merge conflicts, but I can verify that #57 and #58 were merged which AFAIK are all that is required to fix the snapshot issues.

@dblock
Copy link
Member

dblock commented Sep 10, 2021

Cannot approve with merge conflicts, but I can verify that #57 and #58 were merged which AFAIK are all that is required to fix the snapshot issues.

We do want all changes from main in 1.1 I believe.

@skkosuri-amzn
Copy link
Contributor

We pulled only the build related changes from main. Notifications related changes are not pulled from main as that feature is not planned for 1.1 release. I see @aditjind merged #67 . We are good i guess, anything missing?

@dblock
Copy link
Member

dblock commented Sep 10, 2021

We pulled only the build related changes from main. Notifications related changes are not pulled from main as that feature is not planned for 1.1 release. I see @aditjind merged #67 . We are good i guess, anything missing?

Got it. Thanks.

@dblock
Copy link
Member

dblock commented Sep 10, 2021

So should this be closed without merging?

@skkosuri-amzn
Copy link
Contributor

So should this be closed without merging?

Yes. @aditjind could you please close this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skkosuri-amzn skkosuri-amzn skkosuri-amzn approved these changes

@akbhatta akbhatta Awaiting requested review from akbhatta

Assignees

@adityaj1107 adityaj1107

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.