From 48cd820720b3d60f6aa386241ebd137ace701ffd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 May 2023 17:16:06 -0400 Subject: [PATCH] Bump com.azure:azure-core from 1.34.0 to 1.39.0 in /plugins/repository-azure (#7069) * Bump com.azure:azure-core in /plugins/repository-azure Bumps [com.azure:azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.34.0 to 1.38.0. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-core_1.34.0...azure-core_1.38.0) --- updated-dependencies: - dependency-name: com.azure:azure-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Updating SHAs Signed-off-by: dependabot[bot] * Update changelog Signed-off-by: dependabot[bot] Signed-off-by: Andriy Redko --------- Signed-off-by: dependabot[bot] Signed-off-by: Andriy Redko Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Signed-off-by: INDRAJIT BANERJEE --- CHANGELOG.md | 1 + plugins/repository-azure/build.gradle | 3 ++- plugins/repository-azure/licenses/azure-core-1.34.0.jar.sha1 | 1 - plugins/repository-azure/licenses/azure-core-1.39.0.jar.sha1 | 1 + plugins/repository-azure/licenses/azure-json-1.0.1.jar.sha1 | 1 + .../opensearch/repositories/azure/AzureStorageService.java | 2 +- .../repositories/azure/AzureBlobContainerRetriesTests.java | 4 ++++ 7 files changed, 10 insertions(+), 3 deletions(-) delete mode 100644 plugins/repository-azure/licenses/azure-core-1.34.0.jar.sha1 create mode 100644 plugins/repository-azure/licenses/azure-core-1.39.0.jar.sha1 create mode 100644 plugins/repository-azure/licenses/azure-json-1.0.1.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 18c613bd8c89f..9f533bdd0c6be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `org.apache.commons:commons-compress` from 1.22 to 1.23.0 - Bump `com.diffplug.spotless` from 6.17.0 to 6.18.0 - Bump `io.opencensus:opencensus-api` from 0.18.0 to 0.31.1 ([#7291](https://github.com/opensearch-project/OpenSearch/pull/7291)) +- Bump `com.azure:azure-core` from 1.34.0 to 1.39.0 ### Changed - [CCR] Add getHistoryOperationsFromTranslog method to fetch the history snapshot from translogs ([#3948](https://github.com/opensearch-project/OpenSearch/pull/3948)) diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index e1b5da966d670..033a78060fde9 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -44,7 +44,8 @@ opensearchplugin { } dependencies { - api 'com.azure:azure-core:1.34.0' + api 'com.azure:azure-core:1.39.0' + api 'com.azure:azure-json:1.0.1' api 'com.azure:azure-storage-common:12.20.0' api 'com.azure:azure-core-http-netty:1.12.8' api "io.netty:netty-codec-dns:${versions.netty}" diff --git a/plugins/repository-azure/licenses/azure-core-1.34.0.jar.sha1 b/plugins/repository-azure/licenses/azure-core-1.34.0.jar.sha1 deleted file mode 100644 index df0341f5ce236..0000000000000 --- a/plugins/repository-azure/licenses/azure-core-1.34.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -59827c9aeab1c67053fc598207781e56fb8709f6 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/azure-core-1.39.0.jar.sha1 b/plugins/repository-azure/licenses/azure-core-1.39.0.jar.sha1 new file mode 100644 index 0000000000000..c91498a464b3d --- /dev/null +++ b/plugins/repository-azure/licenses/azure-core-1.39.0.jar.sha1 @@ -0,0 +1 @@ +39765fb88a90174628b31ddf6ff9f8d63462e080 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/azure-json-1.0.1.jar.sha1 b/plugins/repository-azure/licenses/azure-json-1.0.1.jar.sha1 new file mode 100644 index 0000000000000..128a82717fef9 --- /dev/null +++ b/plugins/repository-azure/licenses/azure-json-1.0.1.jar.sha1 @@ -0,0 +1 @@ +abdfdb0c49eebe75ed8532d047dea0c9f13c30ac \ No newline at end of file diff --git a/plugins/repository-azure/src/main/java/org/opensearch/repositories/azure/AzureStorageService.java b/plugins/repository-azure/src/main/java/org/opensearch/repositories/azure/AzureStorageService.java index 3800be7c2d27d..c518cc2716db6 100644 --- a/plugins/repository-azure/src/main/java/org/opensearch/repositories/azure/AzureStorageService.java +++ b/plugins/repository-azure/src/main/java/org/opensearch/repositories/azure/AzureStorageService.java @@ -250,7 +250,7 @@ private BlobServiceClientBuilder applyLocationMode(final BlobServiceClientBuilde private static BlobServiceClientBuilder createClientBuilder(AzureStorageSettings settings) throws InvalidKeyException, URISyntaxException { - return new BlobServiceClientBuilder().connectionString(settings.getConnectString()); + return SocketAccess.doPrivilegedException(() -> new BlobServiceClientBuilder().connectionString(settings.getConnectString())); } /** diff --git a/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java b/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java index 9ebebc5b25a3e..60f751a8d950b 100644 --- a/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java +++ b/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java @@ -119,6 +119,10 @@ public class AzureBlobContainerRetriesTests extends OpenSearchTestCase { public void setUp() throws Exception { threadPool = new TestThreadPool(getTestClass().getName(), AzureRepositoryPlugin.executorBuilder()); httpServer = HttpServer.create(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0); + httpServer.createContext("/", (exchange) -> { + exchange.sendResponseHeaders(404, 0L); + exchange.close(); + }); httpServer.start(); super.setUp(); }