From e374584479b687e41d5379bb6d827dcae620e123 Mon Sep 17 00:00:00 2001 From: Daniel Templeton Date: Wed, 24 Oct 2018 14:18:35 -0700 Subject: [PATCH] HADOOP-15823. ABFS: Stop requiring client ID and tenant ID for MSI (Contributed by Da Zhou via Daniel Templeton) Change-Id: I546ab3a1df1efec635c08c388148e718dc4a9843 --- .../hadoop/fs/azurebfs/oauth2/AzureADAuthenticator.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/oauth2/AzureADAuthenticator.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/oauth2/AzureADAuthenticator.java index 97415ce7121..df7b1990f3f 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/oauth2/AzureADAuthenticator.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/oauth2/AzureADAuthenticator.java @@ -110,9 +110,6 @@ public static AzureADToken getTokenUsingClientCreds(String authEndpoint, */ public static AzureADToken getTokenFromMsi(String tenantGuid, String clientId, boolean bypassCache) throws IOException { - Preconditions.checkNotNull(tenantGuid, "tenantGuid"); - Preconditions.checkNotNull(clientId, "clientId"); - String authEndpoint = "http://169.254.169.254/metadata/identity/oauth2/token"; QueryParams qp = new QueryParams(); @@ -120,12 +117,12 @@ public static AzureADToken getTokenFromMsi(String tenantGuid, String clientId, qp.add("resource", RESOURCE_NAME); - if (tenantGuid.length() > 0) { + if (tenantGuid != null && tenantGuid.length() > 0) { String authority = "https://login.microsoftonline.com/" + tenantGuid; qp.add("authority", authority); } - if (clientId.length() > 0) { + if (clientId != null && clientId.length() > 0) { qp.add("client_id", clientId); }