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

Bump software.amazon.awssdk from 2.20.86 to 2.30.31 #17396

Merged

Conversation

peterzhuamazon
Copy link
Member

@peterzhuamazon peterzhuamazon commented Feb 19, 2025

Description

Bump software.amazon.awssdk from 2.20.86 to 2.30.31

Related Issues

Follow up to #17320

Check List

  • [ ] Functionality includes testing.
  • [ ] API changes companion pull request created, if applicable.
  • [ ] Public documentation issue/PR created, if applicable.

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.

Copy link
Contributor

❌ Gradle check result for 5e94114: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@peterzhuamazon
Copy link
Member Author

peterzhuamazon commented Feb 19, 2025

Might be this, at 2.21.0, which is 1 minor higher than our previous 2.20.

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
@andrross andrross force-pushed the bump-aws-sdk-2.30.18 branch from e6e5066 to 342c74b Compare March 4, 2025 00:24
@peterzhuamazon peterzhuamazon changed the title Bump software.amazon.awssdk from 2.20.86 to 2.30.18 Bump software.amazon.awssdk from 2.20.86 to 2.30.31 Mar 4, 2025
Copy link
Contributor

github-actions bot commented Mar 4, 2025

❌ Gradle check result for 342c74b: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

github-actions bot commented Mar 4, 2025

✅ Gradle check result for 342c74b: SUCCESS

Copy link

codecov bot commented Mar 4, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.36%. Comparing base (0ffed5e) to head (342c74b).
Report is 33 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #17396      +/-   ##
============================================
- Coverage     72.42%   72.36%   -0.06%     
- Complexity    65611    65626      +15     
============================================
  Files          5304     5307       +3     
  Lines        304743   304692      -51     
  Branches      44189    44175      -14     
============================================
- Hits         220701   220489     -212     
- Misses        65888    66145     +257     
+ Partials      18154    18058      -96     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@peterzhuamazon peterzhuamazon marked this pull request as ready for review March 4, 2025 16:17
@peterzhuamazon
Copy link
Member Author

Thanks @andrross for the new bump.

@reta @andrross are we ready to approve and merge this?

Thanks.

@reta
Copy link
Collaborator

reta commented Mar 4, 2025

@reta @andrross are we ready to approve and merge this?

Thanks @peterzhuamazon , I am off this week, could get to it next week unless @andrross has time, thanks

@andrross
Copy link
Member

andrross commented Mar 5, 2025

I just did some quick manual sanity testing of the repository-s3 plugin with a real AWS endpoint, and this looks good to me.

@andrross andrross merged commit 09af518 into opensearch-project:main Mar 5, 2025
35 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Mar 5, 2025
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 09af518)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.19 failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.19 2.19
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.19
# Create a new branch
git switch --create backport/backport-17396-to-2.19
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 09af5184cc097d36d10ea2b418b17d4d252cb5de
# Push it to GitHub
git push --set-upstream origin backport/backport-17396-to-2.19
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.19

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

@peterzhuamazon peterzhuamazon deleted the bump-aws-sdk-2.30.18 branch March 5, 2025 01:38
mayanksharma27 pushed a commit to mayanksharma27/OpenSearch that referenced this pull request Mar 5, 2025
…ct#17396)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
@peterzhuamazon peterzhuamazon added backport 2.x Backport to 2.x branch and removed backport 2.x Backport to 2.x branch backport 2.19 labels Mar 11, 2025
opensearch-trigger-bot bot pushed a commit that referenced this pull request Mar 11, 2025
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 09af518)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
dbwiddis pushed a commit that referenced this pull request Mar 11, 2025
(cherry picked from commit 09af518)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

4 participants