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

Update google dependencies in repository-gcs and discovery-gce #13213

Merged

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Apr 16, 2024

Description

Updates various google related dependencies:

  1. Update all instances of google_http_client to 1.44.1
  2. com.google.apis:google-api-services-compute from v1-rev160-1.23.0 to v1-rev235-1.25.0
  3. com.google.api-client:google-api-client from 1.23.0 to 1.35.2

Related Issues

Discovered outdated dependencies while cleaning up the CHANGELOG for 3.0.

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • Public documentation issue/PR created

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: Craig Perkins <[email protected]>
Copy link
Contributor

❌ Gradle check result for 1cd9662: 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 94f672e: 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 Apr 16, 2024

Compatibility status:

Checks if related components are compatible with change 55de801

Incompatible components

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/flow-framework.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/performance-analyzer.git]

@cwperks cwperks added the backport 2.x Backport to 2.x branch label Apr 16, 2024
Copy link
Contributor

❌ Gradle check result for 7f469fa:

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?

@cwperks
Copy link
Member Author

cwperks commented Apr 16, 2024

Tests with failures:

  • org.opensearch.index.engine.NRTReplicationEngineTests.testGetSegmentInfosSnapshotPreservesFilesUntilRelease

Copy link
Contributor

✅ Gradle check result for 55de801: SUCCESS

Copy link
Contributor

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

@dblock
Copy link
Member

dblock commented Apr 17, 2024

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

org.opensearch.action.support.clustermanager.TransportClusterManagerNodeActionTests.testDontAllowSwitchingCompatibilityModeForClusterWithMultipleVersions

#13240

Copy link
Contributor

✅ Gradle check result for c7e5ee0: SUCCESS

Copy link

codecov bot commented Apr 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.42%. Comparing base (b15cb0c) to head (c7e5ee0).
Report is 187 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff             @@
##               main   #13213     +/-   ##
===========================================
  Coverage     71.42%   71.42%             
- Complexity    59978    60682    +704     
===========================================
  Files          4985     5040     +55     
  Lines        282275   285410   +3135     
  Branches      40946    41334    +388     
===========================================
+ Hits         201603   203846   +2243     
- Misses        63999    64730    +731     
- Partials      16673    16834    +161     

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

@dblock dblock merged commit c1d5d76 into opensearch-project:main Apr 17, 2024
32 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-13213-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c1d5d76006c64d806a06a3ac4c0dfc962fc13d54
# Push it to GitHub
git push --set-upstream origin backport/backport-13213-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-13213-to-2.x.

@dblock
Copy link
Member

dblock commented Apr 17, 2024

@cwperks will need a manual backport please

cwperks added a commit to cwperks/OpenSearch that referenced this pull request Apr 17, 2024
…earch-project#13213)

* Update google dependencies in repository-gcs and discovery-gce

Signed-off-by: Craig Perkins <[email protected]>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <[email protected]>

* Fix test errors and mimic repository-gcs

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit c1d5d76)
@cwperks
Copy link
Member Author

cwperks commented Apr 17, 2024

@dblock Here's the backport PR: #13271

dblock pushed a commit that referenced this pull request Apr 17, 2024
…very-gce (#13271)

* Update google dependencies in repository-gcs and discovery-gce (#13213)

* Update google dependencies in repository-gcs and discovery-gce

Signed-off-by: Craig Perkins <[email protected]>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <[email protected]>

* Fix test errors and mimic repository-gcs

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit c1d5d76)

* Remove unused sha files

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
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.

3 participants