Merge pull request #6907 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/task/OpenLiveMetricsTask.java

@@ -16,6 +16,7 @@
 import javax.annotation.Nonnull;
 
 import java.util.List;
+import java.util.Objects;
 
 import static com.microsoft.azure.toolkit.ide.applicationinsights.ApplicationInsightsActionsContributor.LIVE_METRICS;
 
@@ -46,7 +47,8 @@ public void execute() throws Exception {
 
     private ApplicationInsight getInsightsById(@Nonnull final String id) {
         final ResourceId resourceId = ResourceId.fromString(id);
-        return Azure.az(AzureApplicationInsights.class).applicationInsights(resourceId.subscriptionId()).get(id);
+        return Objects.requireNonNull(Azure.az(AzureApplicationInsights.class).applicationInsights(resourceId.subscriptionId()).get(id),
+                String.format("Failed to find the application insights instance with id %s", id));
     }
 
     private ApplicationInsight getInsightsByInstrumentKey(@Nonnull final String instrumentKey) {

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

@@ -10,6 +10,8 @@
 
 import javax.annotation.Nonnull;
 
+import java.util.Objects;
+
 import static com.microsoft.azure.toolkit.ide.appservice.AppServiceActionsContributor.OPEN_IN_BROWSER;
 
 
@@ -24,8 +26,8 @@ public OpenInBrowserTask(@Nonnull final ComponentContext context) {
     @Override
     @AzureOperation(name = "guidance.open_in_browser", type = AzureOperation.Type.SERVICE)
     public void execute() throws Exception {
-        final String webAppId = (String) context.getParameter("webappId");
-        final WebApp webApp = Azure.az(AzureWebApp.class).webApp(webAppId);
+        final String webAppId = Objects.requireNonNull((String) context.getParameter("webappId"), "Failed to get the web app id created in tasks");
+        final WebApp webApp = Objects.requireNonNull(Azure.az(AzureWebApp.class).webApp(webAppId), String.format("failed to find web app with id (%s) in Azure", webAppId));
         AzureActionManager.getInstance().getAction(OPEN_IN_BROWSER).handle(webApp);
     }
 

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

@@ -39,7 +39,7 @@ public TriggerFunctionTask(@Nonnull ComponentContext context) {
     @Override
     @AzureOperation(name = "guidance.trigger_function", type = AzureOperation.Type.SERVICE)
     public void execute() throws Exception {
-        final String functionId = (String) context.getParameter(FUNCTION_ID);
+        final String functionId = Objects.requireNonNull((String) context.getParameter(FUNCTION_ID), "Failed to get the id of function created in tasks");
         final String trigger = (String) context.getParameter(TRIGGER);
         final FunctionApp functionApp = Azure.az(AzureFunctions.class).functionApp(functionId);
         final List<FunctionEntity> functionEntities = Objects.requireNonNull(functionApp, String.format("failed to find function with id (%s) in Azure",

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

@@ -14,7 +14,6 @@
 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.cache.CacheManager;
 import com.microsoft.azure.toolkit.lib.common.model.Region;
 import com.microsoft.azure.toolkit.lib.common.model.Subscription;
@@ -30,6 +29,7 @@
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -43,7 +43,7 @@
 public class ServicePlanComboBox extends AzureComboBox<AppServicePlan> {
 
     private Subscription subscription;
-    private final List<AppServicePlanDraft> localItems = new ArrayList<>();
+    private final List<AppServicePlan> localItems = new LinkedList<>();
     private OperatingSystem os;
     private Region region;
     @Setter
@@ -94,6 +94,15 @@ public void setRegion(Region region) {
         this.reloadItems();
     }
 
+    @Override
+    public void setValue(AppServicePlan val) {
+        if (val.isDraftForCreating() && !this.localItems.contains(val)) {
+            this.localItems.add(0, val);
+        }
+        this.reloadItems();
+        super.setValue(val);
+    }
+
     @Nullable
     @Override
     protected AppServicePlan doGetDefaultValue() {
@@ -177,11 +186,7 @@ private void showServicePlanCreationPopup() {
         dialog.setOkActionListener((plan) -> {
             plan.setRegion(region);
             plan.setOperatingSystem(os);
-            this.localItems.add(0, plan);
             dialog.close();
-            final List<AppServicePlan> items = this.getItems();
-            items.add(0, plan);
-            this.setItems(items);
             this.setValue(plan);
         });
         dialog.show();

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

@@ -63,7 +63,7 @@
 import static com.microsoft.azure.toolkit.intellij.common.AzureBundle.message;
 
 public class WebAppRunState extends AzureRunProfileState<AppServiceAppBase<?, ?, ?>> {
-    private static final String LIBS_ROOT = "/home/site/libs/";
+    private static final String LIBS_ROOT = "/home/site/wwwroot/libs/";
     private static final String JAVA_OPTS = "JAVA_OPTS";
     private static final String CATALINA_OPTS = "CATALINA_OPTS";
     private File artifact;
@@ -126,7 +126,7 @@ private void deployJavaAgentToAppService(AppServiceAppBase<?, ?, ?> deployTarget
         }
         if (file == null) {
             AzureMessager.getMessager().info(AzureString.format("Uploading java agent to web app %s", deployTarget.getName()));
-            deployTarget.deploy(DeployType.JAR_LIB, javaAgent, targetPath);
+            deployTarget.deploy(DeployType.STATIC, javaAgent, targetPath);
         } else {
             AzureMessager.getMessager().info(AzureString.format("Skip upload java agent as file with same name already exists"));
         }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cosmos/src/main/java/com/microsoft/azure/toolkit/intellij/cosmos/creation/CosmosDatabaseCreationDialog.java

@@ -54,23 +54,24 @@ protected void init() {
         txtThroughputRu.setMinValue(400);
         txtThroughputRu.setMaxValue(1000000);
         txtThroughputRu.setValue(400);
-        txtThroughputRu.addValidator(() -> validateThroughputIncrements(txtThroughputRu));
+        txtThroughputRu.addValidator(() -> validateThroughputIncrements(txtThroughputRu, 100));
         txtMaxThroughput.setMinValue(1000);
         txtMaxThroughput.setValue(4000);
-        txtMaxThroughput.addValidator(() -> validateThroughputIncrements(txtMaxThroughput));
+        txtMaxThroughput.addValidator(() -> validateThroughputIncrements(txtMaxThroughput, 1000));
 
         autoscaleRadioButton.setSelected(true);
     }
 
     private AzureValidationInfo validateDatabaseName() {
             final String value = txtName.getValue();
             return StringUtils.endsWith(value, StringUtils.SPACE) || StringUtils.containsAny(value, "\\", "/","#", "?", "%") ?
-                    AzureValidationInfo.error("Database name should not end with space nor contains characters '\\', '/', '#', '?', '%'", txtName) : AzureValidationInfo.success(txtName);
+                    AzureValidationInfo.error("Database name should not end with space nor contain characters '\\', '/', '#', '?', '%'", txtName) : AzureValidationInfo.success(txtName);
     }
 
-    private AzureValidationInfo validateThroughputIncrements(@Nonnull AzureIntegerInput input) {
+    private AzureValidationInfo validateThroughputIncrements(@Nonnull AzureIntegerInput input, @Nonnull final int unit) {
         final Integer value = input.getValue();
-        return Objects.nonNull(value) && value % 100 == 0 ? AzureValidationInfo.success(input) : AzureValidationInfo.error("Throughput must be in multiples of 100", input);
+        return Objects.nonNull(value) && value % unit == 0 ? AzureValidationInfo.success(input) :
+                AzureValidationInfo.error(String.format("Throughput must be in multiples of %d", unit), input);
     }
 
     private void toggleThroughputStatus() {