Merge pull request #2022 from microsoft/hanli-fix-endgame-202204

Fix several bugs in endgame test

azure-toolkit-libs/azure-toolkit-appservice-lib/src/main/java/com/microsoft/azure/toolkit/lib/appservice/task/CreateOrUpdateWebAppTask.java

@@ -47,8 +47,7 @@ import static com.microsoft.azure.toolkit.lib.appservice.utils.Utils.throwForbid
 @Slf4j
 public class CreateOrUpdateWebAppTask extends AzureTask<WebAppBase<?, ?, ?>> {
     private static final String CREATE_NEW_WEB_APP = "createNewWebApp";
-    private static final String WEBAPP_NOT_EXIST_FOR_SLOT = "The Web App specified in pom.xml does not exist. " +
-            "Please make sure the Web App name is correct.";
+    private static final String WEBAPP_NOT_EXIST_FOR_SLOT = "Target Web App does not exist. Please make sure the Web App name is correct.";
 
     private final AppServiceConfig config;
     private final List<AzureTask<?>> subTasks;
@@ -187,13 +186,14 @@ public class CreateOrUpdateWebAppTask extends AzureTask<WebAppBase<?, ?, ?>> {
     @Override
     @AzureOperation(name = "webapp.create_update_app.app", params = {"this.config.appName()"}, type = Type.SERVICE)
     public WebAppBase<?, ?, ?> doExecute() {
-        return (WebAppBase<?, ?, ?>) Flux.fromStream(this.subTasks.stream().map(t -> {
+        Object result = null;
+        for (final AzureTask<?> task : subTasks) {
             try {
-                return t.getBody().call();
+                result = task.getBody().call();
             } catch (Throwable e) {
-                log.warn(e.getMessage(), e);
+                throw new AzureToolkitRuntimeException(e);
             }
-            return null;
-        })).last().block();
+        }
+        return (WebAppBase<?, ?, ?>) result;
     }
 }