Skip to content

Commit 1bfc253

Browse files
gaobinlongakolarkunnu
authored andcommitted
Bump google-auth-library-oauth2-http from 1.7.0 to 1.29.0 in /plugins/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>
1 parent 3ce4619 commit 1bfc253

8 files changed

+13
-9
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2121
- 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)).
2222

2323
### Dependencies
24+
- 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))
2425
- Bump `com.azure:azure-storage-common` from 12.25.1 to 12.27.1 ([#16521](https://github.com/opensearch-project/OpenSearch/pull/16521))
2526
- 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))
2627
- Bump `com.azure:azure-storage-blob` from 12.23.0 to 12.28.1 ([#16501](https://github.com/opensearch-project/OpenSearch/pull/16501))

gradle/libs.versions.toml

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ guava = "32.1.1-jre"
2424
protobuf = "3.25.5"
2525
jakarta_annotation = "1.3.5"
2626
google_http_client = "1.44.1"
27+
google_auth = "1.29.0"
2728
tdigest = "3.3"
2829
hdrhistogram = "2.2.2"
2930
grpc = "1.68.0"

plugins/repository-gcs/build.gradle

+7-5
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ opensearchplugin {
4747
classname 'org.opensearch.repositories.gcs.GoogleCloudStoragePlugin'
4848
}
4949

50-
versions << [
51-
'google_auth': '1.7.0'
52-
]
53-
5450
dependencies {
5551
api 'com.google.api:api-common:1.8.1'
5652
api 'com.google.api:gax:2.35.0'
@@ -148,7 +144,6 @@ thirdPartyAudit {
148144
'com.google.appengine.api.urlfetch.HTTPResponse',
149145
'com.google.appengine.api.urlfetch.URLFetchService',
150146
'com.google.appengine.api.urlfetch.URLFetchServiceFactory',
151-
'com.google.auth.oauth2.GdchCredentials',
152147
'com.google.protobuf.util.JsonFormat',
153148
'com.google.protobuf.util.JsonFormat$Parser',
154149
'com.google.protobuf.util.JsonFormat$Printer',
@@ -304,6 +299,13 @@ testClusters {
304299
all testClustersConfiguration
305300
}
306301
302+
/**
303+
* Used for testing getting credentials from GCE
304+
*/
305+
test {
306+
environment 'NO_GCE_CHECK', 'true'
307+
}
308+
307309
/*
308310
* We only use a small amount of data in these tests, which means that the resumable upload path is not tested. We add
309311
* an additional test that forces the large blob threshold to be small to exercise the resumable upload path.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
19af4907301816d9328c1eb1fcc6dd05c8a0b544

plugins/repository-gcs/licenses/google-auth-library-credentials-1.7.0.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2a42aead6cdc5d2cd22cdda1b9d7922e6135240f

plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.7.0.jar.sha1

-1
This file was deleted.

plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageServiceTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ public void testApplicationDefaultCredentialsWhenNoSettingProvided() throws Exce
242242
Exception exception = assertThrows(IOException.class, GoogleCredentials::getApplicationDefault);
243243
assertNotNull(storageOptions);
244244
assertNull(storageOptions.getCredentials());
245-
MatcherAssert.assertThat(exception.getMessage(), containsString("The Application Default Credentials are not available"));
245+
MatcherAssert.assertThat(exception.getMessage(), containsString("Your default credentials were not found"));
246246
}
247247

248248
/**
@@ -254,7 +254,7 @@ public void testDefaultCredentialsThrowsExceptionWithoutGCStorageService() {
254254
GoogleCredentials credentials = googleApplicationDefaultCredentials.get();
255255
assertNull(credentials);
256256
Exception exception = assertThrows(IOException.class, GoogleCredentials::getApplicationDefault);
257-
MatcherAssert.assertThat(exception.getMessage(), containsString("The Application Default Credentials are not available"));
257+
MatcherAssert.assertThat(exception.getMessage(), containsString("Your default credentials were not found"));
258258
}
259259

260260
/**

0 commit comments

Comments
 (0)