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 com.google.api-client:google-api-client from 1.34.0 to 2.2.0 in /plugins/repository-gcs #8276

Merged
merged 2 commits into from
Jun 28, 2023

Conversation

Xtansia
Copy link
Contributor

@Xtansia Xtansia commented Jun 27, 2023

Description

Updates the com.google.api-client:google-api-client and the com.google.apis:google-api-services-storage dependencies.

Related Issues

Supersedes #8008

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
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

@Xtansia Xtansia force-pushed the update/google-api-client branch from 7d23cf4 to 72717e4 Compare June 27, 2023 00:44
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.indices.replication.SegmentReplicationTargetServiceTests.testStartReplicationListenerSuccess

@codecov
Copy link

codecov bot commented Jun 27, 2023

Codecov Report

Merging #8276 (831dbfb) into main (317dd03) will decrease coverage by 0.03%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #8276      +/-   ##
============================================
- Coverage     70.85%   70.83%   -0.03%     
+ Complexity    56719    56689      -30     
============================================
  Files          4733     4733              
  Lines        268336   268336              
  Branches      39322    39322              
============================================
- Hits         190139   190066      -73     
- Misses        62146    62237      +91     
+ Partials      16051    16033      -18     

see 440 files with indirect coverage changes

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.cluster.allocation.AwarenessAllocationIT.testThreeZoneOneReplicaWithForceZoneValueAndLoadAwareness

@Xtansia Xtansia marked this pull request as ready for review June 27, 2023 03:33
@Xtansia Xtansia added dependencies Pull requests that update a dependency file backport 2.x Backport to 2.x branch labels Jun 27, 2023
Xtansia added 2 commits June 27, 2023 21:46
…/plugins/repository-gcs

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Signed-off-by: Thomas <tsfarr@amazon.com>
@Xtansia Xtansia force-pushed the update/google-api-client branch from 72717e4 to 831dbfb Compare June 27, 2023 21:46
@Xtansia
Copy link
Contributor Author

Xtansia commented Jun 27, 2023

@reta Have updated those additional packages

@Xtansia
Copy link
Contributor Author

Xtansia commented Jun 27, 2023

The com.google.cloud deps can also be updated, but require more work due to changes in behaviour of client, so would do them separately

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      2 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testNodeDropWithOngoingReplication
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testDropPrimaryDuringReplication

@dblock dblock merged commit 74788c3 into opensearch-project:main Jun 28, 2023
@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:

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

@Xtansia Xtansia deleted the update/google-api-client branch June 28, 2023 22:48
Xtansia added a commit to Xtansia/OpenSearch that referenced this pull request Jun 28, 2023
…/plugins/repository-gcs (opensearch-project#8276)

* Bump com.google.api-client:google-api-client from 1.34.0 to 2.2.0 in /plugins/repository-gcs

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Bump google-http-client and google-oauth-client

Signed-off-by: Thomas <tsfarr@amazon.com>

---------

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Signed-off-by: Thomas <tsfarr@amazon.com>
(cherry picked from commit 74788c3)
@dblock
Copy link
Member

dblock commented Jun 28, 2023

@Xtansia needs a manual backport, please

reta pushed a commit that referenced this pull request Jun 29, 2023
…/plugins/repository-gcs (#8276) (#8328)

* Bump com.google.api-client:google-api-client from 1.34.0 to 2.2.0 in /plugins/repository-gcs

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Bump google-http-client and google-oauth-client

Signed-off-by: Thomas <tsfarr@amazon.com>

---------

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Signed-off-by: Thomas <tsfarr@amazon.com>
(cherry picked from commit 74788c3)
baba-devv pushed a commit to baba-devv/OpenSearch that referenced this pull request Jul 29, 2023
…/plugins/repository-gcs (opensearch-project#8276)

* Bump com.google.api-client:google-api-client from 1.34.0 to 2.2.0 in /plugins/repository-gcs

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Bump google-http-client and google-oauth-client

Signed-off-by: Thomas <tsfarr@amazon.com>

---------

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Signed-off-by: Thomas <tsfarr@amazon.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…/plugins/repository-gcs (opensearch-project#8276)

* Bump com.google.api-client:google-api-client from 1.34.0 to 2.2.0 in /plugins/repository-gcs

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Bump google-http-client and google-oauth-client

Signed-off-by: Thomas <tsfarr@amazon.com>

---------

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Signed-off-by: Thomas <tsfarr@amazon.com>
Signed-off-by: Shivansh Arora <hishiv@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 dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants