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

Open
ebyhr wants to merge 2 commits into
base: main
Choose a base branch
from
+8 −6
Open

Azure: Avoid depending on KeyWrapAlgorithm in AzureProperties #16186

Show file tree
Hide file tree
Changes from all commits
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
11 changes: 6 additions & 5 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 @@ -53,6 +52,9 @@ public class AzureProperties implements Serializable {
public static final String AZURE_KEYVAULT_KEY_WRAP_ALGORITHM =
"azure.keyvault.key-wrap-algorithm";

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

/**
* Configure the ADLS token credential provider used to get {@link TokenCredential}. A fully
* qualified concrete class with package that implements the {@link AdlsTokenCredentialProvider}
Expand Down Expand Up @@ -136,8 +138,7 @@ public AzureProperties(Map<String, String> properties) {

this.keyWrapAlgorithm =
properties.getOrDefault(
AzureProperties.AZURE_KEYVAULT_KEY_WRAP_ALGORITHM,
KeyWrapAlgorithm.RSA_OAEP_256.getValue());
AzureProperties.AZURE_KEYVAULT_KEY_WRAP_ALGORITHM, DEFAULT_KEY_WRAP_ALGORITHM);
}

public Optional<Integer> adlsReadBlockSize() {
Expand Down Expand Up @@ -204,8 +205,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