Skip to content

Commit 992ac17

Browse files
committed
Rename client assertion config key name
1 parent 33ec902 commit 992ac17

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsConfiguration.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,13 +1280,13 @@ public AccessTokenProvider getTokenProvider() throws TokenAccessProviderExceptio
12801280
getMandatoryPasswordString(FS_AZURE_ACCOUNT_OAUTH_CLIENT_ID);
12811281

12821282
// Check if a custom ClientAssertionProvider is configured
1283-
String clientAssertionProviderClassName =
1284-
getPasswordString(FS_AZURE_ACCOUNT_OAUTH_CLIENT_ASSERTION_PROVIDER_CLASS);
1283+
String clientAssertionProviderType =
1284+
getPasswordString(FS_AZURE_ACCOUNT_OAUTH_CLIENT_ASSERTION_PROVIDER_TYPE);
12851285

1286-
if (clientAssertionProviderClassName != null && !clientAssertionProviderClassName.trim().isEmpty()) {
1286+
if (clientAssertionProviderType != null && !clientAssertionProviderType.trim().isEmpty()) {
12871287
// Use custom ClientAssertionProvider
12881288
try {
1289-
Class<?> providerClass = Class.forName(clientAssertionProviderClassName.trim());
1289+
Class<?> providerClass = Class.forName(clientAssertionProviderType.trim());
12901290
ClientAssertionProvider clientAssertionProvider =
12911291
(ClientAssertionProvider) providerClass.getDeclaredConstructor().newInstance();
12921292

@@ -1296,10 +1296,10 @@ public AccessTokenProvider getTokenProvider() throws TokenAccessProviderExceptio
12961296
tokenProvider = new WorkloadIdentityTokenProvider(
12971297
authority, tenantGuid, clientId, clientAssertionProvider);
12981298
LOG.trace("WorkloadIdentityTokenProvider initialized with custom ClientAssertionProvider: {}",
1299-
clientAssertionProviderClassName);
1299+
clientAssertionProviderType);
13001300
} catch (Exception e) {
13011301
throw new TokenAccessProviderException(
1302-
"Failed to initialize custom ClientAssertionProvider: " + clientAssertionProviderClassName, e);
1302+
"Failed to initialize custom ClientAssertionProvider: " + clientAssertionProviderType, e);
13031303
}
13041304
} else {
13051305
// Use file-based approach (backward compatibility)

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/constants/ConfigurationKeys.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ public final class ConfigurationKeys {
341341
public static final String FS_AZURE_ACCOUNT_OAUTH_TOKEN_FILE = "fs.azure.account.oauth2.token.file";
342342

343343
/** Key for custom client assertion provider class for WorkloadIdentityTokenProvider */
344-
public static final String FS_AZURE_ACCOUNT_OAUTH_CLIENT_ASSERTION_PROVIDER_CLASS = "fs.azure.account.oauth2.client.assertion.provider.class";
344+
public static final String FS_AZURE_ACCOUNT_OAUTH_CLIENT_ASSERTION_PROVIDER_TYPE = "fs.azure.account.oauth2.client.assertion.provider.type";
345345
/** Key for enabling the tracking of ABFS API latency and sending the latency numbers to the ABFS API service */
346346
public static final String FS_AZURE_ABFS_LATENCY_TRACK = "fs.azure.abfs.latency.track";
347347

0 commit comments

Comments
 (0)