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

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceInfoAdvancedPanel.java

@@ -52,7 +52,7 @@
 @Getter
 public class AppServiceInfoAdvancedPanel<T extends AppServiceConfig> extends JPanel implements AzureFormPanel<T> {
     public static final ContainerAppDraft.ImageConfig QUICK_START_IMAGE =
-            new ContainerAppDraft.ImageConfig("mcr.microsoft.com/azuredocs/containerapps-helloworld:latest");
+            new ContainerAppDraft.ImageConfig("mcr.microsoft.com/appsvc/staticsite:latest");
     private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyMMddHHmmss");
     private static final String NOT_APPLICABLE = "N/A";
     private final Project project;

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceInfoBasicPanel.java

@@ -15,18 +15,20 @@
 import com.microsoft.azure.toolkit.lib.appservice.config.AppServiceConfig;
 import com.microsoft.azure.toolkit.lib.appservice.config.FunctionAppConfig;
 import com.microsoft.azure.toolkit.lib.appservice.config.RuntimeConfig;
+import com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem;
 import com.microsoft.azure.toolkit.lib.appservice.model.Runtime;
 import com.microsoft.azure.toolkit.lib.auth.Account;
 import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
 import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
 import com.microsoft.azure.toolkit.lib.common.model.Subscription;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.SneakyThrows;
 import org.apache.commons.compress.utils.FileNameUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.swing.*;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.function.Supplier;
 
@@ -45,6 +47,9 @@ public class AppServiceInfoBasicPanel<T extends AppServiceConfig> extends JPanel
     private JLabel lblArtifact;
     private JLabel lblName;
     private JLabel lblPlatform;
+    @Setter
+    @Getter
+    private String defaultImage;
 
     public AppServiceInfoBasicPanel(final Project project, final Supplier<? extends T> defaultConfigSupplier) {
         super();
@@ -82,16 +87,16 @@ public T getValue() {
                                                   .orElseGet(() -> account.getSelectedSubscriptions().stream().findFirst().orElse(null));
         final T result = this.config == null ? supplier.get() : this.config;
         result.appName(name);
-        Optional.ofNullable(platform).map(RuntimeConfig::fromRuntime).ifPresent(result::runtime);
         Optional.ofNullable(subscription).map(Subscription::getId).ifPresent(result::subscriptionId);
-        // todo: web app creation dialog should use run/deploy configuration, which should be parent of info panel
-//        if (Objects.nonNull(artifact)) {
-//            final AzureArtifactManager manager = AzureArtifactManager.getInstance(this.project);
-//            final String path = this.selectorApplication.getValue().getFileForDeployment();
-//            result.setApplication(Paths.get(path));
-//        }
+        Optional.ofNullable(platform).filter(r -> !r.isDocker()).map(RuntimeConfig::fromRuntime).ifPresent(result::runtime);
+        if (Objects.nonNull(platform) && platform.isDocker()) {
+            final RuntimeConfig runtime = Optional.ofNullable(result.runtime()).orElseGet(RuntimeConfig::new);
+            runtime.os(OperatingSystem.DOCKER);
+            runtime.image(StringUtils.firstNonBlank(runtime.image(), defaultImage));
+            result.runtime(runtime);
+        }
+        result.appSettings(ObjectUtils.firstNonNull(this.config.appSettings(), new HashMap<>()));
         this.config = result;
-        this.config.appSettings(ObjectUtils.firstNonNull(this.config.appSettings(), new HashMap<>()));
         return config;
     }
 

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/FunctionAppCreationDialog.java

@@ -10,8 +10,14 @@
 import com.microsoft.azure.toolkit.intellij.common.AzureFormPanel;
 import com.microsoft.azure.toolkit.intellij.common.ConfigDialog;
 import com.microsoft.azure.toolkit.intellij.legacy.appservice.AppServiceInfoBasicPanel;
+import com.microsoft.azure.toolkit.lib.appservice.config.AppServiceConfig;
+import com.microsoft.azure.toolkit.lib.appservice.config.AppServicePlanConfig;
 import com.microsoft.azure.toolkit.lib.appservice.config.FunctionAppConfig;
+import com.microsoft.azure.toolkit.lib.appservice.config.RuntimeConfig;
 import com.microsoft.azure.toolkit.lib.appservice.model.FunctionAppRuntime;
+import com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.plan.AppServicePlan;
 import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
 import com.microsoft.azure.toolkit.lib.auth.IAccountActions;
 import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
@@ -25,6 +31,7 @@
 import java.util.Optional;
 
 import static com.microsoft.azure.toolkit.intellij.common.AzureBundle.message;
+import static com.microsoft.azure.toolkit.intellij.legacy.function.FunctionAppInfoPanel.QUICK_START_IMAGE;
 import static com.microsoft.azure.toolkit.lib.Azure.az;
 
 public class FunctionAppCreationDialog extends ConfigDialog<FunctionAppConfig> {
@@ -78,10 +85,27 @@ public FunctionAppConfig getValue() {
                         insightConfig.setName(config.appName());
                     }
                 });
+
+                final OperatingSystem os = Optional.ofNullable(config)
+                        .map(FunctionAppConfig::runtime).map(RuntimeConfig::os).orElse(null);
+                final PricingTier pricingTier = Optional.ofNullable(config)
+                        .map(FunctionAppConfig::getPricingTier).orElse(null);
+                final Boolean isConsumption = Optional.ofNullable(pricingTier)
+                        .map(tier -> tier.isConsumption() || tier.isFlexConsumption()).orElse(false);
+                // set draft plan pricing tier to premium if runtime is docker
+                if (os == OperatingSystem.DOCKER && isConsumption) {
+                    Optional.of(config)
+                            .map(AppServiceConfig::getServicePlanConfig)
+                            .map(AppServicePlanConfig::getAppServicePlan)
+                            .filter(AppServicePlan::isDraftForCreating).ifPresent(ignore -> {
+                                config.pricingTier(PricingTier.PREMIUM_P1V2);
+                            });
+                }
                 return config;
             }
         };
         basicPanel.getSelectorRuntime().setPlatformList(FunctionAppRuntime.getMajorRuntimes());
+        basicPanel.setDefaultImage(QUICK_START_IMAGE.getFullImageName());
         advancePanel = new FunctionAppAdvancedConfigPanel(project);
     }
 }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/FunctionAppInfoPanel.java

@@ -115,12 +115,6 @@ public FunctionAppConfig getValue() {
         if (isDocker) {
             final ContainerAppDraft.ImageConfig image = chkUseQuickStart.isSelected() ? QUICK_START_IMAGE : pnlContainer.getValue();
             Optional.ofNullable(image).map(DockerUtils::convertImageConfigToRuntimeConfig).ifPresent(config::runtime);
-            // workaround to fix worker runtime issue of default image, as it was a dot net one
-            if (chkUseQuickStart.isSelected()) {
-                final Map<String, String> appSettings = new HashMap<>(config.appSettings());
-                appSettings.put("FUNCTIONS_WORKER_RUNTIME", "dotnet-isolated");
-                config.appSettings(appSettings);
-            }
         }
         return this.config;
     }

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

@@ -62,7 +62,6 @@ public class FunctionDeploymentState extends AzureRunProfileState<FunctionAppBas
     private static final String NO_TRIGGERS_FOUNDED = "No triggers found in deployed function app";
 
     private final FunctionDeployConfiguration functionDeployConfiguration;
-    private final FunctionDeployModel deployModel;
     private File stagingFolder;
 
     /**
@@ -71,7 +70,6 @@ public class FunctionDeploymentState extends AzureRunProfileState<FunctionAppBas
     public FunctionDeploymentState(Project project, FunctionDeployConfiguration functionDeployConfiguration) {
         super(project);
         this.functionDeployConfiguration = functionDeployConfiguration;
-        this.deployModel = functionDeployConfiguration.getModel();
     }
 
     @Nullable
@@ -177,6 +175,6 @@ protected void onFail(@NotNull Throwable error, @NotNull RunProcessHandler proce
 
     @Override
     protected Map<String, String> getTelemetryMap() {
-        return deployModel.getTelemetryProperties();
+        return OperationContext.action().getTelemetryProperties();
     }
 }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/webapp/WebAppCreationDialog.java

@@ -9,6 +9,7 @@
 import com.microsoft.azure.toolkit.intellij.appservice.AppServiceIntelliJActionsContributor;
 import com.microsoft.azure.toolkit.intellij.common.AzureFormPanel;
 import com.microsoft.azure.toolkit.intellij.common.ConfigDialog;
+import com.microsoft.azure.toolkit.intellij.legacy.appservice.AppServiceInfoAdvancedPanel;
 import com.microsoft.azure.toolkit.intellij.legacy.appservice.AppServiceInfoBasicPanel;
 import com.microsoft.azure.toolkit.lib.appservice.config.AppServiceConfig;
 import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
@@ -74,5 +75,6 @@ private void createUIComponents() {
         }
         basicForm = new AppServiceInfoBasicPanel<>(project, () -> AppServiceIntelliJActionsContributor.getDefaultWebAppConfig(null));
         basicForm.setDeploymentVisible(false);
+        basicForm.setDefaultImage(AppServiceInfoAdvancedPanel.QUICK_START_IMAGE.getFullImageName());
     }
 }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/webapp/runner/webappconfig/WebAppRunState.java

@@ -174,9 +174,8 @@ protected void onSuccess(WebAppBase<?, ?, ?> result, @NotNull RunProcessHandler
 
     @Override
     protected Map<String, String> getTelemetryMap() {
-        final Map<String, String> properties = new HashMap<>();
+        final Map<String, String> properties = new HashMap<>(OperationContext.action().getTelemetryProperties());
         properties.put("artifactType", webAppConfiguration.getAzureArtifactType() == null ? null : webAppConfiguration.getAzureArtifactType().name());
-        properties.putAll(webAppSettingModel.getTelemetryProperties(Collections.EMPTY_MAP));
         return properties;
     }