handle invalid key exp (#2927)

Author: lcadzy

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/SparkBatchJobRunner.java

@@ -173,11 +173,11 @@ public ISparkBatchJob buildSparkBatchJob(@NotNull SparkSubmitModel submitModel,
                     throw new ExecutionException("Cannot get valid storage account");
                 }
 
-                httpObservable = new SharedKeyHttpObservable(storageAccount.getName(), accessKey);
                 if (StringUtils.isBlank(accessKey)) {
-                    throw new ExecutionException("Invalid access key input.");
+                    throw new ExecutionException("Invalid access key input");
                 }
 
+                httpObservable = new SharedKeyHttpObservable(storageAccount.getName(), accessKey);
                 jobDeploy = new ADLSGen2Deploy(clusterDetail, httpObservable);
                 break;
             case WEBHDFS:

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/ui/SparkSubmissionJobUploadStorageAzureBlobCard.kt

@@ -23,6 +23,7 @@
 package com.microsoft.azure.hdinsight.spark.ui
 
 import com.intellij.ui.ComboboxWithBrowseButton
+import com.intellij.ui.components.fields.ExpandableTextField
 import com.intellij.uiDesigner.core.GridConstraints.*
 import com.microsoft.azure.hdinsight.common.StreamUtil
 import com.microsoft.azure.hdinsight.spark.common.SparkSubmitStorageType
@@ -38,7 +39,7 @@ class SparkSubmissionJobUploadStorageAzureBlobCard: SparkSubmissionJobUploadStor
     private val storageAccountLabel = JLabel("Storage Account").apply { toolTipText = storageAccountTip }
     val storageAccountField = JTextField().apply { toolTipText = storageAccountTip }
     private val storageKeyLabel = JLabel("Storage Key").apply { toolTipText = storageKeyTip }
-    val storageKeyField = JTextArea().apply { toolTipText = storageKeyTip }
+    val storageKeyField = ExpandableTextField().apply { toolTipText = storageKeyTip }
     private val storageContainerLabel = JLabel("Storage Container")
     val storageContainerUI = ComboboxWithBrowseButton().apply {
         button.toolTipText = "Refresh"

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/ui/SparkSubmissionJobUploadStorageGen2Card.kt

@@ -23,6 +23,7 @@
 package com.microsoft.azure.hdinsight.spark.ui
 
 import com.intellij.ui.ComboboxWithBrowseButton
+import com.intellij.ui.components.fields.ExpandableTextField
 import com.intellij.uiDesigner.core.GridConstraints
 import com.intellij.uiDesigner.core.GridConstraints.*
 import com.microsoft.azure.hdinsight.common.StreamUtil
@@ -36,7 +37,7 @@ class SparkSubmissionJobUploadStorageGen2Card : SparkSubmissionJobUploadStorageB
     private val refreshButtonIconPath = "/icons/refresh.png"
     private val storageKeyTip = "The access key of the default storage account, which can be found from HDInsight cluster storage accounts of Azure portal."
     private val storageKeyLabel = JLabel("Access Key").apply { toolTipText = storageKeyTip }
-    val storageKeyField = JTextArea().apply { toolTipText = storageKeyTip }
+    val storageKeyField = ExpandableTextField().apply { toolTipText = storageKeyTip }
     val gen2AccountField = JTextArea().apply { isVisible = false }
 
     init {

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

@@ -52,8 +52,9 @@ public SharedKeyHttpObservable(String accountName, String accessKey) {
         setDefaultHeaderGroup(defaultHeaders);
         try {
             this.cred = new SharedKeyCredential(accountName, accessKey);
-        } catch (InvalidKeyException e) {
-            throw new IllegalArgumentException("Cannot init shared key credential");
+        } catch (IllegalArgumentException ex) {
+            log().warn("Create shared key credential encounter exception", ex);
+            throw new IllegalArgumentException("Can't create shared key credential.Please check access key");
         }
     }
 

Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/sdk/storage/adlsgen2/SharedKeyCredential.java

@@ -43,10 +43,9 @@ public final class SharedKeyCredential {
     private final String accountName;
     private final byte[] accountKey;
 
-    public SharedKeyCredential(String accountName, String accountKey) throws InvalidKeyException {
+    public SharedKeyCredential(String accountName, String accountKey) {
         this.accountName = accountName;
         this.accountKey = Base64.getDecoder().decode(accountKey);
-        StorageCredentialsAccountAndKey cred = new StorageCredentialsAccountAndKey(accountName, accountKey);
     }
 
     private String buildStringToSign(HttpRequestBase request, HeaderGroup httpHeaders, List<NameValuePair> pairs) {

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

@@ -33,19 +33,18 @@
 import com.microsoft.azure.hdinsight.sdk.common.SharedKeyHttpObservable;
 import com.microsoft.azure.hdinsight.sdk.storage.HDStorageAccount;
 import com.microsoft.azure.hdinsight.sdk.storage.adlsgen2.ADLSGen2FSOperation;
-import com.microsoft.azure.hdinsight.sdk.storage.adlsgen2.ADLSGen2ParamsBuilder;
 import com.microsoft.azure.hdinsight.spark.jobs.JobUtils;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
 import com.microsoft.azuretools.azurecommons.helpers.Nullable;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.NameValuePair;
+import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.HttpPut;
 import rx.Observable;
+import rx.exceptions.Exceptions;
 
 import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.List;
 
 public class ADLSGen2Deploy implements Deployable, ILogger {
     @NotNull
@@ -84,6 +83,13 @@ public Observable<String> deploy(@NotNull File src, @NotNull URI destURI) {
         HttpPut req = new HttpPut(dirPath);
         ADLSGen2FSOperation op = new ADLSGen2FSOperation((SharedKeyHttpObservable) this.http);
         return op.createDir(dirPath)
+                .onErrorReturn(err -> {
+                    if (err.getMessage().contains(String.valueOf(HttpStatus.SC_FORBIDDEN))) {
+                        throw new IllegalArgumentException("Failed to upload Spark application artifacts.The access key is invalid.");
+                    } else {
+                        throw Exceptions.propagate(err);
+                    }
+                })
                 .flatMap(ignore -> op.createFile(filePath))
                 .flatMap(ignore -> op.uploadData(filePath, src))
                 .map(ignored -> {