service plan is created under a newly created resource group but not the selected resource group when creating a function app.

Author: wangmingliang-ms

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

@@ -30,7 +30,6 @@
 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.*;
@@ -97,8 +96,11 @@ public T getValue() {
         config.setRuntime(runtime);
         config.setRegion(region);
         final AppServicePlanConfig planConfig = AppServicePlanConfig.fromResource(servicePlan);
-        planConfig.setResourceGroupName(StringUtils.firstNonBlank(planConfig.getResourceGroupName(), config.getResourceGroupName()));
-        planConfig.setRegion(ObjectUtils.firstNonNull(planConfig.getRegion(), config.getRegion()));
+        if (Objects.nonNull(planConfig) && servicePlan.isDraftForCreating()) {
+            planConfig.setResourceGroupName(config.getResourceGroupName());
+            planConfig.setRegion(region);
+            planConfig.setOs(Objects.requireNonNull(runtime).getOperatingSystem());
+        }
         config.setServicePlan(planConfig);
         if (Objects.nonNull(artifact)) {
             final AzureArtifactManager manager = AzureArtifactManager.getInstance(this.project);