#1951398: [Test]Failed to create App Service plan

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/src/com/microsoft/azure/toolkit/eclipse/appservice/AppServiceCreationComposite.java

@@ -12,6 +12,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
@@ -107,10 +108,14 @@ public T getValue() {
         result.setName(instanceDetailPanel.getAppName());
         result.setRegion(instanceDetailPanel.getResourceRegion());
         result.setRuntime(Runtime.getRuntime(runtime.os(), runtime.webContainer(), runtime.javaVersion()));
-        result.setServicePlan(AppServicePlanConfig.fromResource(appServicePlanPanel.getServicePlan()));
         result.setPricingTier(Optional.ofNullable(appServicePlanPanel.getServicePlan())
                 .map(AppServicePlan::getPricingTier).orElse(null));
         result.setAppSettings(new HashMap<>());
+        final AppServicePlanConfig planConfig = AppServicePlanConfig.fromResource(appServicePlanPanel.getServicePlan());
+        planConfig.setResourceGroupName(
+                StringUtils.firstNonBlank(planConfig.getResourceGroupName(), result.getResourceGroupName()));
+        planConfig.setRegion(ObjectUtils.firstNonNull(planConfig.getRegion(), result.getRegion()));
+        result.setServicePlan(planConfig);
         return result;
     }
 

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/src/com/microsoft/azure/toolkit/eclipse/appservice/serviceplan/ServicePlanCreationDialog.java

@@ -79,6 +79,7 @@ protected Control createDialogArea(Composite parent) {
         lblPricingTier.setText("Pricing tier:");
 
         pricingTierCombobox = new PricingTierCombobox(container, this.pricingTiers);
+        pricingTierCombobox.setValue(PricingTier.BASIC_B1);
         pricingTierCombobox.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
         pricingTierCombobox.setLabeledBy(lblPricingTier);
 

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

@@ -30,6 +30,7 @@
 import com.microsoft.azure.toolkit.lib.resource.ResourceGroupConfig;
 import com.microsoft.azuretools.utils.WebAppUtils;
 import org.apache.commons.compress.utils.FileNameUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.swing.*;
@@ -95,7 +96,10 @@ public T getValue() {
         config.setName(name);
         config.setRuntime(runtime);
         config.setRegion(region);
-        config.setServicePlan(AppServicePlanConfig.fromResource(servicePlan));
+        final AppServicePlanConfig planConfig = AppServicePlanConfig.fromResource(servicePlan);
+        planConfig.setResourceGroupName(StringUtils.firstNonBlank(planConfig.getResourceGroupName(), config.getResourceGroupName()));
+        planConfig.setRegion(ObjectUtils.firstNonNull(planConfig.getRegion(), config.getRegion()));
+        config.setServicePlan(planConfig);
         if (Objects.nonNull(artifact)) {
             final AzureArtifactManager manager = AzureArtifactManager.getInstance(this.project);
             final String path = manager.getFileForDeployment(this.selectorApplication.getValue());