Merge pull request #6111 from microsoft/miller/fix-bugs

fix several bugs

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureIntegerInput.java

@@ -5,6 +5,7 @@
 
 package com.microsoft.azure.toolkit.intellij.common;
 
+import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
 import com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo;
 import lombok.Getter;
 import lombok.Setter;
@@ -28,7 +29,7 @@ public class AzureIntegerInput extends BaseAzureTextInput<Integer> {
     public Integer getValue() {
         final String text = getText();
         if (StringUtils.isBlank(text) || !StringUtils.isNumeric(text)) {
-            throw new NumberFormatException(String.format("\"%s\" is not an integer", text));
+            throw new AzureToolkitRuntimeException(String.format("\"%s\" is not an integer", text));
         }
         return Integer.valueOf(getText());
     }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-redis/src/main/java/com/microsoft/azure/toolkit/intellij/redis/explorer/RedisCacheExplorer.java

@@ -197,6 +197,9 @@ public void showScanResult(ScanResult<String> result) {
     }
 
     public void showContent(Pair<String, ArrayList<String[]>> val) {
+        if (Objects.isNull(val)) {
+            return;
+        }
         final String type = val.getKey();
         final ArrayList<String[]> value = val.getValue();
         lblTypeValue.setText(type);

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/deplolyment/SpringCloudDeploymentConfiguration.java

@@ -12,6 +12,7 @@
 import com.intellij.execution.configurations.LocatableConfigurationBase;
 import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.execution.configurations.RunProfileState;
+import com.intellij.execution.impl.CheckableRunConfigurationEditor;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SettingsEditor;
@@ -135,7 +136,7 @@ public String getName() {
         }
     }
 
-    static class Editor extends SettingsEditor<SpringCloudDeploymentConfiguration> {
+    static class Editor extends SettingsEditor<SpringCloudDeploymentConfiguration> implements CheckableRunConfigurationEditor<SpringCloudDeploymentConfiguration> {
         private final SpringCloudDeploymentConfigurationPanel panel;
 
         Editor(SpringCloudDeploymentConfiguration configuration, Project project) {
@@ -160,7 +161,7 @@ protected void resetEditorFrom(@NotNull SpringCloudDeploymentConfiguration confi
 
         @Override
         protected void applyEditorTo(@NotNull SpringCloudDeploymentConfiguration config) throws ConfigurationException {
-            final List<AzureValidationInfo> infos = this.panel.validateAllInputs();
+            final List<AzureValidationInfo> infos = this.panel.getAllValidationInfos(true);
             final AzureValidationInfo error = infos.stream()
                     .filter(i -> i.getType() == AzureValidationInfo.Type.ERROR)
                     .findAny().orElse(null);
@@ -174,5 +175,9 @@ protected void applyEditorTo(@NotNull SpringCloudDeploymentConfiguration config)
         protected @NotNull JComponent createEditor() {
             return this.panel.getContentPanel();
         }
+
+        @Override
+        public void checkEditorData(SpringCloudDeploymentConfiguration s) {
+        }
     }
 }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/deplolyment/SpringCloudDeploymentConfigurationPanel.java

@@ -18,6 +18,7 @@
 import com.microsoft.azure.toolkit.intellij.springcloud.component.SpringCloudAppComboBox;
 import com.microsoft.azure.toolkit.intellij.springcloud.component.SpringCloudClusterComboBox;
 import com.microsoft.azure.toolkit.lib.Azure;
+import com.microsoft.azure.toolkit.lib.common.entity.IAzureResource;
 import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
 import com.microsoft.azure.toolkit.lib.common.model.Subscription;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
@@ -104,7 +105,7 @@ public synchronized void setValue(SpringCloudAppConfig appConfig) {
         AzureTaskManager.getInstance().runOnPooledThread(() -> {
             final SpringCloudCluster cluster = Azure.az(AzureSpringCloud.class).cluster(appConfig.getClusterName());
             if (Objects.nonNull(cluster) && !cluster.app(appConfig.getAppName()).exists()) {
-                AzureTaskManager.getInstance().runLater(() -> this.selectorApp.addLocalItem(cluster.app(appConfig)));
+                this.selectorApp.addLocalItem(cluster.app(appConfig));
             }
         });
         final SpringCloudDeploymentConfig deploymentConfig = appConfig.getDeployment();
@@ -122,7 +123,7 @@ public synchronized void setValue(SpringCloudAppConfig appConfig) {
     @Nullable
     @Override
     public SpringCloudAppConfig getValue() {
-        SpringCloudAppConfig appConfig = this.selectorApp.getValue().entity().getConfig();
+        SpringCloudAppConfig appConfig = Optional.ofNullable(this.selectorApp.getValue()).map(a -> a.entity().getConfig()).orElse(null);
         if (Objects.isNull(appConfig)) {
             appConfig = SpringCloudAppConfig.builder()
                     .deployment(SpringCloudDeploymentConfig.builder().build())
@@ -134,11 +135,13 @@ public SpringCloudAppConfig getValue() {
 
     public SpringCloudAppConfig getValue(SpringCloudAppConfig appConfig) {
         final SpringCloudDeploymentConfig deploymentConfig = appConfig.getDeployment();
-        appConfig.setSubscriptionId(this.selectorSubscription.getValue().getId());
-        appConfig.setClusterName(this.selectorCluster.getValue().name());
-        appConfig.setAppName(this.selectorApp.getValue().name());
+        appConfig.setSubscriptionId(Optional.ofNullable(this.selectorSubscription.getValue()).map(Subscription::getId).orElse(null));
+        appConfig.setClusterName(Optional.ofNullable(this.selectorCluster.getValue()).map(IAzureResource::name).orElse(null));
+        appConfig.setAppName(Optional.ofNullable(this.selectorApp.getValue()).map(IAzureResource::name).orElse(null));
         final AzureArtifact artifact = this.selectorArtifact.getValue();
-        deploymentConfig.setArtifact(new WrappedAzureArtifact(this.selectorArtifact.getValue(), this.project));
+        if (Objects.nonNull(artifact)) {
+            deploymentConfig.setArtifact(new WrappedAzureArtifact(this.selectorArtifact.getValue(), this.project));
+        }
         return appConfig;
     }
 

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/deplolyment/SpringCloudDeploymentConfigurationState.java

@@ -46,7 +46,7 @@ public class SpringCloudDeploymentConfigurationState implements RunProfileState
     private static final int GET_STATUS_TIMEOUT = 180;
     private static final String UPDATE_APP_WARNING = "It may take some moments for the configuration to be applied at server side!";
     private static final String GET_DEPLOYMENT_STATUS_TIMEOUT = "Deployment succeeded but the app is still starting, " +
-            "you can check the app status from Azure Portal.";
+        "you can check the app status from Azure Portal.";
     private static final String NOTIFICATION_TITLE = "Deploy Spring Cloud App";
 
     private final SpringCloudDeploymentConfiguration config;
@@ -66,10 +66,18 @@ public SpringCloudDeploymentConfigurationState(Project project, SpringCloudDeplo
         final ConsoleMessager messager = new ConsoleMessager(processHandler);
         final ConsoleView consoleView = TextConsoleBuilderFactory.getInstance().createBuilder(this.project).getConsole();
         consoleView.attachToProcess(processHandler);
-        final Disposable subscribe = Mono.fromCallable(() -> this.execute(messager))
-                .doOnTerminate(processHandler::notifyComplete)
-                .subscribeOn(Schedulers.boundedElastic())
-                .subscribe((res) -> messager.success("Deploy succeed!"), messager::error);
+        final Runnable execute = () -> {
+            try {
+                this.execute(messager);
+                messager.success("Deploy succeed!");
+            } catch (final Exception e) {
+                messager.error(e);
+            }
+        };
+        final Disposable subscribe = Mono.fromRunnable(execute)
+            .doOnTerminate(processHandler::notifyComplete)
+            .subscribeOn(Schedulers.boundedElastic())
+            .subscribe();
         processHandler.addProcessListener(new ProcessAdapter() {
             @Override
             public void processTerminated(@NotNull ProcessEvent event) {

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/common/action/LegacyIntellijActionsContributor.java

@@ -8,15 +8,22 @@
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.microsoft.azure.toolkit.ide.common.IActionsContributor;
 import com.microsoft.azure.toolkit.lib.common.action.Action;
+import com.microsoft.azure.toolkit.lib.common.action.ActionView;
 import com.microsoft.azure.toolkit.lib.common.action.AzureActionManager;
+import com.microsoft.azure.toolkit.lib.common.bundle.AzureString;
+import com.microsoft.azure.toolkit.lib.common.operation.AzureOperationBundle;
 import com.microsoft.intellij.actions.AzureSignInAction;
 
 import java.util.Optional;
+import java.util.function.BiConsumer;
 
 public class LegacyIntellijActionsContributor implements IActionsContributor {
     @Override
     public void registerActions(AzureActionManager am) {
-        am.registerAction(Action.REQUIRE_AUTH, new Action<>((Runnable r, AnActionEvent e) ->
-                AzureSignInAction.requireSignedIn(Optional.ofNullable(e).map(AnActionEvent::getProject).orElse(null), r)).authRequired(false));
+        final AzureString title = AzureOperationBundle.title("account.authorize");
+        final ActionView.Builder authView = new ActionView.Builder("Authorize").title((s) -> title);
+        final BiConsumer<Runnable, AnActionEvent> handler = (Runnable r, AnActionEvent e) ->
+            AzureSignInAction.requireSignedIn(Optional.ofNullable(e).map(AnActionEvent::getProject).orElse(null), r);
+        am.registerAction(Action.REQUIRE_AUTH, new Action<>(handler, authView).authRequired(false));
     }
 }

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-common-lib/src/main/resources/bundles/com/microsoft/azure/toolkit/operation.properties

@@ -114,6 +114,7 @@ account|subscription.refresh=reload subscriptions
 account|subscription.select=select one/more subscriptions to work on
 account|tenant.auth=authenticate tenant({0})
 account|tenant.list.authorized=get all authorized tenants
+account.authorize=authorizing...
 
 action|common.open_browser=open browser with url({0})