Merge pull request #6352 from microsoft/endgame-202201

Endgame 202201

Author: wangmingliang-ms

CHANGELOG.md

@@ -94,10 +94,8 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
 - No default Offer/Sku/Image are selected in "Select VM Image" dialog.
 - Validation passed in Create VM dialog even Maximum price per hour is empty.
 - Some modified values will be changed to default when switch back to "More settings" in "Create App Service" dialog.
-- Can't create new security group from "Create VM" dialog.
 - Validation message is not right when selected subscription has no spring cloud service.
 - Tooltips on nodes in azure explorer are not correct.
-- Error occurs when Docker Run.
 - Error occurs when run or deploy after docker support is added.
 - Icon of action "Open by Database Tools" for PostgreSQL is missing.
 

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/resources/whatsnew.md

@@ -16,10 +16,8 @@
 - No default Offer/Sku/Image are selected in "Select VM Image" dialog.
 - Validation passed in Create VM dialog even Maximum price per hour is empty.
 - Some modified values will be changed to default when switch back to "More settings" in "Create App Service" dialog
-- Can't create new security group from "Create VM" dialog
 - Validation message is not right when selected subscription has no spring cloud service
 - Tooltips on nodes in azure explorer are not correct.
-- Error occurs when Docker Run.
 - Error occurs when run or deploy after docker support is added.
 - Icon of action "Open by Database Tools" for PostgreSQL is missing.
 

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/component/SpringCloudAppConfigPanel.java

@@ -151,13 +151,6 @@ public synchronized void updateForm(@Nonnull SpringCloudApp app) {
         this.numInstance.setMinorTickSpacing(basic ? 1 : 10);
         this.numInstance.setMinimum(0);
         this.numInstance.updateLabels();
-        AzureTaskManager.getInstance().runOnPooledThread(() -> {
-            final int size = Optional.ofNullable(app.getActiveDeployment())
-                .or(() -> Optional.ofNullable(app.deployments().get("default", app.getResourceGroupName())))
-                .map(d -> d.getInstances().size()).orElse(0);
-            final Runnable task = () -> this.numInstance.setRealMin(Math.min(size, app.getFormalStatus().isStopped() ? 0 : 1));
-            AzureTaskManager.getInstance().runLater(task, AzureTask.Modality.ANY);
-        });
     }
 
     @Contract("_->_")

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

@@ -102,18 +102,23 @@ private void onClusterChanger(final ItemEvent e) {
     }
 
     @Override
-    public synchronized void setValue(SpringCloudAppConfig appConfig) {
+    public synchronized void setValue(@Nonnull SpringCloudAppConfig appConfig) {
+        final String clusterName = appConfig.getClusterName();
+        final String appName = appConfig.getAppName();
+        final String resourceGroup = appConfig.getResourceGroup();
+        if (StringUtils.isAnyBlank(clusterName, appName)) {
+            return;
+        }
         AzureTaskManager.getInstance().runOnPooledThread(() -> {
-            final String resourceGroup = appConfig.getResourceGroup();
             final SpringCloudCluster cluster = Optional.of(Azure.az(AzureSpringCloud.class))
                 .map(az -> az.clusters(appConfig.getSubscriptionId()))
-                .map(cs -> cs.get(appConfig.getClusterName(), appConfig.getResourceGroup()))
+                .map(cs -> cs.get(clusterName, resourceGroup))
                 .orElse(null);
             final SpringCloudApp app = Optional.ofNullable(cluster)
-                .map(c -> c.apps().get(appConfig.getAppName(), resourceGroup))
+                .map(c -> c.apps().get(appName, resourceGroup))
                 .orElse(null);
             if (Objects.nonNull(cluster) && Objects.isNull(app)) {
-                final SpringCloudAppDraft draft = cluster.apps().create(appConfig.getAppName(), appConfig.getResourceGroup());
+                final SpringCloudAppDraft draft = cluster.apps().create(appName, resourceGroup);
                 draft.setConfig(appConfig);
                 this.selectorApp.addLocalItem(draft);
             }
@@ -124,7 +129,7 @@ public synchronized void setValue(SpringCloudAppConfig appConfig) {
             .ifPresent((a -> this.selectorArtifact.setArtifact(a.getArtifact())));
         Optional.ofNullable(appConfig.getSubscriptionId())
             .ifPresent((id -> this.selectorSubscription.setValue(new ItemReference<>(id, Subscription::getId))));
-        Optional.ofNullable(appConfig.getClusterName())
+        Optional.ofNullable(clusterName)
             .ifPresent((id -> this.selectorCluster.setValue(new ItemReference<>(id, SpringCloudCluster::name))));
         Optional.ofNullable(appConfig.getAppName())
             .ifPresent((id -> this.selectorApp.setValue(new ItemReference<>(id, SpringCloudApp::name))));

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/resources/META-INF/plugin.xml

@@ -25,7 +25,7 @@
   <change-notes>
     <![CDATA[
     <html>
-        <h3>3.60.0</h3>
+        <h3>3.61.0</h3>
         <h4>Added</h4>
         <ul>
           <li>Add a placeholder tree node in Azure Explorer for resource that is being created.</li>
@@ -45,10 +45,8 @@
           <li>No default Offer/Sku/Image are selected in "Select VM Image" dialog.</li>
           <li>Validation passed in Create VM dialog even Maximum price per hour is empty.</li>
           <li>Some modified values will be changed to default when switch back to "More settings" in "Create App Service" dialog.</li>
-          <li>Can't create new security group from "Create VM" dialog.</li>
           <li>Validation message is not right when selected subscription has no spring cloud service.</li>
           <li>Tooltips on nodes in azure explorer are not correct.</li>
-          <li>Error occurs when Docker Run.</li>
           <li>Error occurs when run or deploy after docker support is added.</li>
           <li>Icon of action "Open by Database Tools" for PostgreSQL is missing.</li>
         <ul>

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-appservice-lib/src/main/java/com/microsoft/azure/toolkit/ide/appservice/webapp/WebAppExplorerContributor.java

@@ -19,8 +19,6 @@
 import com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem;
 import com.microsoft.azure.toolkit.lib.appservice.service.IAppService;
 import com.microsoft.azure.toolkit.lib.appservice.service.impl.WebApp;
-import com.microsoft.azure.toolkit.lib.common.event.AzureEventBus;
-import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -52,13 +50,8 @@ public Node<?> getModuleNode() {
     }
 
     private static AzureIcon.Modifier getOperatingSystemModifier(IAppService<?> resource) {
-        if (resource.getRawEntity() == null) {
-            // do not add os modifier in loading status as runtime request may have high cost
-            AzureTaskManager.getInstance().runOnPooledThreadAsObservable(resource::getRuntime)
-                    .subscribe(ignore -> AzureEventBus.emit("resource.status_changed.resource", resource));
-            return null;
-        }
-        return resource.getRuntime().getOperatingSystem() != OperatingSystem.WINDOWS ? AzureIcon.Modifier.LINUX : null;
+        return resource.getFormalStatus().isWaiting() ? null :
+                resource.getRuntime().getOperatingSystem() != OperatingSystem.WINDOWS ? AzureIcon.Modifier.LINUX : null;
     }
 
     private static List<WebApp> listWebApps(AzureWebApp webAppModule) {

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-appservice-lib/src/main/java/com/microsoft/azuretools/core/mvp/model/webapp/AzureWebAppMvpModel.java

@@ -31,6 +31,7 @@
 import java.io.File;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 
 // todo: Refactor to tasks in app service library
 @Deprecated
@@ -223,8 +224,8 @@ public void deployArtifactsToWebApp(@Nonnull final IWebAppBase deployTarget, @No
         String stopMessage = deployTarget instanceof WebApp ? STOP_WEB_APP : STOP_DEPLOYMENT_SLOT;
         progressIndicator.setText(stopMessage);
         deployTarget.stop();
-
-        final DeployType deployType = getDeployTypeByWebContainer(deployTarget.getRuntime().getWebContainer());
+        // todo: @hanli migrate to use WebAppDeployTask
+        final DeployType deployType = Optional.ofNullable(DeployType.fromString(FilenameUtils.getExtension(file.getName()))).orElse(DeployType.ZIP);
         // java se runtime will always deploy to root
         if (isDeployToRoot ||
                 Objects.equals(deployTarget.getRuntime().getWebContainer(), WebContainer.JAVA_SE)) {
@@ -239,17 +240,6 @@ public void deployArtifactsToWebApp(@Nonnull final IWebAppBase deployTarget, @No
         deployTarget.start();
     }
 
-    // todo: get deploy type with runtime&artifact
-    private static DeployType getDeployTypeByWebContainer(WebContainer webContainer) {
-        if (Objects.equals(webContainer, WebContainer.JAVA_SE)) {
-            return DeployType.JAR;
-        }
-        if (Objects.equals(webContainer, WebContainer.JBOSS_7)) {
-            return DeployType.EAR;
-        }
-        return DeployType.WAR;
-    }
-
     /**
      * Update app settings of deployment slot.
      * todo: move to app service library

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

@@ -49,13 +49,13 @@ springcloud.remove_app.app=remove Spring Cloud app({0})
 springcloud.create_update_app=create or update Spring Cloud app from config in Mojo
 springcloud.create_update_app.app=create or update Spring Cloud app({0}) from config
 springcloud.load_deployment.deployment|app=load deployment({0}) of Spring Cloud app({1}) from Azure
-springcloud.start_deployment.deployment=start deployment({0}) of Spring Cloud app({1})
-springcloud.stop_deployment.deployment=stop deployment({0}) of Spring Cloud app({1})
-springcloud.restart_deployment.deployment=restart deployment({0}) of Spring Cloud app({1})
-springcloud.scale_deployment.deployment=scale deployment({0}) of Spring Cloud app({1})
-springcloud.update_deployment.deployment=update deployment({0}) of Spring Cloud app({1})
-springcloud.create_deployment.deployment=create deployment({0}) of Spring Cloud app({1})
-springcloud.get_deployment.deployment=get deployment({0}) of Spring Cloud app({1}) from Azure
+springcloud.start_deployment.deployment=start deployment({0})
+springcloud.stop_deployment.deployment=stop deployment({0})
+springcloud.restart_deployment.deployment=restart deployment({0})
+springcloud.scale_deployment.deployment=scale deployment({0})
+springcloud.update_deployment.deployment=update deployment({0})
+springcloud.create_deployment.deployment=create deployment({0})
+springcloud.get_deployment.deployment=get deployment({0}) from Azure
 springcloud.list_deployments.app=list deployments of Spring Cloud app({0})
 springcloud.wait_until_deployment_ready.deployment|app=wait deployment({0}) of Spring Cloud app({1}) to be ready
 springcloud.get_client.subscription=get Spring Cloud rest client of subscription({0})