Skip to content

Commit be28b83

Browse files
committed
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 77231fb commit be28b83

8 files changed

Lines changed: 15 additions & 9 deletions

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1616
- 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)).
1717

1818
### Dependencies
19+
- 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))
20+
- Bump `com.azure:azure-storage-common` from 12.25.1 to 12.27.1 ([#16521](https://github.com/opensearch-project/OpenSearch/pull/16521))
1921
- 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))
2022
- Bump `com.azure:azure-storage-common` from 12.25.1 to 12.27.1 ([#16521](https://github.com/opensearch-project/OpenSearch/pull/16521))
2123
- 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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ guava = "32.1.1-jre"
2424
protobuf = "3.25.5"
2525
jakarta_annotation = "1.3.5"
2626
google_http_client = "1.44.1"
27-
tdigest = "3.2"
27+
google_auth = "1.29.0"
28+
tdigest = "3.3"
2829
hdrhistogram = "2.2.2"
2930
grpc = "1.68.0"
3031

plugins/repository-gcs/build.gradle

Lines changed: 7 additions & 4 deletions
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.27.0'
@@ -300,6 +296,13 @@ testClusters {
300296
all testClustersConfiguration
301297
}
302298
299+
/**
300+
* Used for testing getting credentials from GCE
301+
*/
302+
test {
303+
environment 'NO_GCE_CHECK', 'true'
304+
}
305+
303306
/*
304307
* We only use a small amount of data in these tests, which means that the resumable upload path is not tested. We add
305308
* an additional test that forces the large blob threshold to be small to exercise the resumable upload path.
Lines changed: 1 addition & 0 deletions
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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
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

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
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)