Bump google-auth-library-oauth2-http from 1.7.0 to 1.29.0 in /plugins…

…/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 <[email protected]> Signed-off-by: gaobinlong <[email protected]>
opensearch-project · Nov 14, 2024 · 149fa03 · 149fa03
1 parent dd3020c
commit 149fa03
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add new configuration setting `synonym_analyzer`, to the `synonym` and `synonym_graph` filters, enabling the specification of a custom analyzer for reading the synonym file ([#16488](https://github.com/opensearch-project/OpenSearch/pull/16488)).
 
 ### Dependencies
+- Bump `google-auth-library-oauth2-http` from 1.7.0 to 1.29.0 in /plugins/repository-gcs ([#16520](https://github.com/opensearch-project/OpenSearch/pull/16520))
+- Bump `com.azure:azure-storage-common` from 12.25.1 to 12.27.1 ([#16521](https://github.com/opensearch-project/OpenSearch/pull/16521))
 - Bump `com.google.apis:google-api-services-compute` from v1-rev20240407-2.0.0 to v1-rev20241021-2.0.0 ([#16502](https://github.com/opensearch-project/OpenSearch/pull/16502), [#16548](https://github.com/opensearch-project/OpenSearch/pull/16548))
 - Bump `com.azure:azure-storage-common` from 12.25.1 to 12.27.1 ([#16521](https://github.com/opensearch-project/OpenSearch/pull/16521))
 - Bump `com.azure:azure-storage-blob` from 12.23.0 to 12.28.1 ([#16501](https://github.com/opensearch-project/OpenSearch/pull/16501))

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -24,6 +24,7 @@ guava             = "32.1.1-jre"
 protobuf          = "3.25.5"
 jakarta_annotation = "1.3.5"
 google_http_client = "1.44.1"
+google_auth       = "1.29.0"
 tdigest           = "3.2"
 hdrhistogram      = "2.2.2"
 grpc              = "1.68.0"

diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle
@@ -47,10 +47,6 @@ opensearchplugin {
   classname 'org.opensearch.repositories.gcs.GoogleCloudStoragePlugin'
 }
 
-versions << [
-  'google_auth': '1.7.0'
-]
-
 dependencies {
   api 'com.google.api:api-common:1.8.1'
   api 'com.google.api:gax:2.27.0'
@@ -300,6 +296,13 @@ testClusters {
   all testClustersConfiguration
 }
 
+/**
+ * Used for testing getting credentials from GCE
+ */
+test {
+  environment 'NO_GCE_CHECK', 'true'
+}
+
 /*
  * We only use a small amount of data in these tests, which means that the resumable upload path is not tested. We add
  * an additional test that forces the large blob threshold to be small to exercise the resumable upload path.

diff --git a/plugins/repository-gcs/licenses/google-auth-library-credentials-1.29.0.jar.sha1 b/plugins/repository-gcs/licenses/google-auth-library-credentials-1.29.0.jar.sha1
@@ -0,0 +1 @@
+19af4907301816d9328c1eb1fcc6dd05c8a0b544
diff --git a/plugins/repository-gcs/licenses/google-auth-library-credentials-1.7.0.jar.sha1 b/plugins/repository-gcs/licenses/google-auth-library-credentials-1.7.0.jar.sha1
diff --git a/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.29.0.jar.sha1 b/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.29.0.jar.sha1
@@ -0,0 +1 @@
+2a42aead6cdc5d2cd22cdda1b9d7922e6135240f
diff --git a/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.7.0.jar.sha1 b/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.7.0.jar.sha1
diff --git a/...ory-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageServiceTests.java b/...ory-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageServiceTests.java
@@ -242,7 +242,7 @@ public void testApplicationDefaultCredentialsWhenNoSettingProvided() throws Exce
         Exception exception = assertThrows(IOException.class, GoogleCredentials::getApplicationDefault);
         assertNotNull(storageOptions);
         assertNull(storageOptions.getCredentials());
-        MatcherAssert.assertThat(exception.getMessage(), containsString("The Application Default Credentials are not available"));
+        MatcherAssert.assertThat(exception.getMessage(), containsString("Your default credentials were not found"));
     }
 
     /**
@@ -254,7 +254,7 @@ public void testDefaultCredentialsThrowsExceptionWithoutGCStorageService() {
         GoogleCredentials credentials = googleApplicationDefaultCredentials.get();
         assertNull(credentials);
         Exception exception = assertThrows(IOException.class, GoogleCredentials::getApplicationDefault);
-        MatcherAssert.assertThat(exception.getMessage(), containsString("The Application Default Credentials are not available"));
+        MatcherAssert.assertThat(exception.getMessage(), containsString("Your default credentials were not found"));
     }
 
     /**