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 google-auth-library-oauth2-http from 1.7.0 to 1.29.0 in /plugins/repository-gcs #16520

Merged
merged 9 commits into from
Nov 14, 2024

Conversation

gaobinlong
Copy link
Collaborator

Description

google-auth-library-oauth2-http needs to be upgraded to 1.29.0 because the new version of com.google.cloud:google-cloud-core-http has a test dependency on it.

Related Issues

No issue.

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.

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
Signed-off-by: Gao Binlong <gbinlong@amazon.com>
@gaobinlong gaobinlong added the backport 2.x Backport to 2.x branch label Oct 30, 2024
Copy link
Contributor

❌ Gradle check result for baef6b5: 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?

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

❌ Gradle check result for 472d53d: 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

❌ Gradle check result for 472d53d: 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

❌ Gradle check result for 00c7cf9: 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?

@reta
Copy link
Collaborator

reta commented Oct 30, 2024

Sure, but that PR happens in the discover-gce plugin, this PR happens in repository-gcs, so may not conflict?

Yes and no :) It seems like we are dealing with the same dependencies but plugins are different and versions are a bit messy, if you could help unify those, would be great (if it makes sense for sure). Thanks a lot!

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
Copy link
Contributor

❌ Gradle check result for b773a8b: 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

❌ Gradle check result for b773a8b: 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

❌ Gradle check result for b773a8b: 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?

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
Copy link
Contributor

❌ Gradle check result for 0195c1d: 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?

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
Copy link
Contributor

❌ Gradle check result for 216eebe: 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

❌ Gradle check result for 216eebe: 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

❌ Gradle check result for 216eebe: 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 Nov 1, 2024

✅ Gradle check result for 4bf2d4b: SUCCESS

Copy link

codecov bot commented Nov 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.05%. Comparing base (0363aa7) to head (107347e).
Report is 25 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #16520      +/-   ##
============================================
+ Coverage     72.00%   72.05%   +0.04%     
- Complexity    65038    65062      +24     
============================================
  Files          5313     5313              
  Lines        303454   303454              
  Branches      43910    43910              
============================================
+ Hits         218510   218648     +138     
+ Misses        67040    66901     -139     
- Partials      17904    17905       +1     

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

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
Copy link
Contributor

github-actions bot commented Nov 1, 2024

✅ Gradle check result for 107347e: SUCCESS

@gaobinlong gaobinlong merged commit 3f18562 into opensearch-project:main Nov 14, 2024
37 of 40 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x 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.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-16520-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3f18562974612ceb36b66c773b6b8eb6d4dfc0b0
# Push it to GitHub
git push --set-upstream origin backport/backport-16520-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

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

gaobinlong added a commit to gaobinlong/OpenSearch that referenced this pull request Nov 14, 2024
…/repository-gcs (opensearch-project#16520)

* Bump  from 1.7.0 to 1.29.0 in /plugins/repository-gcs

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

* Add change log

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

* move version to top-level file

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

* Fix build failure

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

* Fix test failure

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

* Revert some change

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

---------

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
gaobinlong added a commit to gaobinlong/OpenSearch that referenced this pull request Nov 14, 2024
…/repository-gcs (opensearch-project#16520)

* Bump  from 1.7.0 to 1.29.0 in /plugins/repository-gcs

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

* Add change log

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

* move version to top-level file

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

* Fix build failure

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

* Fix test failure

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

* Revert some change

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

---------

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
reta pushed a commit that referenced this pull request Nov 14, 2024
…/repository-gcs (#16520) (#16638)

* Bump  from 1.7.0 to 1.29.0 in /plugins/repository-gcs



* Add change log



* move version to top-level file



* Fix build failure



* Fix test failure



* Revert some change



---------

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch backport-failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants