Merge remote-tracking branch 'origin/endgame-june' into endgame-june.next

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/deploy/FunctionDeploymentState.java

@@ -229,7 +229,7 @@ private List<FunctionEntity> listFunctions(final IFunctionApp functionApp) {
         AzureMessager.getMessager().info(SYNCING_TRIGGERS_AND_FETCH_FUNCTION_INFORMATION);
         return Mono.fromCallable(() -> {
             functionApp.syncTriggers();
-            return functionApp.listFunctions();
+            return functionApp.listFunctions(true);
         }).retryWhen(Retry.withThrowable(flux ->
                 flux.zipWith(Flux.range(1, LIST_TRIGGERS_MAX_RETRY + 1), (throwable, count) -> {
                     if (count < LIST_TRIGGERS_MAX_RETRY) {

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/runner/webappconfig/slimui/WebAppDeployViewPresenterSlim.java

@@ -25,7 +25,7 @@ public void onLoadDeploymentSlots(final WebAppComboBoxModel selectedWebApp) {
             return;
         }
         unsubscribeSubscription(loadSlotsSubscription);
-        loadSlotsSubscription = Observable.fromCallable(() -> Azure.az(AzureAppService.class).webapp(selectedWebApp.getResourceId()).deploymentSlots())
+        loadSlotsSubscription = Observable.fromCallable(() -> Azure.az(AzureAppService.class).webapp(selectedWebApp.getResourceId()).deploymentSlots(true))
                   .subscribeOn(getSchedulerProvider().io())
                   .subscribe(slots -> DefaultLoader.getIdeHelper().invokeLater(() -> {
                       if (slots == null || isViewDetached()) {

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/function/FunctionsNode.java

@@ -29,7 +29,7 @@ public FunctionsNode(@Nonnull final Node parent, @Nonnull final IFunctionApp fun
     @Override
     @AzureOperation(name = "function.refresh", type = AzureOperation.Type.ACTION)
     protected void refreshItems() {
-        functionApp.listFunctions().stream()
+        functionApp.listFunctions(true).stream()
                 .map(envelope -> new FunctionNode(envelope, functionApp, this))
                 .forEach(this::addChildNode);
         setName(CollectionUtils.isEmpty(childNodes) ? NAME + EMPTY_POSTFIX : NAME);

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/deploymentslot/DeploymentSlotModulePresenter.java

@@ -12,7 +12,7 @@ public class DeploymentSlotModulePresenter<V extends DeploymentSlotModuleView> e
     public void onRefreshDeploymentSlotModule(final String subscriptionId, final String webAppId) {
         final DeploymentSlotModuleView view = getMvpView();
         if (view != null) {
-            view.renderDeploymentSlots(AzureWebAppMvpModel.getInstance().getAzureAppServiceClient(subscriptionId).webapp(webAppId).deploymentSlots());
+            view.renderDeploymentSlots(AzureWebAppMvpModel.getInstance().getAzureAppServiceClient(subscriptionId).webapp(webAppId).deploymentSlots(true));
         }
     }