Skip to content

Azure: Avoid depending on KeyWrapAlgorithm in AzureProperties #16186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kevinjqliu merged 2 commits into from
May 8, 2026
+8 −6
Merged

Azure: Avoid depending on KeyWrapAlgorithm in AzureProperties #16186

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab05d26
Azure: Avoid depending on KeyWrapAlgorithm in AzureProperties
ebyhr May 1, 2026
167cea0
fixup! Azure: Avoid depending on KeyWrapAlgorithm in AzureProperties
ebyhr May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions azure/src/main/java/org/apache/iceberg/azure/AzureProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import com.azure.core.credential.AccessToken;
import com.azure.core.credential.TokenCredential;
import com.azure.core.credential.TokenRequestContext;
import com.azure.security.keyvault.keys.cryptography.models.KeyWrapAlgorithm;
import com.azure.storage.common.StorageSharedKeyCredential;
import com.azure.storage.file.datalake.DataLakeFileSystemClientBuilder;
import java.io.Serializable;
Expand Down Expand Up @@ -135,9 +134,7 @@ public AzureProperties(Map<String, String> properties) {
}

this.keyWrapAlgorithm =
properties.getOrDefault(
AzureProperties.AZURE_KEYVAULT_KEY_WRAP_ALGORITHM,
KeyWrapAlgorithm.RSA_OAEP_256.getValue());
properties.getOrDefault(AzureProperties.AZURE_KEYVAULT_KEY_WRAP_ALGORITHM, "RSA-OAEP-256");
Copy link
Copy Markdown
Contributor

@huaxingao huaxingao May 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we extract this into a named constant with a comment noting which Azure SDK value it mirrors? Something like:

> // Must match KeyWrapAlgorithm.RSA_OAEP_256.getValue() from azure-security-keyvault-keys
> private static final String DEFAULT_KEY_WRAP_ALGORITHM = "RSA-OAEP-256";
>

Copy link
Copy Markdown
Member Author

@ebyhr ebyhr May 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the suggestion, updated.

}

public Optional<Integer> adlsReadBlockSize() {
Expand Down Expand Up @@ -204,8 +201,8 @@ public Mono<AccessToken> getToken(TokenRequestContext request) {
}
}

public KeyWrapAlgorithm keyWrapAlgorithm() {
return KeyWrapAlgorithm.fromString(this.keyWrapAlgorithm);
public String keyWrapAlgorithm() {
return this.keyWrapAlgorithm;
}

public Optional<String> keyVaultUrl() {
Expand Down
3 changes: 2 additions & 1 deletion azure/src/main/java/org/apache/iceberg/azure/keymanagement/AzureKeyManagementClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ private ClientState state() {
keyClientBuilder
.credential(AdlsTokenCredentialProviders.from(allProperties).credential())
.buildClient();
KeyWrapAlgorithm keyWrapAlgorithm = azureProperties.keyWrapAlgorithm();
KeyWrapAlgorithm keyWrapAlgorithm =
KeyWrapAlgorithm.fromString(azureProperties.keyWrapAlgorithm());
state = new ClientState(keyClient, keyWrapAlgorithm);
}
}
Expand Down
Loading