Azure client upgrade to allow identity options #15287
+1,287
−1,001
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.druid.storage.azure; | ||
|
|
||
| import com.azure.core.http.policy.ExponentialBackoffOptions; | ||
| import com.azure.core.http.policy.RetryOptions; | ||
| import com.azure.identity.DefaultAzureCredentialBuilder; | ||
| import com.azure.storage.blob.BlobServiceClient; | ||
| import com.azure.storage.blob.BlobServiceClientBuilder; | ||
| import com.azure.storage.common.StorageSharedKeyCredential; | ||
|
|
||
| import javax.annotation.Nonnull; | ||
| import java.time.Duration; | ||
|
|
||
| /** | ||
| * Factory class for generating BlobServiceClient and BlobContainerClient objects. This is necessary instead of using | ||
| * BlobServiceClient.createBlobContainerIfNotExists because sometimes we need different retryOptions on our container | ||
| * clients and Azure doesn't let us override this setting on the default BlobServiceClient. | ||
| */ | ||
| public class AzureClientFactory | ||
| { | ||
|
|
||
| private final AzureAccountConfig config; | ||
|
|
||
| public AzureClientFactory(AzureAccountConfig config) | ||
| { | ||
| this.config = config; | ||
| } | ||
|
|
||
| public BlobServiceClient getBlobServiceClient() | ||
| { | ||
| return getAuthenticatedBlobServiceClientBuilder().buildClient(); | ||
| } | ||
|
|
||
| public BlobServiceClient getRetriableBlobServiceClient(@Nonnull Integer retryCount) | ||
|
There was a problem hiding this comment. Is there a reason for this factory to return both a retriable and non-retriable client? There was a problem hiding this comment. explained this in a below comment |
||
| { | ||
| BlobServiceClientBuilder clientBuilder = getAuthenticatedBlobServiceClientBuilder() | ||
| .retryOptions(new RetryOptions( | ||
| new ExponentialBackoffOptions() | ||
| .setMaxRetries(retryCount) | ||
| .setBaseDelay(Duration.ofMillis(1000)) | ||
| .setMaxDelay(Duration.ofMillis(60000)) | ||
| )); | ||
| return clientBuilder.buildClient(); | ||
| } | ||
|
|
||
| private BlobServiceClientBuilder getAuthenticatedBlobServiceClientBuilder() | ||
| { | ||
| BlobServiceClientBuilder clientBuilder = new BlobServiceClientBuilder() | ||
| .endpoint("https://" + config.getAccount() + ".blob.core.windows.net"); | ||
|
|
||
| if (config.getKey() != null) { | ||
| clientBuilder.credential(new StorageSharedKeyCredential(config.getAccount(), config.getKey())); | ||
| } else if (config.getSharedAccessStorageToken() != null) { | ||
| clientBuilder.sasToken(config.getSharedAccessStorageToken()); | ||
| } else if (config.getUseAzureCredentialsChain()) { | ||
| // We might not use the managed identity client id in the credential chain but we can just set it here and it will no-op. | ||
| DefaultAzureCredentialBuilder defaultAzureCredentialBuilder = new DefaultAzureCredentialBuilder() | ||
| .managedIdentityClientId(config.getManagedIdentityClientId()); | ||
| clientBuilder.credential(defaultAzureCredentialBuilder.build()); | ||
| } | ||
| return clientBuilder; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should these dependencies be the same version?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unfortunately azure does not sync these versions
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://learn.microsoft.com/en-us/azure/developer/java/sdk/get-started-maven#use-the-azure-sdk-for-java-build-tool - have you looked into adding this to see if the azure libraries are added correctly?