Merge branch 'endgame-202207.next' into develop.next

Author: wangmingliang-ms

CHANGELOG.md

@@ -3,6 +3,7 @@
 All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in this file.
 
 - [Change Log](#change-log)
+  - [3.67.0](#3670)
   - [3.66.0](#3660)
   - [3.65.0](#3650)
   - [3.64.0](#3640)
@@ -85,6 +86,24 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
   - [3.0.7](#307)
   - [3.0.6](#306)
 
+## 3.67.0
+### Added
+- New Azure service support: Azure Kubernetes service.
+  - direct resource management in Azure Explorer.
+  - connection to other K8s plugins.    
+- Support for running or debugging local projects directly on Azure Virtual Machine by leveraging [`Run Targets`](https://www.jetbrains.com/help/idea/run-targets.html).     
+
+### Changed
+- Most Tool Windows will hide by default and show only when they are triggered by related actions.
+- An explicit search box is added on subscription dialog to filter subscriptions more conveniently.
+  - support for toggling selection of subscriptions by `space` key even checkbox is not focused.
+- A loading spinner would show first when the feedback page is loading.
+- Entries of some common actions in `<Toolbar>/Tools/Azure` are also added into the gear actions group of Azure Explorer.
+
+### Fixed
+- Error occurs if expand or download files/logs of a stopped function app.
+- Known CVE issues.
+
 ## 3.66.0
 ### Added
 - New "Getting Started with Azure" experience.    

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

@@ -7,14 +7,19 @@
 import com.microsoft.azure.toolkit.ide.guidance.ComponentContext;
 import com.microsoft.azure.toolkit.ide.guidance.Task;
 import com.microsoft.azure.toolkit.intellij.applicationinsights.connection.ApplicationInsightsResourceDefinition;
-import com.microsoft.azure.toolkit.intellij.connector.*;
+import com.microsoft.azure.toolkit.intellij.connector.Connection;
+import com.microsoft.azure.toolkit.intellij.connector.ConnectionManager;
+import com.microsoft.azure.toolkit.intellij.connector.ModuleResource;
+import com.microsoft.azure.toolkit.intellij.connector.Resource;
+import com.microsoft.azure.toolkit.intellij.connector.ResourceManager;
 import com.microsoft.azure.toolkit.lib.Azure;
 import com.microsoft.azure.toolkit.lib.applicationinsights.ApplicationInsight;
 import com.microsoft.azure.toolkit.lib.applicationinsights.AzureApplicationInsights;
 import com.microsoft.azure.toolkit.lib.common.messager.AzureMessager;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 
 import javax.annotation.Nonnull;
+import java.util.Objects;
 
 // todo: add create resource connection task instead of ai only
 // todo: remove duplicate codes with connector dialog
@@ -54,7 +59,8 @@ public String getName() {
     }
 
     private Resource<ApplicationInsight> getResource() {
-        final String applicationInsightsId = (String) context.getParameter("applicationInsightsId");
+        final String applicationInsightsId = (String) Objects.requireNonNull(context.getParameter("applicationInsightsId"),
+                "`applicationInsightsId` should not be null to create a resource connection");
         final ApplicationInsight applicationInsight = Azure.az(AzureApplicationInsights.class).getById(applicationInsightsId);
         return ApplicationInsightsResourceDefinition.INSTANCE.define(applicationInsight);
     }

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

@@ -16,6 +16,7 @@
 import com.microsoft.azure.toolkit.lib.resource.ResourceGroup;
 
 import javax.annotation.Nonnull;
+import java.util.Objects;
 import java.util.Optional;
 
 public class CreateApplicationInsightsTask implements Task {
@@ -35,18 +36,17 @@ public CreateApplicationInsightsTask(@Nonnull final ComponentContext context) {
     @Override
     @AzureOperation(name = "guidance.create_application_insights", type = AzureOperation.Type.SERVICE)
     public void execute() throws Exception {
-        final String name = (String) context.getParameter(APPLICATION_INSIGHTS_NAME);
-        final String subscriptionId = (String) context.getParameter(SUBSCRIPTION_ID);
-        final String resourceGroupName = (String) context.getParameter(RESOURCE_GROUP);
-        final Subscription subscription = Optional.ofNullable(subscriptionId)
+        final String name = (String) Objects.requireNonNull(context.getParameter(APPLICATION_INSIGHTS_NAME),
+                "`name` is required to create application insights");
+        final Subscription subscription = Optional.ofNullable((String) context.getParameter(SUBSCRIPTION_ID))
                 .map(id -> Azure.az(AzureAccount.class).account().getSubscription(id))
-                .orElseGet(() -> Azure.az(AzureAccount.class).account().getSelectedSubscriptions().get(0));
-        final ResourceGroup resourceGroup = Optional.ofNullable(resourceGroupName)
+                .orElseThrow(() -> new AzureToolkitRuntimeException("Failed to get subscription to create application insight"));
+        final ResourceGroup resourceGroup = Optional.ofNullable((String) context.getParameter(RESOURCE_GROUP))
                 .map(rg -> Azure.az(AzureResources.class).groups(subscription.getId()).get(rg, rg))
                 .orElseThrow(() -> new AzureToolkitRuntimeException("Failed to get resource group to create application insight"));
         final Region region = resourceGroup.getRegion();
         final ApplicationInsightDraft applicationInsightDraft = Azure.az(AzureApplicationInsights.class).applicationInsights(subscription.getId())
-                .create(name, resourceGroupName);
+                .create(name, resourceGroup.getName());
         applicationInsightDraft.setRegion(region);
         final ApplicationInsight result = applicationInsightDraft.commit();
         context.applyResult(RESOURCE_ID, result.getId());

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

@@ -27,6 +27,13 @@ public OpenLiveMetricsTask(@Nonnull final ComponentContext context) {
         this.context = context;
     }
 
+    @Override
+    public boolean isReady() {
+        final String applicationInsightsId = (String) context.getParameter("applicationInsightsId");
+        final String instrumentKey = (String) context.getParameter("instrumentKey");
+        return !StringUtils.isAllBlank(applicationInsightsId, instrumentKey);
+    }
+
     @Override
     @AzureOperation(name = "guidance.open_live_metrics", type = AzureOperation.Type.SERVICE)
     public void execute() throws Exception {

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

@@ -8,12 +8,14 @@
 import com.microsoft.azure.toolkit.lib.appservice.function.FunctionApp;
 import com.microsoft.azure.toolkit.lib.appservice.model.Runtime;
 import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
+import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
 import com.microsoft.azure.toolkit.lib.common.model.Subscription;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 import com.microsoft.azure.toolkit.lib.common.utils.Utils;
 import com.microsoft.azure.toolkit.lib.legacy.function.FunctionAppService;
 
 import javax.annotation.Nonnull;
+import java.util.Objects;
 import java.util.Optional;
 
 import static com.microsoft.azure.toolkit.lib.appservice.task.CreateOrUpdateFunctionAppTask.APPINSIGHTS_INSTRUMENTATION_KEY;
@@ -34,10 +36,10 @@ public CreateFunctionAppTask(@Nonnull final ComponentContext context) {
     @Override
     @AzureOperation(name = "guidance.create_function_app", type = AzureOperation.Type.SERVICE)
     public void execute() throws Exception {
-        final String name = (String) context.getParameter(FUNCTION_APP_NAME);
+        final String name = (String) Objects.requireNonNull(context.getParameter(FUNCTION_APP_NAME), "`name` is required to create function app");
         final Subscription subscription = Optional.ofNullable((String) context.getParameter(SignInTask.SUBSCRIPTION_ID))
                 .map(id -> Azure.az(AzureAccount.class).account().getSubscription(id))
-                .orElseGet(() -> Azure.az(AzureAccount.class).account().getSelectedSubscriptions().get(0));
+                .orElseThrow(() -> new AzureToolkitRuntimeException("Failed to get subscription to create function app"));
         final FunctionAppConfig functionAppConfig = FunctionAppConfig.getFunctionAppDefaultConfig(name);
         functionAppConfig.setName(name);
         functionAppConfig.setSubscription(subscription);

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

@@ -8,19 +8,19 @@
 import com.microsoft.azure.toolkit.lib.appservice.model.Runtime;
 import com.microsoft.azure.toolkit.lib.appservice.webapp.WebApp;
 import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
+import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
 import com.microsoft.azure.toolkit.lib.common.model.Subscription;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 import com.microsoft.azure.toolkit.lib.common.utils.Utils;
 import com.microsoft.azure.toolkit.lib.legacy.webapp.WebAppService;
 
 import javax.annotation.Nonnull;
+import java.util.Objects;
 import java.util.Optional;
 
 public class CreateWebAppTask implements Task {
     public static final String WEBAPP_NAME = "webAppName";
     public static final String WEBAPP_ID = "webappId";
-
-    public static final String RESOURCE_ID = "webappId";
     public static final String DEFAULT_WEB_APP_NAME = "defaultWebAppName";
     public static final String RESOURCE_GROUP = "resourceGroup";
     private final ComponentContext context;
@@ -39,17 +39,16 @@ public String getName() {
     @Override
     @AzureOperation(name = "guidance.create_webapp", type = AzureOperation.Type.SERVICE)
     public void execute() throws Exception {
-        final String name = (String) context.getParameter(WEBAPP_NAME);
+        final String name = (String) Objects.requireNonNull(context.getParameter(WEBAPP_NAME), "`name` is required to create web app");
         final Subscription subscription = Optional.ofNullable((String) context.getParameter(SignInTask.SUBSCRIPTION_ID))
                 .map(id -> Azure.az(AzureAccount.class).account().getSubscription(id))
-                .orElseGet(() -> Azure.az(AzureAccount.class).account().getSelectedSubscriptions().get(0));
+                .orElseThrow(() -> new AzureToolkitRuntimeException("Failed to get subscription to create web app"));
         final WebAppConfig webAppConfig = WebAppConfig.getWebAppDefaultConfig(name);
         webAppConfig.setName(name);
         webAppConfig.setSubscription(subscription);
         webAppConfig.setRuntime(Runtime.LINUX_JAVA11);
         final WebApp webApp = WebAppService.getInstance().createWebApp(webAppConfig);
         context.applyResult(WEBAPP_ID, webApp.getId());
-        context.applyResult(RESOURCE_ID, webApp.getId());
         context.applyResult(RESOURCE_GROUP, webApp.getResourceGroupName());
     }
 

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

@@ -42,7 +42,6 @@ public ConfigurationFactory getConfigurationFactory() {
 
     @Override
     @ExceptionNotification
-    @AzureOperation(name = "function.setup_run_configuration", type = AzureOperation.Type.ACTION)
     protected boolean setupConfigurationFromContext(AzureRunConfigurationBase runConfigurationBase, ConfigurationContext context, Ref ref) {
         if (!(runConfigurationBase instanceof FunctionRunConfiguration || runConfigurationBase instanceof FunctionDeployConfiguration)) {
             return false;

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/wizard/module/FunctionsModuleBuilder.java

@@ -108,7 +108,6 @@ public ModuleWizardStep[] createFinishingSteps(@NotNull final WizardContext wiza
 
     @Override
     @ExceptionNotification
-    @AzureOperation(name = "function.setup_function_root_module", type = AzureOperation.Type.ACTION)
     public void setupRootModel(@NotNull final ModifiableRootModel rootModel) throws ConfigurationException {
         final VirtualFile root = createAndGetContentEntry();
         rootModel.addContentEntry(root);

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

@@ -19,13 +19,15 @@
 import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 import com.microsoft.azure.toolkit.lib.appservice.plan.AppServicePlanDraft;
 import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
+import com.microsoft.azure.toolkit.lib.common.bundle.AzureString;
 import com.microsoft.azure.toolkit.lib.common.messager.AzureMessager;
 import com.microsoft.azure.toolkit.lib.common.model.Region;
 import com.microsoft.azure.toolkit.lib.common.operation.OperationContext;
 import com.microsoft.azure.toolkit.lib.resource.AzureResources;
 import com.microsoft.azure.toolkit.lib.resource.ResourceGroup;
 import com.microsoft.azure.toolkit.lib.resource.ResourceGroupConfig;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.zeroturnaround.zip.ZipUtil;
 
 import javax.annotation.Nonnull;
@@ -34,6 +36,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.Map;
+import java.util.Objects;
 
 import static com.microsoft.azure.toolkit.intellij.common.AzureBundle.message;
 
@@ -165,7 +168,14 @@ private ApplicationInsight getOrCreateApplicationInsights(final FunctionAppConfi
         final String resourceGroup = config.getResourceGroup().getName();
         final String name = config.getMonitorConfig().getApplicationInsightsConfig().getName();
         final Region region = config.getRegion();
-        return new GetOrCreateApplicationInsightsTask(subscriptionId, resourceGroup, region, name).execute();
+        try {
+            return new GetOrCreateApplicationInsightsTask(subscriptionId, resourceGroup, region, name).execute();
+        } catch (final Throwable e) {
+            final Throwable rootCause = ExceptionUtils.getRootCause(e);
+            AzureMessager.getMessager().warning(AzureString.format("Failed to get/create application insights %s, caused by %s", name,
+                    StringUtils.firstNonBlank(rootCause.getMessage(), rootCause.getClass().getSimpleName())));
+            return null;
+        }
     }
 
     public void deployFunctionApp(final FunctionApp functionApp, final File stagingFolder) throws IOException {
@@ -176,15 +186,15 @@ public void deployFunctionApp(final FunctionApp functionApp, final File stagingF
         if (!StringUtils.equalsIgnoreCase(functionApp.getStatus(), RUNNING)) {
             functionApp.start();
         }
-        final String resourceUrl = String.format(PORTAL_URL_PATTERN, Azure.az(AzureAccount.class).account().getPortalUrl(), functionApp.id());
+        final String resourceUrl = String.format(PORTAL_URL_PATTERN, Azure.az(AzureAccount.class).account().getPortalUrl(), functionApp.getId());
         AzureMessager.getMessager().info(String.format(DEPLOY_FINISH, resourceUrl));
     }
 
     private FunctionDeployType getDeployType(final FunctionApp functionApp) {
-        if (functionApp.getRuntime().getOperatingSystem() == OperatingSystem.WINDOWS) {
+        if (Objects.requireNonNull(functionApp.getRuntime()).getOperatingSystem() == OperatingSystem.WINDOWS) {
             return FunctionDeployType.RUN_FROM_ZIP;
         }
-        final PricingTier pricingTier = functionApp.getAppServicePlan().getPricingTier();
+        final PricingTier pricingTier = Objects.requireNonNull(functionApp.getAppServicePlan()).getPricingTier();
         return StringUtils.equalsAnyIgnoreCase(pricingTier.getTier(), "Dynamic", "ElasticPremium") ?
                 FunctionDeployType.RUN_FROM_BLOB : FunctionDeployType.RUN_FROM_ZIP;
     }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-containerservice/src/main/java/com/microsoft/azure/toolkit/intellij/containerservice/creation/KubernetesCreationDialog.java

@@ -263,12 +263,12 @@ private AzureValidationInfo validateKubernetesClusterName() {
     private AzureValidationInfo validateDnsNamePrefix() {
         final String name = txtDnsPrefix.getValue();
         if (StringUtils.isEmpty(name)) {
-            return AzureValidationInfo.error(AzureMessageBundle.message("kubernetes.cluster.dnsNamePrefix.validate.empty").toString(), txtName);
+            return AzureValidationInfo.error(AzureMessageBundle.message("kubernetes.cluster.dnsNamePrefix.validate.empty").toString(), txtDnsPrefix);
         }
         if (!DNS_NAME_PREFIX_PATTERN.matcher(name).matches()) {
-            return AzureValidationInfo.error(AzureMessageBundle.message("kubernetes.cluster.dnsNamePrefix.validate.invalid").toString(), txtName);
+            return AzureValidationInfo.error(AzureMessageBundle.message("kubernetes.cluster.dnsNamePrefix.validate.invalid").toString(), txtDnsPrefix);
         }
-        return AzureValidationInfo.success(txtName);
+        return AzureValidationInfo.success(txtDnsPrefix);
     }
 
     // CHECKSTYLE IGNORE check FOR NEXT 1 LINES