Skip to content

Commit 6d18fd4

Browse files
opensearch-trigger-bot[bot]github-actions[bot]dependabot[bot]dbwiddis
authored
Bump com.azure:azure-storage-blob from 12.28.1 to 12.29.1 in /plugins/repository-azure (#17562) (#17584)
* Bump com.azure:azure-storage-blob in /plugins/repository-azure Bumps [com.azure:azure-storage-blob](https://github.com/Azure/azure-sdk-for-java) from 12.28.1 to 12.29.1. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](Azure/azure-sdk-for-java@azure-storage-blob_12.28.1...azure-storage-blob_12.29.1) --- updated-dependencies: - dependency-name: com.azure:azure-storage-blob dependency-type: direct:production update-type: version-update:semver-minor ... * Updating SHAs * Update changelog * Change exception type for null credential error --------- (cherry picked from commit 2ee8660) Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Daniel Widdis <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel Widdis <[email protected]>
1 parent 34548c3 commit 6d18fd4

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2323
- Bump `ch.qos.logback:logback-classic` from 1.5.16 to 1.5.17 ([#17497](https://github.com/opensearch-project/OpenSearch/pull/17497))
2424
- Bump `software.amazon.awssdk` from 2.20.86 to 2.30.31 ([17396](https://github.com/opensearch-project/OpenSearch/pull/17396))
2525
- Bump `org.jruby.jcodings:jcodings` from 1.0.61 to 1.0.63 ([#17560](https://github.com/opensearch-project/OpenSearch/pull/17560))
26+
- Bump `com.azure:azure-storage-blob` from 12.28.1 to 12.29.1 ([#17562](https://github.com/opensearch-project/OpenSearch/pull/17562))
2627

2728
### Changed
2829
- Convert transport-reactor-netty4 to use gradle version catalog [#17233](https://github.com/opensearch-project/OpenSearch/pull/17233)

plugins/repository-azure/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ dependencies {
5656
api "io.netty:netty-resolver-dns:${versions.netty}"
5757
api "io.netty:netty-transport-native-unix-common:${versions.netty}"
5858
implementation project(':modules:transport-netty4')
59-
api 'com.azure:azure-storage-blob:12.28.1'
59+
api 'com.azure:azure-storage-blob:12.29.1'
6060
api 'com.azure:azure-identity:1.14.2'
6161
// Start of transitive dependencies for azure-identity
6262
api 'com.microsoft.azure:msal4j-persistence-extension:1.3.0'

plugins/repository-azure/licenses/azure-storage-blob-12.28.1.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+
bf6845feeee7e47da636afcfa28f3affbf1fede5

plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureStorageServiceTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
package org.opensearch.repositories.azure;
3434

3535
import com.azure.core.http.policy.HttpPipelinePolicy;
36-
import com.azure.identity.CredentialUnavailableException;
3736
import com.azure.storage.blob.BlobServiceClient;
3837
import com.azure.storage.common.policy.RequestRetryPolicy;
38+
import com.microsoft.aad.msal4j.MsalServiceException;
3939
import org.opensearch.common.settings.MockSecureSettings;
4040
import org.opensearch.common.settings.Settings;
4141
import org.opensearch.common.settings.SettingsException;
@@ -61,6 +61,7 @@
6161
import reactor.netty.http.HttpResources;
6262

6363
import static org.hamcrest.Matchers.containsInAnyOrder;
64+
import static org.hamcrest.Matchers.containsString;
6465
import static org.hamcrest.Matchers.emptyString;
6566
import static org.hamcrest.Matchers.equalTo;
6667
import static org.hamcrest.Matchers.is;
@@ -202,10 +203,9 @@ public void testClientUsingManagedIdentity() throws IOException {
202203
final BlobServiceClient client1 = azureStorageService.client("azure1").v1();
203204

204205
// Expect the client to use managed identity for authentication, and it should fail because managed identity environment is
205-
// not
206-
// setup in the test
207-
final CredentialUnavailableException e = expectThrows(CredentialUnavailableException.class, () -> client1.getAccountInfo());
208-
assertThat(e.getMessage(), is("Managed Identity authentication is not available."));
206+
// not setup in the test
207+
final MsalServiceException e = expectThrows(MsalServiceException.class, () -> client1.getAccountInfo());
208+
assertThat(e.getMessage(), containsString("HttpStatusCode: 401"));
209209
}
210210
}
211211
}

0 commit comments

Comments
 (0)