HADOOP-15823. ABFS: Stop requiring client ID and tenant ID for MSI (Contributed by Da Zhou via Daniel Templeton)
Change-Id: I546ab3a1df1efec635c08c388148e718dc4a9843 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e3745844 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e3745844 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e3745844 Branch: refs/heads/HDFS-13532 Commit: e374584479b687e41d5379bb6d827dcae620e123 Parents: 69b3289 Author: Daniel Templeton <templ...@apache.org> Authored: Wed Oct 24 14:18:35 2018 -0700 Committer: Daniel Templeton <templ...@apache.org> Committed: Wed Oct 24 14:18:35 2018 -0700 ---------------------------------------------------------------------- .../hadoop/fs/azurebfs/oauth2/AzureADAuthenticator.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e3745844/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/oauth2/AzureADAuthenticator.java ---------------------------------------------------------------------- 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 97415ce..df7b199 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 final class AzureADAuthenticator { */ 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 final class AzureADAuthenticator { 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); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
