Merge pull request #5273 from microsoft/feature-track2-common-resource-2

andxu · web-flow · commit f9db2df9ab87 · 2021-05-21T02:30:32.000-07:00
Feature track2 common resource 2
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/AppServiceInfoAdvancedPanel.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/AppServiceInfoAdvancedPanel.java
@@ -9,7 +9,7 @@
 import com.intellij.ui.TitledSeparator;
 import com.microsoft.azure.management.appservice.AppServicePlan;
 import com.microsoft.azure.management.appservice.OperatingSystem;
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.toolkit.intellij.appservice.platform.PlatformComboBox;
 import com.microsoft.azure.toolkit.intellij.appservice.region.RegionComboBox;
 import com.microsoft.azure.toolkit.intellij.appservice.resourcegroup.ResourceGroupComboBox;
@@ -198,7 +198,10 @@ private void onSubscriptionChanged(final ItemEvent e) {
     private void onServicePlanChanged(final ItemEvent e) {
         if (e.getStateChange() == ItemEvent.SELECTED) {
             final AppServicePlan plan = (AppServicePlan) e.getItem();
-            final String pricing = plan.pricingTier() == AzureFunctionMvpModel.CONSUMPTION_PRICING_TIER ?
+            if (plan.pricingTier() == null) {
+                return;
+            }
+            final String pricing = StringUtils.equals(plan.pricingTier().toSkuDescription().tier(), AzureFunctionMvpModel.CONSUMPTION_PRICING_TIER.getTier()) ?
                                    "Consumption" : plan.pricingTier().toString();
             this.textSku.setText(pricing);
         } else if (e.getStateChange() == ItemEvent.DESELECTED) {
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/region/RegionComboBox.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/region/RegionComboBox.java
@@ -5,7 +5,7 @@
 
 package com.microsoft.azure.toolkit.intellij.appservice.region;
 
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.toolkit.intellij.common.AzureComboBox;
 import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
 import com.microsoft.azure.toolkit.lib.common.model.Region;
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/serviceplan/PricingTierComboBox.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/serviceplan/PricingTierComboBox.java
@@ -5,13 +5,14 @@
 
 package com.microsoft.azure.toolkit.intellij.appservice.serviceplan;
 
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.toolkit.intellij.common.AzureComboBox;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
 import com.microsoft.azuretools.core.mvp.model.function.AzureFunctionMvpModel;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import static com.microsoft.intellij.ui.messages.AzureBundle.message;
 
@@ -33,7 +34,12 @@ public void setPricingTierList(final List<PricingTier> pricingTierList) {
 
     @Override
     protected String getItemText(final Object item) {
-        return item == AzureFunctionMvpModel.CONSUMPTION_PRICING_TIER ? message("appService.pricingTier.consumption") : super.getItemText(item);
+        if (Objects.isNull(item)) {
+            return EMPTY_ITEM;
+        }
+        PricingTier pricingTier = (PricingTier) item;
+        return pricingTier == AzureFunctionMvpModel.CONSUMPTION_PRICING_TIER ? message("appService.pricingTier.consumption") :
+            pricingTier.getTier() + "_" + pricingTier.getSize();
     }
 
     @NotNull
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/serviceplan/ServicePlanComboBox.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/serviceplan/ServicePlanComboBox.java
@@ -9,7 +9,7 @@
 import com.intellij.ui.components.fields.ExtendableTextComponent;
 import com.microsoft.azure.management.appservice.AppServicePlan;
 import com.microsoft.azure.management.appservice.OperatingSystem;
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.toolkit.intellij.common.AzureComboBox;
 import com.microsoft.azure.toolkit.intellij.common.Draft;
 import com.microsoft.azure.toolkit.lib.appservice.DraftServicePlan;
@@ -38,7 +38,7 @@ public class ServicePlanComboBox extends AzureComboBox<AppServicePlan> {
     private OperatingSystem os;
     private Region region;
 
-    private List<PricingTier> pricingTierList = new ArrayList<>(PricingTier.getAll());
+    private List<PricingTier> pricingTierList = new ArrayList<>(PricingTier.WEB_APP_PRICING);
     private PricingTier defaultPricingTier = PricingTier.BASIC_B2;
 
     private Predicate<AppServicePlan> servicePlanFilter;
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/serviceplan/ServicePlanCreationDialog.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/serviceplan/ServicePlanCreationDialog.java
@@ -7,7 +7,7 @@
 
 import com.intellij.ui.components.JBLabel;
 import com.microsoft.azure.management.appservice.OperatingSystem;
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.toolkit.intellij.common.AzureDialog;
 import com.microsoft.azure.toolkit.intellij.common.SwingUtils;
 import com.microsoft.azure.toolkit.intellij.common.ValidationDebouncedTextInput;
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/FunctionAppConfigFormPanelAdvance.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/FunctionAppConfigFormPanelAdvance.java
@@ -8,7 +8,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.ui.DocumentAdapter;
 import com.microsoft.azure.management.appservice.OperatingSystem;
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.toolkit.intellij.appservice.AppServiceInfoAdvancedPanel;
 import com.microsoft.azure.toolkit.intellij.appservice.AppServiceMonitorPanel;
 import com.microsoft.azure.toolkit.intellij.appservice.insights.ApplicationInsightsComboBox;
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/component/AppServicePlanPanel.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/component/AppServicePlanPanel.java
@@ -9,7 +9,7 @@
 import com.intellij.ui.SimpleListCellRenderer;
 import com.microsoft.azure.management.appservice.AppServicePlan;
 import com.microsoft.azure.management.appservice.OperatingSystem;
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.toolkit.lib.common.model.Region;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
@@ -92,7 +92,7 @@ public String getAppServicePlanRegion() {
     }
 
     public String getAppServicePlanPricingTier() {
-        return selectedAppServicePlan == null ? null : selectedAppServicePlan.getPricingTier().toSkuDescription().size();
+        return selectedAppServicePlan == null ? null : selectedAppServicePlan.getPricingTier().getSize();
     }
 
     public String getAppServicePlanResourceGroup() {
@@ -217,7 +217,7 @@ public AppServicePlanWrapper(AppServicePlan appServicePlan) {
             this.isNewCreate = false;
             this.name = appServicePlan.name();
             this.region = Region.fromName(appServicePlan.region().name());
-            this.pricingTier = appServicePlan.pricingTier();
+            this.pricingTier = fromPricingTier(appServicePlan.pricingTier());
             this.operatingSystem = appServicePlan.operatingSystem();
             this.resourceGroup = appServicePlan.resourceGroupName();
         }
@@ -258,4 +258,11 @@ public String toString() {
             return isNewCreate ? String.format(NEW_CREATED_RESOURCE, name) : String.format("%s (Resource Group: %s)", name, resourceGroup);
         }
     }
+
+    static PricingTier fromPricingTier(com.microsoft.azure.management.appservice.PricingTier pricingTier) {
+        return PricingTier.values().stream()
+            .filter(value -> StringUtils.equals(value.getSize(), pricingTier.toSkuDescription().size()) &&
+                StringUtils.equals(value.getTier(), pricingTier.toSkuDescription().tier()))
+            .findFirst().orElse(null);
+    }
 }
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/component/NewAppServicePlanDialog.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/component/NewAppServicePlanDialog.java
@@ -7,7 +7,7 @@
 
 import com.intellij.openapi.ui.ValidationInfo;
 import com.intellij.ui.ListCellRendererWrapper;
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.management.appservice.SkuName;
 import com.microsoft.azure.toolkit.lib.common.model.Region;
 import com.microsoft.azuretools.core.mvp.model.function.AzureFunctionMvpModel;
@@ -157,7 +157,7 @@ private void onLoadPricingTier() {
 
     // We will mark function only pricing tier as recommend
     private static boolean isRecommendPricingTier(PricingTier pricingTier) {
-        final String tier = pricingTier.toSkuDescription().tier();
+        final String tier = pricingTier.getTier();
         return pricingTier == CONSUMPTION_PRICING_TIER || StringUtils.equals(SkuName.ELASTIC_PREMIUM.toString(), tier);
     }
 }
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/WebAppConfigFormPanelAdvance.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/WebAppConfigFormPanelAdvance.java
@@ -7,7 +7,7 @@
 
 import com.intellij.openapi.project.Project;
 import com.microsoft.azure.management.appservice.OperatingSystem;
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.toolkit.intellij.appservice.AppServiceInfoAdvancedPanel;
 import com.microsoft.azure.toolkit.intellij.appservice.AppServiceMonitorPanel;
 import com.microsoft.azure.toolkit.intellij.common.AzureFormPanel;
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/WebAppCreationDialog.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/WebAppCreationDialog.java
@@ -6,7 +6,7 @@
 package com.microsoft.azure.toolkit.intellij.webapp;
 
 import com.intellij.openapi.project.Project;
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.toolkit.intellij.appservice.AppConfigDialog;
 import com.microsoft.azure.toolkit.intellij.appservice.AppServiceInfoBasicPanel;
 import com.microsoft.azure.toolkit.intellij.common.AzureFormPanel;
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/docker/utils/Constant.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/docker/utils/Constant.java
@@ -5,7 +5,7 @@
 
 package com.microsoft.azure.toolkit.intellij.webapp.docker.utils;
 
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 
 public class Constant {
     public static final int TIMEOUT_STOP_CONTAINER = 5;
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/docker/webapponlinux/ui/SettingPanel.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/docker/webapponlinux/ui/SettingPanel.java
@@ -25,7 +25,7 @@
 import com.intellij.ui.ToolbarDecorator;
 import com.intellij.ui.table.JBTable;
 import com.microsoft.azure.management.appservice.AppServicePlan;
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.management.appservice.WebApp;
 import com.microsoft.azuretools.azurecommons.util.Utils;
 import com.microsoft.azuretools.core.mvp.model.ResourceEx;
@@ -414,8 +414,8 @@ public void apply(WebAppOnLinuxDeployConfiguration webAppOnLinuxDeployConfigurat
 
                 PricingTier selectedPricingTier = (PricingTier) cbPricing.getSelectedItem();
                 if (selectedPricingTier != null) {
-                    webAppOnLinuxDeployConfiguration.setPricingSkuTier(selectedPricingTier.toSkuDescription().tier());
-                    webAppOnLinuxDeployConfiguration.setPricingSkuSize(selectedPricingTier.toSkuDescription().size());
+                    webAppOnLinuxDeployConfiguration.setPricingSkuTier(selectedPricingTier.getTier());
+                    webAppOnLinuxDeployConfiguration.setPricingSkuSize(selectedPricingTier.getSize());
                 } else {
                     webAppOnLinuxDeployConfiguration.setPricingSkuTier(null);
                     webAppOnLinuxDeployConfiguration.setPricingSkuSize(null);
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/runner/Constants.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/runner/Constants.java
@@ -5,7 +5,7 @@
 
 package com.microsoft.azure.toolkit.intellij.webapp.runner;
 
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 
 public class Constants {
     public static final String LINUX_JAVA_SE_RUNTIME = "JAVA|8-jre8";
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/lib/appservice/AppServiceConfig.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/lib/appservice/AppServiceConfig.java
@@ -6,7 +6,7 @@
 package com.microsoft.azure.toolkit.lib.appservice;
 
 import com.microsoft.azure.management.appservice.AppServicePlan;
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.toolkit.lib.common.model.Region;
 import com.microsoft.azure.toolkit.lib.common.model.ResourceGroup;
 import com.microsoft.azure.toolkit.lib.common.model.Subscription;
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/lib/appservice/DraftServicePlan.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/lib/appservice/DraftServicePlan.java
@@ -7,7 +7,8 @@
 
 import com.microsoft.azure.management.appservice.AppServicePlan;
 import com.microsoft.azure.management.appservice.OperatingSystem;
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.management.appservice.SkuDescription;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.management.appservice.implementation.AppServiceManager;
 import com.microsoft.azure.management.appservice.implementation.AppServicePlanInner;
 import com.microsoft.azure.toolkit.intellij.common.Draft;
@@ -49,8 +50,11 @@ public com.microsoft.azure.management.resources.fluentcore.arm.Region region() {
     }
 
     @Override
-    public PricingTier pricingTier() {
-        return this.tier;
+    public com.microsoft.azure.management.appservice.PricingTier pricingTier() {
+        if (tier == null) {
+            return null;
+        }
+        return toPricingTier(this.tier);
     }
 
     @Override
@@ -127,4 +131,9 @@ public Observable<AppServicePlan> refreshAsync() {
     public Update update() {
         throw new OperationNotSupportedException();
     }
+
+    private static com.microsoft.azure.management.appservice.PricingTier toPricingTier(PricingTier pricingTier) {
+        final SkuDescription skuDescription = new SkuDescription().withTier(pricingTier.getTier()).withSize(pricingTier.getSize());
+        return com.microsoft.azure.management.appservice.PricingTier.fromSkuDescription(skuDescription);
+    }
 }
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/lib/webapp/WebAppConfig.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/lib/webapp/WebAppConfig.java
@@ -5,7 +5,7 @@
 
 package com.microsoft.azure.toolkit.lib.webapp;
 
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.toolkit.lib.appservice.AppServiceConfig;
 import com.microsoft.azure.toolkit.lib.appservice.Platform;
 import lombok.Builder;
diff --git a/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/container/WebAppOnLinuxDeployPresenter.java b/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/container/WebAppOnLinuxDeployPresenter.java
@@ -6,7 +6,7 @@
 package com.microsoft.tooling.msservices.serviceexplorer.azure.container;
 
 import com.microsoft.azure.management.appservice.OperatingSystem;
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.management.appservice.WebApp;
 import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
 import com.microsoft.azuretools.core.mvp.model.AzureMvpModel;
diff --git a/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/container/WebAppOnLinuxDeployView.java b/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/container/WebAppOnLinuxDeployView.java
@@ -6,7 +6,7 @@
 package com.microsoft.tooling.msservices.serviceexplorer.azure.container;
 
 import com.microsoft.azure.management.appservice.AppServicePlan;
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.management.appservice.WebApp;
 import com.microsoft.azure.toolkit.lib.common.model.Region;
 import com.microsoft.azure.toolkit.lib.common.model.ResourceGroup;
diff --git a/Utils/azuretools-core/src/com/microsoft/azuretools/core/mvp/model/AzureMvpModel.java b/Utils/azuretools-core/src/com/microsoft/azuretools/core/mvp/model/AzureMvpModel.java
@@ -6,7 +6,7 @@
 package com.microsoft.azuretools.core.mvp.model;
 
 import com.microsoft.azure.management.Azure;
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.management.resources.Deployment;
 import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
 import com.microsoft.azure.toolkit.lib.common.model.Region;
@@ -29,6 +29,7 @@
 import java.util.stream.Collectors;
 
 import static com.microsoft.azure.toolkit.lib.Azure.az;
+import static com.microsoft.azure.toolkit.lib.appservice.model.PricingTier.WEB_APP_PRICING;
 
 public class AzureMvpModel {
 
@@ -252,7 +253,7 @@ public List<Region> listLocationsBySubscriptionId(String sid) {
         type = AzureOperation.Type.SERVICE
     )
     public List<PricingTier> listPricingTier() {
-        final List<PricingTier> ret = new ArrayList<>(PricingTier.getAll());
+        final List<PricingTier> ret = new ArrayList<>(WEB_APP_PRICING);
         ret.sort(getComparator(PricingTier::toString));
         return correctPricingTiers(ret);
     }
diff --git a/Utils/azuretools-core/src/com/microsoft/azuretools/core/mvp/model/function/AzureFunctionMvpModel.java b/Utils/azuretools-core/src/com/microsoft/azuretools/core/mvp/model/function/AzureFunctionMvpModel.java
@@ -7,8 +7,17 @@
 
 import com.microsoft.azure.PagedList;
 import com.microsoft.azure.management.Azure;
-import com.microsoft.azure.management.appservice.*;
+import com.microsoft.azure.management.appservice.AppServicePlan;
+import com.microsoft.azure.management.appservice.ApplicationLogsConfig;
+import com.microsoft.azure.management.appservice.FunctionApp;
+import com.microsoft.azure.management.appservice.FunctionApps;
+import com.microsoft.azure.management.appservice.FunctionEnvelope;
+import com.microsoft.azure.management.appservice.LogLevel;
+import com.microsoft.azure.management.appservice.SkuName;
+import com.microsoft.azure.management.appservice.WebAppBase;
+import com.microsoft.azure.management.appservice.WebAppDiagnosticLogs;
 import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
 import com.microsoft.azure.toolkit.lib.common.cache.CacheEvict;
 import com.microsoft.azure.toolkit.lib.common.cache.Cacheable;
@@ -22,13 +31,18 @@
 import com.microsoft.azuretools.core.mvp.model.webapp.AppServiceUtils;
 import com.microsoft.azuretools.utils.WebAppUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import static com.microsoft.azure.toolkit.lib.Azure.az;
 
 public class AzureFunctionMvpModel {
-    public static final PricingTier CONSUMPTION_PRICING_TIER = new PricingTier("Consumption", "");
+    public static final PricingTier CONSUMPTION_PRICING_TIER = PricingTier.CONSUMPTION;
     public static final String SUBSCRIPTION_FUNCTIONS = "subscription-functions";
 
     public static AzureFunctionMvpModel getInstance() {
diff --git a/Utils/azuretools-core/src/com/microsoft/azuretools/core/mvp/model/webapp/AzureWebAppMvpModel.java b/Utils/azuretools-core/src/com/microsoft/azuretools/core/mvp/model/webapp/AzureWebAppMvpModel.java
@@ -14,7 +14,7 @@
 import com.microsoft.azure.management.appservice.DeploymentSlot;
 import com.microsoft.azure.management.appservice.LogLevel;
 import com.microsoft.azure.management.appservice.OperatingSystem;
-import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.management.appservice.PublishingProfileFormat;
 import com.microsoft.azure.management.appservice.RuntimeStack;
 import com.microsoft.azure.management.appservice.SkuName;
@@ -255,7 +255,8 @@ private AppServicePlan.DefinitionStages.WithCreate prepareWithCreate(@NotNull Az
         if (tierSize.length != 2) {
             throw new IllegalArgumentException("invalid price tier");
         }
-        final PricingTier pricingTier = new PricingTier(tierSize[0], tierSize[1]);
+        final com.microsoft.azure.management.appservice.PricingTier pricingTier =
+            new com.microsoft.azure.management.appservice.PricingTier(tierSize[0], tierSize[1]);
 
         final AppServicePlan.DefinitionStages.WithGroup withGroup = azure
             .appServices()
@@ -357,7 +358,8 @@ public WebApp createWebAppWithPrivateRegistryImage(@NotNull WebAppOnLinuxDeployM
         final PrivateRegistryImageSetting pr = model.getPrivateRegistryImageSetting();
         final WebApp app;
         final Azure azure = AuthMethodManager.getInstance().getAzureClient(model.getSubscriptionId());
-        final PricingTier pricingTier = new PricingTier(model.getPricingSkuTier(), model.getPricingSkuSize());
+        final com.microsoft.azure.management.appservice.PricingTier pricingTier =
+            new com.microsoft.azure.management.appservice.PricingTier(model.getPricingSkuTier(), model.getPricingSkuSize());
 
         final WebApp.DefinitionStages.Blank webAppDefinition = azure.webApps().define(model.getWebAppName());
         if (model.isCreatingNewAppServicePlan()) {
@@ -949,10 +951,10 @@ public static void enableHttpLog(WebAppBase.Update webApp) {
         type = AzureOperation.Type.SERVICE
     )
     public List<Region> getAvailableRegions(String subscriptionId, PricingTier pricingTier) {
-        if (StringUtils.isEmpty(subscriptionId) || pricingTier == null || pricingTier.toSkuDescription() == null) {
+        if (StringUtils.isEmpty(subscriptionId) || pricingTier == null) {
             return Collections.emptyList();
         }
-        final SkuName skuName = SkuName.fromString(pricingTier.toSkuDescription().tier());
+        final SkuName skuName = SkuName.fromString(pricingTier.getTier());
         final List<GeoRegionInner> geoRegionInnerList = AuthMethodManager.getInstance()
                                                                          .getAzureClient(subscriptionId)
                                                                          .appServices()

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`import com.intellij.ui.SimpleListCellRenderer;`
`10`	`10`	`import com.microsoft.azure.management.appservice.AppServicePlan;`
`11`	`11`	`import com.microsoft.azure.management.appservice.OperatingSystem;`
`12`		`-import com.microsoft.azure.management.appservice.PricingTier;`
	`12`	`+import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;`
`13`	`13`	`import com.microsoft.azure.toolkit.lib.common.model.Region;`
`14`	`14`	`import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;`
`15`	`15`	`import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;`
`@@ -92,7 +92,7 @@ public String getAppServicePlanRegion() {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`public String getAppServicePlanPricingTier() {`
`95`		`- return selectedAppServicePlan == null ? null : selectedAppServicePlan.getPricingTier().toSkuDescription().size();`
	`95`	`+ return selectedAppServicePlan == null ? null : selectedAppServicePlan.getPricingTier().getSize();`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`public String getAppServicePlanResourceGroup() {`
`@@ -217,7 +217,7 @@ public AppServicePlanWrapper(AppServicePlan appServicePlan) {`
`217`	`217`	`this.isNewCreate = false;`
`218`	`218`	`this.name = appServicePlan.name();`
`219`	`219`	`this.region = Region.fromName(appServicePlan.region().name());`
`220`		`- this.pricingTier = appServicePlan.pricingTier();`
	`220`	`+ this.pricingTier = fromPricingTier(appServicePlan.pricingTier());`
`221`	`221`	`this.operatingSystem = appServicePlan.operatingSystem();`
`222`	`222`	`this.resourceGroup = appServicePlan.resourceGroupName();`
`223`	`223`	`}`
`@@ -258,4 +258,11 @@ public String toString() {`
`258`	`258`	`return isNewCreate ? String.format(NEW_CREATED_RESOURCE, name) : String.format("%s (Resource Group: %s)", name, resourceGroup);`
`259`	`259`	`}`
`260`	`260`	`}`
	`261`	`+`
	`262`	`+ static PricingTier fromPricingTier(com.microsoft.azure.management.appservice.PricingTier pricingTier) {`
	`263`	`+ return PricingTier.values().stream()`
	`264`	`+ .filter(value -> StringUtils.equals(value.getSize(), pricingTier.toSkuDescription().size()) &&`
	`265`	`+ StringUtils.equals(value.getTier(), pricingTier.toSkuDescription().tier()))`
	`266`	`+ .findFirst().orElse(null);`
	`267`	`+ }`
`261`	`268`	`}`