Merge pull request #5434 from microsoft/fix-function

Fix issues for function deployment

Author: Flanker32

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) {