Merge pull request #6461 from microsoft/clean-up-deprecated-model

Remove deprecated function deploy configuration model

Author: wangmingliang-ms

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

@@ -19,13 +19,13 @@
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.WriteExternalException;
 import com.intellij.util.xmlb.XmlSerializer;
+import com.microsoft.azure.toolkit.ide.appservice.function.FunctionAppConfig;
 import com.microsoft.azure.toolkit.intellij.legacy.common.AzureRunConfigurationBase;
 import com.microsoft.azure.toolkit.intellij.legacy.function.runner.core.FunctionUtils;
 import com.microsoft.azure.toolkit.lib.appservice.model.JavaVersion;
 import com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem;
 import com.microsoft.azure.toolkit.lib.appservice.model.Runtime;
 import com.microsoft.azure.toolkit.lib.common.model.Subscription;
-import com.microsoft.azure.toolkit.ide.appservice.function.FunctionAppConfig;
 import org.apache.commons.lang3.StringUtils;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
@@ -168,10 +168,7 @@ public void setFunctionId(String id) {
     public void readExternal(Element element) throws InvalidDataException {
         this.functionDeployModel = Optional.ofNullable(element.getChild("FunctionDeployModel"))
                 .map(e -> XmlSerializer.deserialize(e, FunctionDeployModel.class))
-                .orElseGet(() -> Optional.of(element)
-                        .map(e -> XmlSerializer.deserialize(e, FunctionDeployModel.DeprecatedDeployModel.class))
-                        .map(FunctionDeployModel::new)
-                        .orElse(new FunctionDeployModel()));
+                .orElseGet(FunctionDeployModel::new);
     }
 
     @Override

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

@@ -5,27 +5,13 @@
 
 package com.microsoft.azure.toolkit.intellij.legacy.function.runner.deploy;
 
-import com.microsoft.azure.toolkit.ide.appservice.model.ApplicationInsightsConfig;
-import com.microsoft.azure.toolkit.ide.appservice.model.MonitorConfig;
-import com.microsoft.azure.toolkit.intellij.legacy.function.runner.core.FunctionUtils;
-import com.microsoft.azure.toolkit.lib.appservice.entity.AppServicePlanEntity;
-import com.microsoft.azure.toolkit.lib.appservice.model.DiagnosticConfig;
-import com.microsoft.azure.toolkit.lib.appservice.model.JavaVersion;
-import com.microsoft.azure.toolkit.lib.appservice.model.LogLevel;
-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.model.Runtime;
-import com.microsoft.azure.toolkit.lib.appservice.model.WebContainer;
-import com.microsoft.azure.toolkit.lib.common.model.ResourceGroup;
-import com.microsoft.azure.toolkit.lib.common.model.Subscription;
 import com.microsoft.azure.toolkit.ide.appservice.function.FunctionAppConfig;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
@@ -40,70 +26,7 @@ public class FunctionDeployModel {
 
     private FunctionAppConfig functionAppConfig = FunctionAppConfig.builder().build();
 
-    public FunctionDeployModel(DeprecatedDeployModel deprecatedDeployModel) {
-        this.moduleName = deprecatedDeployModel.moduleName;
-        this.appSettingsKey = deprecatedDeployModel.appSettingsKey;
-        this.deploymentStagingDirectoryPath = deprecatedDeployModel.deploymentStagingDirectoryPath;
-        final Subscription subscription = Subscription.builder().id(deprecatedDeployModel.subscription).build();
-        final PricingTier pricingTier = PricingTier.fromString(deprecatedDeployModel.pricingTier);
-        final OperatingSystem operatingSystem = OperatingSystem.fromString(deprecatedDeployModel.os);
-        final JavaVersion javaVersion = JavaVersion.fromString(deprecatedDeployModel.javaVersion);
-        final Runtime runtime = Runtime.getRuntime(operatingSystem, WebContainer.JAVA_OFF, javaVersion);
-        final ApplicationInsightsConfig insightsConfig = ApplicationInsightsConfig.builder()
-                .name(deprecatedDeployModel.insightsName)
-                .instrumentationKey(deprecatedDeployModel.instrumentationKey).build();
-        final DiagnosticConfig diagnosticConfig = DiagnosticConfig.builder()
-                .enableApplicationLog(deprecatedDeployModel.enableApplicationLog)
-                .applicationLogLevel(deprecatedDeployModel.applicationLogLevel).build();
-        final MonitorConfig monitorConfig = MonitorConfig.builder().applicationInsightsConfig(insightsConfig).diagnosticConfig(diagnosticConfig).build();
-        final ResourceGroup resourceGroup = ResourceGroup.builder().name(deprecatedDeployModel.resourceGroup).region(deprecatedDeployModel.region).build();
-        final AppServicePlanEntity appServicePlan = AppServicePlanEntity.builder()
-                .name(deprecatedDeployModel.appServicePlanName)
-                .resourceGroup(deprecatedDeployModel.resourceGroup)
-                .region(deprecatedDeployModel.region)
-                .pricingTier(pricingTier).build();
-        this.functionAppConfig = FunctionAppConfig.builder()
-                .resourceId(deprecatedDeployModel.functionId)
-                .subscription(subscription)
-                .resourceGroup(resourceGroup)
-                .name(deprecatedDeployModel.appName)
-                .servicePlan(appServicePlan)
-                .pricingTier(pricingTier)
-                .runtime(runtime)
-                .monitorConfig(monitorConfig)
-                .appSettings(FunctionUtils.loadAppSettingsFromSecurityStorage(appSettingsKey))
-                .build();
-    }
-
     public Map<String, String> getTelemetryProperties() {
         return Optional.ofNullable(functionAppConfig).map(FunctionAppConfig::getTelemetryProperties).orElse(Collections.emptyMap());
     }
-
-    // for migrate old configuration to new resource config
-    @Getter
-    @Setter
-    @NoArgsConstructor
-    @AllArgsConstructor
-    static class DeprecatedDeployModel {
-        private boolean isNewResource;
-        private String functionId;
-        private boolean enableApplicationLog;
-        private LogLevel applicationLogLevel;
-        private String subscription;
-        private String resourceGroup;
-        private String appName;
-        private String region;
-        private String pricingTier;
-        private String appServicePlanResourceGroup;
-        private String appServicePlanName;
-        private String deploymentStagingDirectoryPath;
-        private String deployment;
-        private Map<String, String> appSettings = new HashMap<>();
-        private String appSettingsKey;
-        private String moduleName;
-        private String insightsName;
-        private String instrumentationKey;
-        private String os;
-        private String javaVersion;
-    }
 }