Merge pull request #6899 from microsoft/endgame-202208

Endgame 202208.next

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/java/com/microsoft/azure/toolkit/intellij/applicationinsights/IntelliJApplicationInsightsActionsContributor.java

@@ -38,6 +38,8 @@
 import java.util.function.BiConsumer;
 import java.util.function.BiPredicate;
 
+import static com.microsoft.azure.toolkit.lib.Azure.az;
+
 public class IntelliJApplicationInsightsActionsContributor implements IActionsContributor {
     @Override
     public void registerHandlers(AzureActionManager am) {
@@ -66,8 +68,7 @@ private static ApplicationInsightDraft getDraftApplicationInsight(@Nullable fina
 
         final Subscription historySub = CacheManager.getUsageHistory(Subscription.class).peek(subs::contains);
         final ResourceGroup historyRg = CacheManager.getUsageHistory(ResourceGroup.class)
-            .peek(r -> Objects.isNull(historySub) || r.getSubscriptionId().equals(historySub.getId()));
-        final Region historyRegion = CacheManager.getUsageHistory(Region.class).peek();
+            .peek(r -> Objects.isNull(historySub) ? subs.stream().anyMatch(s -> s.getId().equals(r.getSubscriptionId())) : r.getSubscriptionId().equals(historySub.getId()));
 
         final String timestamp = Utils.getTimestamp();
         final ResourceGroup rg = Optional.ofNullable(resourceGroup)
@@ -76,6 +77,8 @@ private static ApplicationInsightDraft getDraftApplicationInsight(@Nullable fina
         final Subscription subscription = Optional.ofNullable(rg).map(AzResource::getSubscription)
             .or(() -> Optional.ofNullable(historySub).filter(subs::contains))
             .orElse(subs.get(0));
+        final List<Region> regions = az(AzureAccount.class).listRegions(subscription.getId());
+        final Region historyRegion = CacheManager.getUsageHistory(Region.class).peek(regions::contains);
         final Region region = Optional.ofNullable(rg).map(ResourceGroup::getRegion)
             .or(() -> Optional.ofNullable(historyRegion))
             .orElse(null);

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/appservice/task/TriggerFunctionTask.java

@@ -21,6 +21,7 @@
 
 import javax.annotation.Nonnull;
 import java.util.List;
+import java.util.Objects;
 
 public class TriggerFunctionTask implements Task {
     public static final String FUNCTION_ID = "functionId";
@@ -41,7 +42,8 @@ public void execute() throws Exception {
         final String functionId = (String) context.getParameter(FUNCTION_ID);
         final String trigger = (String) context.getParameter(TRIGGER);
         final FunctionApp functionApp = Azure.az(AzureFunctions.class).functionApp(functionId);
-        final List<FunctionEntity> functionEntities = functionApp.listFunctions(true);
+        final List<FunctionEntity> functionEntities = Objects.requireNonNull(functionApp, String.format("failed to find function with id (%s) in Azure",
+                functionId)).listFunctions(true);
         final FunctionEntity target = functionEntities.stream().filter(entity -> StringUtils.equals(entity.getName(), trigger))
                 .findFirst().orElse(functionEntities.get(0));
         final Action.Id<FunctionEntity> action = PlatformUtils.isIdeaUltimate() ?

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

@@ -175,6 +175,7 @@ private void init() {
         this.selectorSubscription.addItemListener(this::onSubscriptionChanged);
         this.selectorRuntime.addItemListener(this::onRuntimeChanged);
         this.selectorRegion.addItemListener(this::onRegionChanged);
+        this.selectorGroup.addItemListener(this::onGroupChanged);
         this.textName.setRequired(true);
         this.selectorServicePlan.setRequired(true);
         this.selectorSubscription.setRequired(true);
@@ -196,6 +197,12 @@ private void init() {
         });
     }
 
+    private void onGroupChanged(ItemEvent e) {
+        if (e.getStateChange() == ItemEvent.SELECTED || e.getStateChange() == ItemEvent.DESELECTED) {
+            this.selectorServicePlan.setResourceGroup((ResourceGroup) e.getItem());
+        }
+    }
+
     private void onRegionChanged(final ItemEvent e) {
         if (e.getStateChange() == ItemEvent.SELECTED || e.getStateChange() == ItemEvent.DESELECTED) {
             final Region region = (Region) e.getItem();

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

@@ -19,6 +19,8 @@
 import com.microsoft.azure.toolkit.lib.common.model.Region;
 import com.microsoft.azure.toolkit.lib.common.model.Subscription;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
+import com.microsoft.azure.toolkit.lib.resource.ResourceGroup;
+import lombok.Setter;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -44,6 +46,8 @@ public class ServicePlanComboBox extends AzureComboBox<AppServicePlan> {
     private final List<AppServicePlanDraft> localItems = new ArrayList<>();
     private OperatingSystem os;
     private Region region;
+    @Setter
+    private ResourceGroup resourceGroup;
 
     private List<PricingTier> pricingTierList = new ArrayList<>(PricingTier.WEB_APP_PRICING);
     private PricingTier defaultPricingTier = PricingTier.BASIC_B2;
@@ -169,8 +173,10 @@ protected List<Extension> getExtensions() {
     }
 
     private void showServicePlanCreationPopup() {
-        final ServicePlanCreationDialog dialog = new ServicePlanCreationDialog(this.subscription, this.os, this.region, pricingTierList, defaultPricingTier);
+        final ServicePlanCreationDialog dialog = new ServicePlanCreationDialog(this.subscription, this.resourceGroup, pricingTierList, defaultPricingTier);
         dialog.setOkActionListener((plan) -> {
+            plan.setRegion(region);
+            plan.setOperatingSystem(os);
             this.localItems.add(0, plan);
             dialog.close();
             final List<AppServicePlan> items = this.getItems();

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

@@ -6,20 +6,23 @@
 package com.microsoft.azure.toolkit.intellij.legacy.appservice.serviceplan;
 
 import com.intellij.ui.components.JBLabel;
+import com.microsoft.applicationinsights.core.dependencies.apachecommons.lang3.ObjectUtils;
 import com.microsoft.azure.toolkit.intellij.common.AzureDialog;
 import com.microsoft.azure.toolkit.intellij.common.AzureTextInput;
 import com.microsoft.azure.toolkit.intellij.common.SwingUtils;
 import com.microsoft.azure.toolkit.lib.Azure;
 import com.microsoft.azure.toolkit.lib.appservice.AzureAppService;
 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.appservice.plan.AppServicePlanDraft;
 import com.microsoft.azure.toolkit.lib.common.form.AzureForm;
 import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
 import com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo;
 import com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo.AzureValidationInfoBuilder;
 import com.microsoft.azure.toolkit.lib.common.model.Region;
 import com.microsoft.azure.toolkit.lib.common.model.Subscription;
+import com.microsoft.azure.toolkit.lib.resource.ResourceGroup;
 import com.microsoft.intellij.util.ValidationUtils;
 
 import javax.annotation.Nullable;
@@ -32,21 +35,18 @@
 public class ServicePlanCreationDialog extends AzureDialog<AppServicePlanDraft>
     implements AzureForm<AppServicePlanDraft> {
     private Subscription subscription;
-    private OperatingSystem os;
-    private Region region;
+    private ResourceGroup resourceGroup;
     private JPanel contentPanel;
     private JBLabel labelDescription;
     private AzureTextInput textName;
     private PricingTierComboBox comboBoxPricingTier;
 
     public ServicePlanCreationDialog(final Subscription subscription,
-                                     OperatingSystem os,
-                                     Region region,
+                                     final ResourceGroup resourceGroup,
                                      final List<PricingTier> pricingTierList, final PricingTier defaultPricingTier) {
         super();
         this.subscription = subscription;
-        this.os = os;
-        this.region = region;
+        this.resourceGroup = resourceGroup;
         this.init();
         this.textName.addValidator(this::validateName);
         this.comboBoxPricingTier.setPricingTierList(pricingTierList);
@@ -56,11 +56,17 @@ public ServicePlanCreationDialog(final Subscription subscription,
     }
 
     private AzureValidationInfo validateName() {
+        final String value = this.textName.getValue();
         try {
-            ValidationUtils.validateAppServicePlanName(this.textName.getValue());
+            ValidationUtils.validateAppServicePlanName(value);
         } catch (final IllegalArgumentException e) {
-            final AzureValidationInfoBuilder builder = AzureValidationInfo.builder();
-            return builder.input(this.textName).type(AzureValidationInfo.Type.ERROR).message(e.getMessage()).build();
+            return AzureValidationInfo.error(e.getMessage(), this);
+        }
+        if (ObjectUtils.allNotNull(subscription, resourceGroup)) {
+            final AppServicePlan appServicePlan = Azure.az(AzureAppService.class).plans(subscription.getId()).get(value, resourceGroup.getName());
+            if (appServicePlan != null && appServicePlan.exists()) {
+                return AzureValidationInfo.error("App service plan name must be unique in each resource group.", this);
+            }
         }
         return AzureValidationInfo.success(this);
     }
@@ -85,15 +91,13 @@ protected JComponent createCenterPanel() {
     public AppServicePlanDraft getValue() {
         final AppServicePlanDraft draft = Azure.az(AzureAppService.class).plans(this.subscription.getId())
             .create(this.textName.getValue(), "<none>");
-        draft.setRegion(this.region).setOperatingSystem(this.os).setPricingTier(this.comboBoxPricingTier.getValue());
+        draft.setPricingTier(this.comboBoxPricingTier.getValue());
         return draft;
     }
 
     @Override
     public void setValue(final AppServicePlanDraft data) {
         this.subscription = data.getSubscription();
-        this.os = data.getOperatingSystem();
-        this.region = data.getRegion();
         this.textName.setValue(data.getName());
     }
 

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

@@ -86,7 +86,7 @@ public boolean show(IAzureMessage raw) {
             }
         });
         CacheManager.getUsageHistory(FunctionAppConfig.class).push(config);
-        return AzureTaskManager.getInstance().runInModalAsObservable(task).toSingle().doOnSuccess(app -> {
+        return AzureTaskManager.getInstance().runInBackgroundAsObservable(task).toSingle().doOnSuccess(app -> {
             AzureMessager.getMessager().success(message("function.create.success.message", app.name()), message("function.create.success.title"));
         });
     }

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

@@ -59,7 +59,7 @@ private RunnerAndConfigurationSettings getRunConfigurationSettings(RunManagerEx
             settings = manager.createConfiguration(runConfigurationName, factory);
         }
         final RunConfiguration runConfiguration = settings.getConfiguration();
-        if (runConfiguration instanceof FunctionDeployConfiguration && functionApp.getFormalStatus().isRunning()) {
+        if (runConfiguration instanceof FunctionDeployConfiguration && functionApp.getFormalStatus().isConnected()) {
             final FunctionAppConfig config = FunctionAppService.getInstance().getFunctionAppConfigFromExistingFunction(functionApp);
             ((FunctionDeployConfiguration) runConfiguration).saveConfig(config);
         }

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

@@ -77,7 +77,7 @@ private static Single<WebApp> createWebApp(final WebAppConfig config) {
             return WebAppService.getInstance().createWebApp(config);
         });
         CacheManager.getUsageHistory(WebAppConfig.class).push(config);
-        return AzureTaskManager.getInstance().runInModalAsObservable(task).toSingle().doOnSuccess(CreateWebAppAction::notifyCreationSuccess);
+        return AzureTaskManager.getInstance().runInBackgroundAsObservable(task).toSingle().doOnSuccess(CreateWebAppAction::notifyCreationSuccess);
     }
 
     @AzureOperation(name = "webapp.deploy_artifact.app", params = {"webapp.name()"}, type = AzureOperation.Type.ACTION)

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

@@ -154,15 +154,15 @@ private void updateApplicationSettings(AppServiceAppBase<?, ?, ?> deployTarget,
         if (deployTarget instanceof WebApp) {
             processHandler.setText("Updating application settings...");
             final WebAppDraft draft = (WebAppDraft) deployTarget.update();
-            webAppConfiguration.getAppSettingsToRemove().forEach(draft::removeAppSetting);
+            Optional.ofNullable(webAppConfiguration.getAppSettingsToRemove()).ifPresent(keys -> keys.forEach(draft::removeAppSetting));
             draft.setAppSettings(applicationSettings);
             draft.updateIfExist();
             processHandler.setText("Update application settings successfully.");
         } else if (deployTarget instanceof WebAppDeploymentSlot) {
             processHandler.setText("Updating deployment slot application settings...");
             final WebAppDeploymentSlotDraft update = (WebAppDeploymentSlotDraft) deployTarget.update();
             update.setAppSettings(applicationSettings);
-            webAppConfiguration.getAppSettingsToRemove().forEach(update::removeAppSetting);
+            Optional.ofNullable(webAppConfiguration.getAppSettingsToRemove()).ifPresent(keys -> keys.forEach(update::removeAppSetting));
             update.updateIfExist();
             processHandler.setText("Update deployment slot application settings successfully.");
         }

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

@@ -101,7 +101,7 @@ public FunctionApp createFunctionApp(final FunctionAppConfig config) {
         draft.setRuntime(config.getRuntime());
         draft.setAppSettings(appSettings);
         draft.setDiagnosticConfig(config.getMonitorConfig().getDiagnosticConfig());
-        return draft.createIfNotExist();
+        return draft.commit();
     }
 
     private Map<String, String> getAppSettings(final FunctionAppConfig config) {