Make 1.1 branch at par with the main branch by adityaj1107 · Pull Request #65 · opensearch-project/common-utils

adityaj1107 · 2021-09-09T18:55:56Z

Description

Merges commits from the main branch to the 1.1 branch.

Issues Resolved

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.

* Update Release Notes for GA * Update Release Notes for GA include RC1 Changes as well. Signed-off-by: Aditya Jindal <aditjind@amazon.com>

Signed-off-by: Zhongnan Su <szhongna@amazon.com>

* Fix class loader issue for notifications Signed-off-by: Joshua Li <joshuali925@gmail.com> * Fix formatting Signed-off-by: Joshua Li <joshuali925@gmail.com> * Refactor creation of action listener object Signed-off-by: Joshua Li <joshuali925@gmail.com> * Fix indentation Signed-off-by: Joshua Li <joshuali925@gmail.com> * Remove unused suppresses Signed-off-by: Joshua Li <joshuali925@gmail.com> * Add UT for notification API Signed-off-by: Chen Dai <daichen@amazon.com> * Add UT for notification API Signed-off-by: Chen Dai <daichen@amazon.com> * Add UT for send notification API Signed-off-by: Chen Dai <daichen@amazon.com> * Fix Github workflow failure Signed-off-by: Chen Dai <daichen@amazon.com> * Fix Github workflow failure Signed-off-by: Chen Dai <daichen@amazon.com> * Refactor UT code Signed-off-by: Chen Dai <daichen@amazon.com> Co-authored-by: Joshua Li <joshuali925@gmail.com>

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>

…ontext property in InjectSecurity class (#47) Signed-off-by: Ravi Thaluru <ravi1092@gmail.com>

@akbhatta

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

…#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 <46505179+dbbaughe@users.noreply.github.com> * Fixes import and removes username/password that is not used by ISM Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com> * Throws error for toXContent for legacy notification response Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com> * Renames legacy destination types to have legacy prefix Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com> * Obfuscates message to remove from logs in toString method Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com> * Makes destinationt type private and updates places to use getter Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com> * Inlines destination type Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com> * Makes base message content final Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com> * 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 <46505179+dbbaughe@users.noreply.github.com>

Signed-off-by: Vacha <vachshah@amazon.com>

Signed-off-by: Miki <mehranb@amazon.com>

…58) Signed-off-by: dblock <dblock@amazon.com>

@akbhatta

Signed-off-by: @akbhatta

* 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 <aditjind@amazon.com> * add method type in CustomWebhook data model (#39) Signed-off-by: Zhongnan Su <szhongna@amazon.com> * Fix class loader issue for notifications response (#40) * Fix class loader issue for notifications Signed-off-by: Joshua Li <joshuali925@gmail.com> * Fix formatting Signed-off-by: Joshua Li <joshuali925@gmail.com> * Refactor creation of action listener object Signed-off-by: Joshua Li <joshuali925@gmail.com> * Fix indentation Signed-off-by: Joshua Li <joshuali925@gmail.com> * Remove unused suppresses Signed-off-by: Joshua Li <joshuali925@gmail.com> * Add UT for notification API Signed-off-by: Chen Dai <daichen@amazon.com> * Add UT for notification API Signed-off-by: Chen Dai <daichen@amazon.com> * Add UT for send notification API Signed-off-by: Chen Dai <daichen@amazon.com> * Fix Github workflow failure Signed-off-by: Chen Dai <daichen@amazon.com> * Fix Github workflow failure Signed-off-by: Chen Dai <daichen@amazon.com> * Refactor UT code Signed-off-by: Chen Dai <daichen@amazon.com> Co-authored-by: Joshua Li <joshuali925@gmail.com> Co-authored-by: Zhongnan Su <szhongna@amazon.com> Co-authored-by: Chen Dai <46505291+dai-chen@users.noreply.github.com> Co-authored-by: Joshua Li <joshuali925@gmail.com>

* Bumping common-utils to build with OpenSearch(main) 1.1.0 (#48) Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com> * Updating 1.x to work with OpenSearch 1.x Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>

adityaj1107 · 2021-09-09T20:45:03Z

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

skkosuri-amzn · 2021-09-09T20:57:32Z

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

peternied · 2021-09-10T14:57:07Z

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 · 2021-09-10T15:07:13Z

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 · 2021-09-10T15:45:16Z

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 · 2021-09-10T16:25:18Z

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 · 2021-09-10T16:25:56Z

So should this be closed without merging?

skkosuri-amzn · 2021-09-10T16:27:37Z

So should this be closed without merging?

Yes. @aditjind could you please close this.

adityaj1107 and others added 16 commits July 1, 2021 17:47

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

add method type in CustomWebhook data model (#39)

62de872

Signed-off-by: Zhongnan Su <szhongna@amazon.com>

remove restrictions on webhook url protocols to also include http (#43)

0af72bf

Bumping common-utils to build with OpenSearch(main) 1.1.0 (#48)

bf2bfb3

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>

Adding an utility method that allows consumers to set custom thread c…

28e688b

…ontext property in InjectSecurity class (#47) Signed-off-by: Ravi Thaluru <ravi1092@gmail.com>

Add Notifications SNS model (#50)

b18a489

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

Using 1.1 snapshot version for OpenSearch (#57)

401802d

Signed-off-by: Vacha <vachshah@amazon.com>

Add themed logo to README (#41)

4f30425

Signed-off-by: Miki <mehranb@amazon.com>

Build snapshot build by default with the same version as OpenSearch. (#…

cc02f23

…58) Signed-off-by: dblock <dblock@amazon.com>

BugFix: Allow null values for role_arn in json parsing (#60)

3913d70

Signed-off-by: @akbhatta

Merge branch '1.1' into 1.1

935a9f1

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 marked this pull request as draft September 9, 2021 19:09

adityaj1107 added 2 commits September 9, 2021 12:37

Removing Unused Imports

7e4bf96

Remove Unused Imports

c2b209d

adityaj1107 assigned adityaj1107 and unassigned adityaj1107 Sep 9, 2021

adityaj1107 marked this pull request as ready for review September 9, 2021 19:57

adityaj1107 requested review from peternied and skkosuri-amzn and removed request for peternied September 9, 2021 19:58

adityaj1107 mentioned this pull request Sep 9, 2021

Use common-utils 1.1 branch for OpenSearch 1.1 opensearch-project/opensearch-build#430

Merged

1 task

adityaj1107 marked this pull request as draft September 9, 2021 20:45

adityaj1107 marked this pull request as ready for review September 9, 2021 20:55

adityaj1107 requested a review from akbhatta September 9, 2021 20:56

skkosuri-amzn approved these changes Sep 9, 2021

View reviewed changes

This was referenced Sep 9, 2021

Add Commits related to Snapshot build of Common Utils on 1.1 #66

Closed

Add Commits related to Snapshot build of Common Utils on 1.1 #67

Merged

Update branch of OpenSearch from 1.x to 1.1 #68

Closed

adityaj1107 marked this pull request as draft September 10, 2021 04:24

adityaj1107 closed this Sep 10, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make 1.1 branch at par with the main branch#65

Make 1.1 branch at par with the main branch#65
adityaj1107 wants to merge 18 commits intoopensearch-project:1.1from
adityaj1107:1.1

adityaj1107 commented Sep 9, 2021 •

edited

Loading

Uh oh!

adityaj1107 commented Sep 9, 2021

Uh oh!

skkosuri-amzn commented Sep 9, 2021

Uh oh!

peternied commented Sep 10, 2021

Uh oh!

dblock commented Sep 10, 2021

Uh oh!

skkosuri-amzn commented Sep 10, 2021

Uh oh!

dblock commented Sep 10, 2021

Uh oh!

dblock commented Sep 10, 2021

Uh oh!

skkosuri-amzn commented Sep 10, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

Conversation

adityaj1107 commented Sep 9, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Issues Resolved

Check List

Uh oh!

adityaj1107 commented Sep 9, 2021

Uh oh!

skkosuri-amzn commented Sep 9, 2021

Uh oh!

peternied commented Sep 10, 2021

Uh oh!

dblock commented Sep 10, 2021

Uh oh!

skkosuri-amzn commented Sep 10, 2021

Uh oh!

dblock commented Sep 10, 2021

Uh oh!

dblock commented Sep 10, 2021

Uh oh!

skkosuri-amzn commented Sep 10, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

adityaj1107 commented Sep 9, 2021 •

edited

Loading