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

Fix after core #8157 #486

Merged
merged 3 commits into from
Jul 13, 2023

Conversation

bowenlan-amzn
Copy link
Member

@bowenlan-amzn bowenlan-amzn commented Jul 13, 2023

Description

opensearch-project/OpenSearch#8157

Issues Resolved

[List any issues this PR will resolve]

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.

Signed-off-by: bowenlan-amzn <[email protected]>
Signed-off-by: bowenlan-amzn <[email protected]>
Signed-off-by: bowenlan-amzn <[email protected]>
@codecov
Copy link

codecov bot commented Jul 13, 2023

Codecov Report

Merging #486 (9751fa9) into main (d21660f) will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##               main     #486      +/-   ##
============================================
+ Coverage     74.47%   74.48%   +0.01%     
+ Complexity      861      859       -2     
============================================
  Files           129      129              
  Lines          5598     5597       -1     
  Branches        684      684              
============================================
  Hits           4169     4169              
+ Misses         1125     1124       -1     
  Partials        304      304              
Impacted Files Coverage Δ
...n/java/org/opensearch/commons/ConfigConstants.java 87.50% <ø> (ø)
...ain/java/org/opensearch/commons/authuser/User.java 87.82% <ø> (ø)
...commons/destination/message/LegacyBaseMessage.java 67.44% <ø> (ø)
...ommons/destination/message/LegacyChimeMessage.java 89.47% <ø> (ø)
...estination/message/LegacyCustomWebhookMessage.java 74.68% <ø> (ø)
...ommons/destination/message/LegacyEmailMessage.java 89.47% <ø> (ø)
.../commons/destination/message/LegacySNSMessage.java 0.00% <ø> (ø)
...ommons/destination/message/LegacySlackMessage.java 85.71% <ø> (ø)
...mmons/destination/response/LegacyBaseResponse.java 100.00% <ø> (ø)
...estination/response/LegacyDestinationResponse.java 100.00% <ø> (ø)
... and 104 more

... and 1 file with indirect coverage changes

@AWSHurneyt AWSHurneyt merged commit 003071c into opensearch-project:main Jul 13, 2023
8 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-486-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 003071c50e5cf08f7489f4940e0f1e7092ade1d8
# Push it to GitHub
git push --set-upstream origin backport/backport-486-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-486-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.9 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.9 2.9
# Navigate to the new working tree
cd .worktrees/backport-2.9
# Create a new branch
git switch --create backport/backport-486-to-2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 003071c50e5cf08f7489f4940e0f1e7092ade1d8
# Push it to GitHub
git push --set-upstream origin backport/backport-486-to-2.9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.9

Then, create a pull request where the base branch is 2.9 and the compare/head branch is backport/backport-486-to-2.9.

@Hailong-am
Copy link
Contributor

Hailong-am commented Jul 21, 2023

core was backported to 2.x, opensearch-project/OpenSearch#8782, we need this backport to 2.x also. I do the manual backport for 2.x, #499

Hailong-am pushed a commit to Hailong-am/common-utils that referenced this pull request Jul 21, 2023
* Fix after core #8157

Signed-off-by: bowenlan-amzn <[email protected]>

* Fix ktlint issue

Signed-off-by: bowenlan-amzn <[email protected]>

* Fix spotless java check

Signed-off-by: bowenlan-amzn <[email protected]>

---------

Signed-off-by: bowenlan-amzn <[email protected]>
(cherry picked from commit 003071c)
Hailong-am pushed a commit to Hailong-am/common-utils that referenced this pull request Jul 21, 2023
* Fix after core #8157

Signed-off-by: bowenlan-amzn <[email protected]>

* Fix ktlint issue

Signed-off-by: bowenlan-amzn <[email protected]>

* Fix spotless java check

Signed-off-by: bowenlan-amzn <[email protected]>

---------

Signed-off-by: bowenlan-amzn <[email protected]>
(cherry picked from commit 003071c)
Signed-off-by: Hailong Cui <[email protected]>
bowenlan-amzn added a commit that referenced this pull request Jul 22, 2023
* Fix after core #8157



* Fix ktlint issue



* Fix spotless java check



---------


(cherry picked from commit 003071c)

Signed-off-by: bowenlan-amzn <[email protected]>
Signed-off-by: Hailong Cui <[email protected]>
Co-authored-by: bowenlan-amzn <[email protected]>
AWSHurneyt pushed a commit to AWSHurneyt/common-utils that referenced this pull request Apr 12, 2024
* Fix after core #8157



* Fix ktlint issue



* Fix spotless java check



---------


(cherry picked from commit 003071c)

Signed-off-by: bowenlan-amzn <[email protected]>
Signed-off-by: Hailong Cui <[email protected]>
Co-authored-by: bowenlan-amzn <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants