Fix auth warning issue of linking a HIB cluster

Author: wezhang

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/common/classifiedexception/SparkToolException.kt

@@ -26,6 +26,7 @@ import com.microsoft.azure.datalake.store.ADLException
 import com.microsoft.azure.hdinsight.sdk.common.livy.interactive.exceptions.SessionNotStartException
 import com.microsoft.azure.hdinsight.spark.common.SparkJobException
 import com.microsoft.azure.hdinsight.spark.common.YarnDiagnosticsException
+import com.microsoft.azuretools.adauth.AuthException
 import com.microsoft.azuretools.telemetrywrapper.ErrorType
 import com.microsoft.intellij.forms.ErrorMessageForm
 import org.apache.commons.lang.exception.ExceptionUtils
@@ -57,6 +58,7 @@ object SparkToolExceptionFactory : ClassifiedExceptionFactory() {
                 && exp !is SparkJobException
                 && exp !is FileNotFoundException
                 && exp !is ADLException
+                && exp !is AuthException
                 && stackTrace.contains(ToolPackageSuffix)) {
             SparkToolException(exp)
         } else null

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/common/classifiedexception/SparkUserException.kt

@@ -47,9 +47,13 @@ object SparkUserExceptionFactory : ClassifiedExceptionFactory() {
         } else if (exp is ADLException && exp.httpResponseCode == 403) {
             val hintMsg = "\nPlease make sure user has RWX permissions for the storage account"
             SparkUserException(ADLException("${exp.remoteExceptionMessage}$hintMsg"))
-        } else if (exp is AuthException && exp.error.equals("invalid_grant")) {
-            val hintMsg = String.format("\nPlease check whether have enough permission to access the cluster")
-            SparkUserException(AuthException("${exp.errorMessage}$hintMsg"))
+        } else if (exp is AuthException) {
+            val cause = if (exp.error == "invalid_grant") {
+                val hintMsg = String.format("\nPlease check whether have enough permission to access the cluster")
+                AuthException("${exp.errorMessage}$hintMsg")
+            } else exp
+
+            SparkUserException(cause)
         } else null
     }
 }

Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/sdk/cluster/MfaClusterDetail.java

@@ -22,14 +22,11 @@
 package com.microsoft.azure.hdinsight.sdk.cluster;
 
 import com.microsoft.azure.hdinsight.common.logger.ILogger;
-import com.microsoft.azure.hdinsight.sdk.storage.ADLSGen2StorageAccount;
 import com.microsoft.azure.hdinsight.sdk.storage.StoragePathInfo;
-import com.microsoft.azure.hdinsight.sdk.storage.adlsgen2.ADLSGen2FSOperation;
 import com.microsoft.azure.hdinsight.spark.common.SparkSubmitStorageTypeOptionsForCluster;
-import com.microsoft.azuretools.authmanage.AuthMethodManager;
 import com.microsoft.azuretools.authmanage.models.SubscriptionDetail;
+import com.microsoft.azuretools.azurecommons.helpers.Nullable;
 
-import java.net.URI;
 import java.util.regex.Pattern;
 
 public class MfaClusterDetail extends ClusterDetail implements MfaEspCluster, ILogger {
@@ -38,29 +35,35 @@ public MfaClusterDetail(SubscriptionDetail paramSubscription, ClusterRawInfo par
         super(paramSubscription, paramClusterRawInfo, clusterOperation);
     }
 
+    @Nullable
     @Override
     public String getDefaultStorageRootPath() {
         String storageRootPath = super.getDefaultStorageRootPath();
 
+        if (storageRootPath == null) {
+            return null;
+        }
+
         // check login status and get the login user name
         try {
             if (Pattern.compile(StoragePathInfo.AdlsGen2PathPattern).matcher(storageRootPath).matches()) {
                 storageRootPath = String.format("%s/%s", storageRootPath, getUserPath());
             }
 
             return storageRootPath;
-        } catch (Exception ignore) {
-            log().warn(String.format("Get default storage root path for mfa cluster encounter %s", ignore));
+        } catch (Exception ex) {
+            log().warn(String.format("Get default storage root path for mfa cluster encounter %s", ex));
         }
 
-        return "";
+        return null;
     }
 
     @Override
     public SparkSubmitStorageTypeOptionsForCluster getStorageOptionsType() {
         return SparkSubmitStorageTypeOptionsForCluster.MfaHdiCluster;
     }
 
+    @Nullable
     @Override
     public String getTenantId() {
         return getSubscription().getTenantId();

Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/sdk/cluster/MfaHdiAdditionalClusterDetail.java

@@ -41,7 +41,7 @@ public MfaHdiAdditionalClusterDetail(String clusterName, String userName, String
     @Nullable
     @Override
     public synchronized String getTenantId(){
-        if(tenantId != null){
+        if(this.tenantId != null){
             return this.tenantId;
         }
 
@@ -53,8 +53,8 @@ public synchronized String getTenantId(){
                     this.tenantId = m.group("tenantId");
                 }
             }
-        } catch (IOException ignore) {
-            log().warn(String.format("Encounter expection when negotiating request for linked mfa cluster %s", ignore));
+        } catch (IOException ex) {
+            log().warn(String.format("Encounter exception when negotiating request for linked mfa cluster %s", ex));
         }
 
         return this.tenantId;

Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/sdk/common/azure/serverless/AzureSparkCosmosClusterManager.java

@@ -134,7 +134,7 @@ public AzureManager getAzureManager() {
         try {
             return AuthMethodManager.getInstance().getAzureManager();
         } catch (IOException e) {
-            log().info("Can't get Azure manager now. error: " + e);
+            log().info("Can't get Azure manager now, please sign in. error: " + e);
 
             return null;
         }

Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/spark/common/ADLSGen2Deploy.java

@@ -79,7 +79,8 @@ public Observable<String> deploy(@NotNull File src) {
                 .onErrorReturn(err -> {
                     if (err.getMessage()!= null && (err.getMessage().contains(String.valueOf(HttpStatus.SC_FORBIDDEN))
                             || err.getMessage().contains(String.valueOf(HttpStatus.SC_NOT_FOUND)))) {
-                        throw new IllegalArgumentException("Failed to upload Spark application artifacts. ADLS Gen2 root path does not match with access key.");
+                        throw new IllegalArgumentException("Failed to create folder " + dirPath +
+                                " when uploading Spark application artifacts with error: " + err.getMessage());
                     } else {
                         throw Exceptions.propagate(err);
                     }