Merge branch 'endgame-june' into endgame-june.next

wangmingliang-ms · wangmingliang-ms · commit 02369e900920 · 2021-06-25T11:24:48.000+08:00
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/AppServiceComboBox.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/AppServiceComboBox.java
@@ -10,6 +10,9 @@
 import com.intellij.ui.SimpleListCellRenderer;
 import com.intellij.ui.components.fields.ExtendableTextComponent;
 import com.microsoft.azure.toolkit.intellij.common.AzureComboBox;
+import com.microsoft.azure.toolkit.lib.appservice.model.JavaVersion;
+import com.microsoft.azure.toolkit.lib.appservice.model.Runtime;
+import com.microsoft.azure.toolkit.lib.appservice.service.IAppService;
 import com.microsoft.azure.toolkit.lib.webapp.WebAppService;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
 import com.microsoft.azuretools.azurecommons.helpers.Nullable;
@@ -19,6 +22,7 @@
 import javax.swing.*;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 public abstract class AppServiceComboBox<T extends AppServiceComboBoxModel> extends AzureComboBox<T> {
 
@@ -71,6 +75,17 @@ protected String getItemText(final Object item) {
         }
     }
 
+    protected boolean isJavaAppService(IAppService appService) {
+        try {
+            return Optional.ofNullable(appService.getRuntime()).map(Runtime::getJavaVersion)
+                    .map(javaVersion -> !Objects.equals(javaVersion, JavaVersion.OFF))
+                    .orElse(false);
+        } catch (final RuntimeException e) {
+            // app service may have been removed while parsing, return false in this case
+            return false;
+        }
+    }
+
     protected abstract void createResource();
 
     public static class AppComboBoxRender extends SimpleListCellRenderer {
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/serviceplan/ServicePlanComboBox.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/serviceplan/ServicePlanComboBox.java
@@ -55,6 +55,8 @@ public void setSubscription(Subscription subscription) {
             this.clear();
             return;
         }
+        // force refresh service plan when switch subscription
+        Azure.az(AzureAppService.class).subscription(subscription.getId()).appServicePlans(true);
         this.refreshItems();
     }
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/FunctionAppComboBox.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/FunctionAppComboBox.java
@@ -9,7 +9,6 @@
 import com.microsoft.azure.toolkit.intellij.appservice.AppServiceComboBox;
 import com.microsoft.azure.toolkit.lib.Azure;
 import com.microsoft.azure.toolkit.lib.appservice.AzureAppService;
-import com.microsoft.azure.toolkit.lib.appservice.model.JavaVersion;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
 import com.microsoft.tooling.msservices.components.DefaultLoader;
@@ -44,7 +43,7 @@ protected void createResource() {
     )
     protected List<FunctionAppComboBoxModel> loadAppServiceModels() {
         return Azure.az(AzureAppService.class).functionApps().parallelStream()
-                .filter(functionApp -> functionApp.getRuntime().getJavaVersion() != JavaVersion.OFF)
+                .filter(this::isJavaAppService)
                 .map(FunctionAppComboBoxModel::new)
                 .sorted((app1, app2) -> app1.getAppName().compareToIgnoreCase(app2.getAppName()))
                 .collect(Collectors.toList());
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/deploy/FunctionDeploymentState.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/deploy/FunctionDeploymentState.java
@@ -33,6 +33,7 @@
 import com.microsoft.intellij.RunProcessHandler;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -48,6 +49,7 @@
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static com.microsoft.intellij.ui.messages.AzureBundle.message;
@@ -64,6 +66,7 @@ public class FunctionDeploymentState extends AzureRunProfileState<IFunctionApp>
             "because they are non-anonymous. To access the non-anonymous triggers, please refer https://aka.ms/azure-functions-key.";
     private static final String FAILED_TO_LIST_TRIGGERS = "Deployment succeeded, but failed to list http trigger urls.";
     private static final String SYNCING_TRIGGERS_AND_FETCH_FUNCTION_INFORMATION = "Syncing triggers and fetching function information...";
+    private static final String NO_TRIGGERS_FOUNDED = "No triggers found in deployed function app";
 
     private final FunctionDeployConfiguration functionDeployConfiguration;
     private final FunctionDeployModel deployModel;
@@ -90,6 +93,7 @@ public IFunctionApp executeSteps(@NotNull RunProcessHandler processHandler, @Not
         } else {
             functionApp = Azure.az(AzureAppService.class).subscription(functionDeployConfiguration.getSubscriptionId())
                     .functionApp(functionDeployConfiguration.getFunctionId());
+            updateApplicationSettings(functionApp);
         }
         stagingFolder = FunctionUtils.getTempStagingFolder();
         prepareStagingFolder(stagingFolder, processHandler, operation);
@@ -122,6 +126,16 @@ private IFunctionApp createFunctionApp(@NotNull RunProcessHandler processHandler
         return functionApp;
     }
 
+    private void updateApplicationSettings(IFunctionApp deployTarget) {
+        final Map<String, String> applicationSettings = FunctionUtils.loadAppSettingsFromSecurityStorage(functionDeployConfiguration.getAppSettingsKey());
+        if (MapUtils.isEmpty(applicationSettings)) {
+            return;
+        }
+        AzureMessager.getMessager().info("Updating application settings...");
+        deployTarget.update().withAppSettings(applicationSettings).commit();
+        AzureMessager.getMessager().info("Update application settings successfully.");
+    }
+
     @AzureOperation(
             name = "function.prepare_staging_folder_detail",
             params = {"stagingFolder.getName()", "this.deployModel.getAppName()"},
@@ -229,7 +243,9 @@ private List<FunctionEntity> listFunctions(final IFunctionApp functionApp) {
         AzureMessager.getMessager().info(SYNCING_TRIGGERS_AND_FETCH_FUNCTION_INFORMATION);
         return Mono.fromCallable(() -> {
             functionApp.syncTriggers();
-            return functionApp.listFunctions(true);
+            return Optional.ofNullable(functionApp.listFunctions(true))
+                    .filter(CollectionUtils::isNotEmpty)
+                    .orElseThrow(() -> new AzureToolkitRuntimeException(NO_TRIGGERS_FOUNDED));
         }).retryWhen(Retry.withThrowable(flux ->
                 flux.zipWith(Flux.range(1, LIST_TRIGGERS_MAX_RETRY + 1), (throwable, count) -> {
                     if (count < LIST_TRIGGERS_MAX_RETRY) {
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/mysql/MySQLPropertyView.form b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/mysql/MySQLPropertyView.form
@@ -80,7 +80,7 @@
                   <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="Choose a database for your conneciton strings:"/>
+                  <text value="Choose a database for your connection strings:"/>
                 </properties>
               </component>
               <hspacer id="4b8df">
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/mysql/MySQLRegionValidator.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/mysql/MySQLRegionValidator.java
@@ -20,7 +20,7 @@ public class MySQLRegionValidator implements Function<RegionComboBox, AzureValid
     public AzureValidationInfo apply(RegionComboBox comboBox) {
 
         try {
-            if (Azure.az(AzureMySql.class).checkRegionAvailability(comboBox.getValue())) {
+            if (Azure.az(AzureMySql.class).subscription(comboBox.getSubscription().getId()).checkRegionAvailability(comboBox.getValue())) {
                 return AzureValidationInfo.OK;
             }
             final AzureValidationInfo.AzureValidationInfoBuilder builder = AzureValidationInfo.builder();
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/sqlserver/properties/SqlServerPropertyView.form b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/sqlserver/properties/SqlServerPropertyView.form
@@ -80,7 +80,7 @@
                   <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="Choose a database for your conneciton strings:"/>
+                  <text value="Choose a database for your connection strings:"/>
                 </properties>
               </component>
               <hspacer id="4b8df">
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/WebAppComboBox.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/WebAppComboBox.java
@@ -49,10 +49,10 @@ protected void createResource() {
     )
     protected List<WebAppComboBoxModel> loadAppServiceModels() {
         final List<IWebApp> webApps = Azure.az(AzureAppService.class).webapps(false);
-        return webApps.stream()
-                      .filter(webApp -> webApp.getRuntime().getJavaVersion() != null && webApp.getRuntime().getJavaVersion() != JavaVersion.OFF)
-                      .sorted((a, b) -> a.name().compareToIgnoreCase(b.name()))
-                      .map(WebAppComboBoxModel::new)
-                      .collect(Collectors.toList());
+        return webApps.stream().parallel()
+                .filter(this::isJavaAppService)
+                .sorted((a, b) -> a.name().compareToIgnoreCase(b.name()))
+                .map(WebAppComboBoxModel::new)
+                .collect(Collectors.toList());
     }
 }
diff --git a/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/function/FunctionAppNode.java b/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/function/FunctionAppNode.java
@@ -44,6 +44,7 @@ public FunctionAppNode(@Nonnull AzureRefreshableNode parent, @Nonnull IFunctionA
 
     @Override
     protected void refreshItems() {
+        super.refreshItems();
         this.renderSubModules();
     }
 
diff --git a/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/function/FunctionModule.java b/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/function/FunctionModule.java
@@ -45,7 +45,7 @@ public void removeNode(String sid, String id, Node node) {
     @AzureOperation(name = "function.reload_all", type = AzureOperation.Type.ACTION)
     protected void refreshItems() {
         Azure.az(AzureAppService.class).functionApps(true)
-                .stream().map(functionApp -> new FunctionAppNode(FunctionModule.this, functionApp))
+                .stream().parallel().map(functionApp -> new FunctionAppNode(FunctionModule.this, functionApp))
                 .forEach(this::addChildNode);
     }
 
diff --git a/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/WebAppModule.java b/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/WebAppModule.java
@@ -81,6 +81,7 @@ public void run() {
     @Override
     public void renderChildren(@NotNull final List<IWebApp> resourceExes) {
         resourceExes.stream()
+                .parallel()
                 .filter(webApp -> StringUtils.isNotEmpty(webApp.id()))
                 .map(webApp -> new WebAppNode(this, webApp))
                 .forEach(this::addChildNode);
diff --git a/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/WebAppNode.java b/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/WebAppNode.java
@@ -59,6 +59,7 @@ public IWebApp getWebappManager() {
     @Override
     @AzureOperation(name = "webapp.refresh", type = AzureOperation.Type.ACTION)
     protected void refreshItems() {
+        super.refreshItems();
         this.renderSubModules();
     }
 
diff --git a/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/base/WebAppBaseNode.java b/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/base/WebAppBaseNode.java
@@ -10,6 +10,8 @@
 import com.microsoft.azure.toolkit.lib.appservice.service.IAppService;
 import com.microsoft.azuretools.telemetry.AppInsightsConstants;
 import com.microsoft.azuretools.telemetry.TelemetryProperties;
+import com.microsoft.tooling.msservices.components.DefaultLoader;
+import com.microsoft.tooling.msservices.serviceexplorer.AzureIconSymbol;
 import com.microsoft.tooling.msservices.serviceexplorer.AzureRefreshableNode;
 import com.microsoft.tooling.msservices.serviceexplorer.NodeAction;
 import com.microsoft.tooling.msservices.serviceexplorer.RefreshableNode;
@@ -38,7 +40,8 @@ public WebAppBaseNode(final AzureRefreshableNode parent, final String label, fin
         this.appService = appService;
         this.subscriptionId = ResourceId.fromString(appService.id()).subscriptionId();
 
-        renderNode(WebAppBaseState.fromString(appService.state()));
+        renderNode(WebAppBaseState.UPDATING);
+        DefaultLoader.getIdeHelper().executeOnPooledThread(() -> refreshItems());
     }
 
     protected String getAppServiceIconPath(final WebAppBaseState state) {
@@ -47,6 +50,13 @@ protected String getAppServiceIconPath(final WebAppBaseState state) {
                 + label + (state == WebAppBaseState.RUNNING ? ICON_RUNNING_POSTFIX : ICON_STOPPED_POSTFIX);
     }
 
+    @Override
+    protected void refreshItems() {
+        renderNode(WebAppBaseState.UPDATING);
+        appService.refresh();
+        renderNode(WebAppBaseState.fromString(appService.state()));
+    }
+
     @Override
     public List<NodeAction> getNodeActions() {
         boolean running = this.state == WebAppBaseState.RUNNING;
@@ -58,12 +68,15 @@ public List<NodeAction> getNodeActions() {
     }
 
     public void renderNode(@Nonnull WebAppBaseState state) {
+        this.state = state;
         switch (state) {
             case RUNNING:
             case STOPPED:
-                this.state = state;
                 this.setIconPath(getAppServiceIconPath(state));
                 break;
+            case UPDATING:
+                this.setIconPath(AzureIconSymbol.Common.REFRESH.getPath());
+                break;
             default:
                 break;
         }
diff --git a/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/deploymentslot/DeploymentSlotNode.java b/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/deploymentslot/DeploymentSlotNode.java
@@ -95,6 +95,7 @@ protected void onNodeClick(NodeActionEvent e) {
     @Override
     @AzureOperation(name = "webapp|deployment.refresh", params = {"this.slot.name()", "this.webApp.name()"}, type = AzureOperation.Type.ACTION)
     protected void refreshItems() {
+        super.refreshItems();
         if (slot.exists()) {
             this.renderNode(WebAppBaseState.fromString(slot.state()));
         } else {

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,8 @@ public void setSubscription(Subscription subscription) {`
`55`	`55`	`this.clear();`
`56`	`56`	`return;`
`57`	`57`	`}`
	`58`	`+ // force refresh service plan when switch subscription`
	`59`	`+ Azure.az(AzureAppService.class).subscription(subscription.getId()).appServicePlans(true);`
`58`	`60`	`this.refreshItems();`
`59`	`61`	`}`
`60`	`62`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public class MySQLRegionValidator implements Function<RegionComboBox, AzureValid`
`20`	`20`	`public AzureValidationInfo apply(RegionComboBox comboBox) {`
`21`	`21`
`22`	`22`	`try {`
`23`		`- if (Azure.az(AzureMySql.class).checkRegionAvailability(comboBox.getValue())) {`
	`23`	`+ if (Azure.az(AzureMySql.class).subscription(comboBox.getSubscription().getId()).checkRegionAvailability(comboBox.getValue())) {`
`24`	`24`	`return AzureValidationInfo.OK;`
`25`	`25`	`}`
`26`	`26`	`final AzureValidationInfo.AzureValidationInfoBuilder builder = AzureValidationInfo.builder();`
Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,10 @@ protected void createResource() {`
`49`	`49`	`)`
`50`	`50`	`protected List<WebAppComboBoxModel> loadAppServiceModels() {`
`51`	`51`	`final List<IWebApp> webApps = Azure.az(AzureAppService.class).webapps(false);`
`52`		`- return webApps.stream()`
`53`		`- .filter(webApp -> webApp.getRuntime().getJavaVersion() != null && webApp.getRuntime().getJavaVersion() != JavaVersion.OFF)`
`54`		`- .sorted((a, b) -> a.name().compareToIgnoreCase(b.name()))`
`55`		`- .map(WebAppComboBoxModel::new)`
`56`		`- .collect(Collectors.toList());`
	`52`	`+ return webApps.stream().parallel()`
	`53`	`+ .filter(this::isJavaAppService)`
	`54`	`+ .sorted((a, b) -> a.name().compareToIgnoreCase(b.name()))`
	`55`	`+ .map(WebAppComboBoxModel::new)`
	`56`	`+ .collect(Collectors.toList());`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ public FunctionAppNode(@Nonnull AzureRefreshableNode parent, @Nonnull IFunctionA`
`44`	`44`
`45`	`45`	`@Override`
`46`	`46`	`protected void refreshItems() {`
	`47`	`+ super.refreshItems();`
`47`	`48`	`this.renderSubModules();`
`48`	`49`	`}`
`49`	`50`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public void removeNode(String sid, String id, Node node) {`
`45`	`45`	`@AzureOperation(name = "function.reload_all", type = AzureOperation.Type.ACTION)`
`46`	`46`	`protected void refreshItems() {`
`47`	`47`	`Azure.az(AzureAppService.class).functionApps(true)`
`48`		`- .stream().map(functionApp -> new FunctionAppNode(FunctionModule.this, functionApp))`
	`48`	`+ .stream().parallel().map(functionApp -> new FunctionAppNode(FunctionModule.this, functionApp))`
`49`	`49`	`.forEach(this::addChildNode);`
`50`	`50`	`}`
`51`	`51`