Merge branch 'endgame-202306' into develop

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.78.0](#3780)
   - [3.77.0](#3770)
   - [3.76.0](#3760)
   - [3.75.0](#3750)
@@ -97,6 +98,20 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
   - [3.0.7](#307)
   - [3.0.6](#306)
 
+## 3.78.0
+### Added
+- New UX for Azure resource connections in IntelliJ project view
+  - Support list/add/remove Azure resource connections in project explorer
+  - Support edit environment variables for Azure resource connections
+  - Support manage connected Azure resources in project explorer
+- Support IntelliJ 2023.2 EAP
+
+### Fixed
+- Fix: System environment variables may be missed during function run/deployment
+- [#7651](https://github.com/microsoft/azure-tools-for-java/issues/7651): Uncaught Exception DeployFunctionAppAction#update, check if project is a valid function project.
+- [#7653](https://github.com/microsoft/azure-tools-for-java/issues/7653): Uncaught Exception com.intellij.diagnostic.PluginException: No display name is specified for configurable com.microsoft.intellij.AzureConfigurable in xml file.
+- [#7619](https://github.com/microsoft/azure-tools-for-java/issues/7619): Uncaught Exception Uncaught Exception java.lang.IllegalArgumentException: invalid arguments id/nameId.
+
 ## 3.77.0
 ### Added
 - Azure Spring Apps: basic Standard Consumption plan(preview) support.

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

@@ -40,7 +40,6 @@ public ApplicationInsightsResourcePanel() {
 
     private void init() {
         this.insightComboBox.setRequired(true);
-        this.insightComboBox.trackValidation();
         this.subscriptionComboBox.addItemListener(e -> {
             if (e.getStateChange() == ItemEvent.SELECTED) {
                 this.insightComboBox.reloadItems();

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

@@ -43,7 +43,7 @@ public void execute() throws Exception {
         final FunctionAppConfig functionAppConfig = FunctionAppConfig.getFunctionAppDefaultConfig(name);
         functionAppConfig.setName(name);
         functionAppConfig.setSubscription(subscription);
-        functionAppConfig.setRuntime(Runtime.FUNCTION_WINDOWS_JAVA11);
+        functionAppConfig.setRuntime(Runtime.FUNCTION_WINDOWS_JAVA17);
         final FunctionAppBase<?, ?, ?> app =  FunctionAppService.getInstance().createOrUpdateFunctionApp(functionAppConfig);
         context.applyResult(FUNCTION_ID, app.getId());
         context.applyResult(RESOURCE_GROUP, app.getResourceGroupName());

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

@@ -45,7 +45,7 @@ protected RunnerAndConfigurationSettings getRunConfigurationSettings(@Nonnull Co
             final AzureArtifact azureArtifact = allSupportedAzureArtifacts.get(0);
             ((WebAppConfiguration) runConfiguration).saveArtifact(azureArtifact);
             final List<BeforeRunTask> beforeRunTasks = new ArrayList<>();
-            beforeRunTasks.add(BuildArtifactBeforeRunTaskUtils.createBuildTask(azureArtifact, runConfiguration));
+            beforeRunTasks.add(BuildArtifactBeforeRunTaskUtils.createBuildTask(azureArtifact, runConfiguration, true));
             beforeRunTasks.addAll(runConfiguration.getBeforeRunTasks());
             manager.setBeforeRunTasks(runConfiguration, beforeRunTasks);
             ((WebAppConfiguration) runConfiguration).setOpenBrowserAfterDeployment(false);

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

@@ -132,15 +132,19 @@ protected boolean isAvailable(final DataContext dataContext) {
         if (project == null || project.isDisposed()) {
             return false;
         }
-        final IdeView view = LangDataKeys.IDE_VIEW.getData(dataContext);
-        final ProjectFileIndex projectFileIndex = ProjectRootManager.getInstance(project).getFileIndex();
-        if (view != null) {
-            final List<PsiDirectory> dirs = Arrays.stream(view.getDirectories()).filter(Objects::nonNull).toList();
-            for (final PsiDirectory dir : dirs) {
-                if (projectFileIndex.isUnderSourceRootOfType(dir.getVirtualFile(), JavaModuleSourceRootTypes.SOURCES) && doCheckPackageExists(dir)) {
-                    return true;
+        try {
+            final IdeView view = LangDataKeys.IDE_VIEW.getData(dataContext);
+            final ProjectFileIndex projectFileIndex = ProjectRootManager.getInstance(project).getFileIndex();
+            if (view != null) {
+                final List<PsiDirectory> dirs = Arrays.stream(view.getDirectories()).filter(Objects::nonNull).toList();
+                for (final PsiDirectory dir : dirs) {
+                    if (projectFileIndex.isUnderSourceRootOfType(dir.getVirtualFile(), JavaModuleSourceRootTypes.SOURCES) && doCheckPackageExists(dir)) {
+                        return true;
+                    }
                 }
             }
+        } catch (final RuntimeException e) {
+            // swallow exception when check action availability
         }
         return false;
     }

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

@@ -14,7 +14,7 @@
 import com.intellij.execution.impl.RunDialog;
 import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.DataKeys;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.microsoft.azure.toolkit.intellij.legacy.function.runner.AzureFunctionSupportConfigurationType;
@@ -32,6 +32,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import static com.microsoft.azure.toolkit.intellij.common.AzureBundle.message;
 
@@ -41,15 +42,16 @@ public class RunFunctionAction extends AzureAnAction {
 
     @Override
     public boolean onActionPerformed(@NotNull AnActionEvent anActionEvent, @Nullable Operation operation) {
-        final Module module = DataKeys.MODULE.getData(anActionEvent.getDataContext());
+        final Module module = LangDataKeys.MODULE.getData(anActionEvent.getDataContext());
         AzureTaskManager.getInstance().runLater(() -> runConfiguration(module));
         return true;
     }
 
     @Override
     @ExceptionNotification
-    public void update(AnActionEvent event) {
-        event.getPresentation().setEnabledAndVisible(FunctionUtils.isFunctionProject(event.getProject()));
+    public void update(AnActionEvent e) {
+        final boolean onModule = Objects.nonNull(LangDataKeys.MODULE.getData(e.getDataContext()));
+        e.getPresentation().setEnabledAndVisible(onModule && FunctionUtils.isFunctionProject(e.getProject()));
     }
 
     @Override

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

@@ -180,13 +180,17 @@ public static boolean isFunctionProject(Project project) {
             return false;
         }
         final List<Library> libraries = new ArrayList<>();
-        OrderEnumerator.orderEntries(project).productionOnly().forEachLibrary(library -> {
-            if (StringUtils.containsAnyIgnoreCase(library.getName(), AZURE_FUNCTIONS_JAVA_LIBRARY, AZURE_FUNCTIONS_JAVA_CORE_LIBRARY)) {
-                libraries.add(library);
-            }
-            return true;
-        });
-        return libraries.size() > 0;
+        try {
+            OrderEnumerator.orderEntries(project).productionOnly().forEachLibrary(library -> {
+                if (StringUtils.containsAnyIgnoreCase(library.getName(), AZURE_FUNCTIONS_JAVA_LIBRARY, AZURE_FUNCTIONS_JAVA_CORE_LIBRARY)) {
+                    libraries.add(library);
+                }
+                return true;
+            });
+            return libraries.size() > 0;
+        } catch (Throwable t) {
+            return false;
+        }
     }
 
     @AzureOperation(name = "boundary/function.list_function_methods.module", params = {"module.getName()"})

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

@@ -12,7 +12,6 @@
 import com.microsoft.azure.toolkit.ide.appservice.AppServiceActionsContributor;
 import com.microsoft.azure.toolkit.intellij.common.RunProcessHandler;
 import com.microsoft.azure.toolkit.intellij.common.RunProcessHandlerMessenger;
-import com.microsoft.azure.toolkit.intellij.connector.dotazure.AzureModule;
 import com.microsoft.azure.toolkit.intellij.connector.dotazure.DotEnvBeforeRunTaskProvider;
 import com.microsoft.azure.toolkit.intellij.legacy.common.AzureRunProfileState;
 import com.microsoft.azure.toolkit.intellij.legacy.function.runner.core.FunctionUtils;
@@ -81,11 +80,6 @@ public FunctionDeploymentState(Project project, FunctionDeployConfiguration func
         final FunctionAppBase<?, ?, ?> target = FunctionAppService.getInstance().createOrUpdateFunctionApp(deployModel.getFunctionAppConfig());
         stagingFolder = FunctionUtils.getTempStagingFolder();
         prepareStagingFolder(stagingFolder, operation);
-        final AzureTaskManager tm = AzureTaskManager.getInstance();
-        Optional.ofNullable(this.functionDeployConfiguration.getModule()).map(AzureModule::from)
-            .ifPresent(module -> tm.runLater(() -> tm.write(() -> module
-                .initializeWithDefaultProfileIfNot()
-                .addApp(target).save())));
         // deploy function to Azure
         FunctionAppService.getInstance().deployFunctionApp(target, stagingFolder);
         AzureTaskManager.getInstance().runInBackground("list HTTPTrigger url", () -> {
@@ -108,8 +102,8 @@ private void applyResourceConnection() {
             final DotEnvBeforeRunTaskProvider.LoadDotEnvBeforeRunTask loadDotEnvBeforeRunTask = functionDeployConfiguration.getLoadDotEnvBeforeRunTask();
             final Map<String, String> appSettings = functionDeployConfiguration.getConfig().getAppSettings();
             loadDotEnvBeforeRunTask.loadEnv().stream()
-                    .filter(pair -> StringUtils.equalsIgnoreCase(pair.getKey(), "AzureWebJobsStorage") &&
-                            StringUtils.equalsIgnoreCase(pair.getValue(), LOCAL_STORAGE_CONNECTION_STRING)) // remove connection string for azurite
+                    .filter(pair -> !(StringUtils.equalsIgnoreCase(pair.getKey(), "AzureWebJobsStorage") &&
+                            StringUtils.equalsIgnoreCase(pair.getValue(), LOCAL_STORAGE_CONNECTION_STRING))) // workaround to remove local connections
                     .forEach(env -> appSettings.put(env.getKey(), env.getValue()));
         }
     }

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

@@ -5,10 +5,11 @@
 
 package com.microsoft.azure.toolkit.intellij.legacy.function.runner.localrun;
 
-import com.google.common.base.Supplier;
+import com.intellij.execution.ExecutionException;
 import com.intellij.execution.Executor;
 import com.intellij.execution.ExecutorRegistry;
 import com.intellij.execution.RunnerAndConfigurationSettings;
+import com.intellij.execution.configurations.GeneralCommandLine;
 import com.intellij.execution.executors.DefaultDebugExecutor;
 import com.intellij.execution.impl.RunManagerImpl;
 import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl;
@@ -19,13 +20,13 @@
 import com.intellij.execution.remote.RemoteConfiguration;
 import com.intellij.execution.remote.RemoteConfigurationType;
 import com.intellij.execution.runners.ExecutionUtil;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ReadAction;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.wm.ToolWindowId;
 import com.intellij.psi.PsiMethod;
+import com.intellij.util.EnvironmentUtil;
 import com.microsoft.azure.toolkit.intellij.common.ReadStreamLineThread;
 import com.microsoft.azure.toolkit.intellij.common.RunProcessHandler;
 import com.microsoft.azure.toolkit.intellij.common.RunProcessHandlerMessenger;
@@ -62,9 +63,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.artifact.versioning.ComparableVersion;
 import org.jetbrains.annotations.NotNull;
-import rx.Observable;
-import rx.Scheduler;
-import rx.schedulers.Schedulers;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -78,6 +76,7 @@
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static com.microsoft.azure.toolkit.ide.appservice.function.FunctionAppActionsContributor.CONFIG_CORE_TOOLS;
@@ -91,7 +90,7 @@ public class FunctionRunState extends AzureRunProfileState<Boolean> {
     private static final int DEFAULT_FUNC_PORT = 7071;
     private static final int DEFAULT_DEBUG_PORT = 5005;
     private static final String DEBUG_PARAMETERS =
-            "\"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=%s\"";
+            "--language-worker -- \"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=%s\"";
     private static final String HOST_JSON = "host.json";
     private static final String EXTENSION_BUNDLE = "extensionBundle";
     private static final String EXTENSION_BUNDLE_ID = "Microsoft.Azure.Functions.ExtensionBundle";
@@ -227,10 +226,10 @@ private static ComparableVersion getJavaVersion() {
 
     @AzureOperation(name = "boundary/function.run_cli.folder", params = {"stagingFolder.getName()"})
     private int runFunctionCli(RunProcessHandler processHandler, File stagingFolder)
-            throws IOException, InterruptedException {
+            throws InterruptedException, ExecutionException {
         isDebuggerLaunched = false;
         final int debugPort = FunctionUtils.findFreePort(DEFAULT_DEBUG_PORT);
-        process = getRunFunctionCliProcessBuilder(stagingFolder, debugPort).start();
+        process = getFunctionCliProcess(stagingFolder, debugPort);
         // Redirect function cli output to console
         readInputStreamByLines(process.getInputStream(), inputLine -> {
             if (isDebugMode() && isFuncInitialized(inputLine) && !isDebuggerLaunched) {
@@ -276,27 +275,31 @@ public void processTerminated(@NotNull ProcessEvent event) {
         });
     }
 
-    private ProcessBuilder getRunFunctionCliProcessBuilder(File stagingFolder, int debugPort) {
-        final ProcessBuilder processBuilder = new ProcessBuilder();
+    private Process getFunctionCliProcess(File stagingFolder, int debugPort) throws ExecutionException {
         final String funcPath = functionRunConfiguration.getFuncPath();
         final String funcArguments = Optional.ofNullable(functionRunConfiguration.getFunctionHostArguments())
                 .filter(StringUtils::isNoneBlank).orElseGet(FunctionUtils::getDefaultFuncArguments);
-        final String[] hostParameters = funcArguments.split(" ");
-        final String[] debugParameters = isDebugMode() ? new String[]{"--language-worker", "--", String.format(DEBUG_PARAMETERS, debugPort)} : null;
-        final String[] command = Stream.of(new String[]{funcPath}, hostParameters, debugParameters)
-                .filter(Objects::nonNull).flatMap(Stream::of).toArray(String[]::new);
-        processBuilder.command(command);
-        processBuilder.directory(stagingFolder);
-        return processBuilder;
+        final String debugParameters = isDebugMode() ? String.format(DEBUG_PARAMETERS, debugPort) : null;
+        final String[] command = Stream.of(funcArguments, debugParameters)
+                .filter(StringUtils::isNoneBlank)
+                .collect(Collectors.joining(StringUtils.SPACE))
+                .split(StringUtils.SPACE);
+        final GeneralCommandLine result = new GeneralCommandLine();
+        result.withEnvironment(EnvironmentUtil.getEnvironmentMap());
+        result.withExePath(funcPath);
+        result.withParameters(command);
+        result.withWorkDirectory(stagingFolder);
+        return result.createProcess();
     }
 
-    private ProcessBuilder getRunFunctionCliExtensionInstallProcessBuilder(File stagingFolder) {
-        final ProcessBuilder processBuilder = new ProcessBuilder();
+    private Process getExtensionInstallProcess(File stagingFolder) throws ExecutionException {
         final String funcPath = functionRunConfiguration.getFuncPath();
-        final String[] command = new String[]{funcPath, "extensions", "install", "--java"};
-        processBuilder.command(command);
-        processBuilder.directory(stagingFolder);
-        return processBuilder;
+        final GeneralCommandLine result = new GeneralCommandLine();
+        result.withEnvironment(EnvironmentUtil.getEnvironmentMap());
+        result.withExePath(funcPath);
+        result.withParameters("extensions", "install", "--java");
+        result.withWorkDirectory(stagingFolder);
+        return result.createProcess();
     }
 
     @AzureOperation(name = "boundary/function.prepare_staging_folder.folder|app", params = {"stagingFolder.getName()", "this.functionRunConfiguration.getFuncPath()"})
@@ -333,7 +336,7 @@ private void prepareStagingFolder(File stagingFolder,
 
             final Set<BindingEnum> bindingClasses = getFunctionBindingEnums(configMap);
             if (isInstallingExtensionNeeded(bindingClasses, processHandler)) {
-                installProcess = getRunFunctionCliExtensionInstallProcessBuilder(stagingFolder).start();
+                installProcess = getExtensionInstallProcess(stagingFolder);
             }
         } catch (final AzureExecutionException | IOException e) {
             final String error = String.format("failed prepare staging folder[%s]", folder);
@@ -405,7 +408,8 @@ private void saveConnection(@Nonnull final Connection<?, ?> connection, @Nonnull
     private boolean isWebJobStorageRequired(@Nonnull List<BindingEnum> bindings) {
         return bindings.stream().map(BindingEnum::getType)
                 .filter(type -> StringUtils.endsWithIgnoreCase(type, "Trigger"))
-                .anyMatch(type -> !AZURE_WEB_JOBS_STORAGE_NOT_REQUIRED_TRIGGERS.stream().anyMatch(trigger -> StringUtils.equalsIgnoreCase(type, trigger)));
+                .anyMatch(type -> AZURE_WEB_JOBS_STORAGE_NOT_REQUIRED_TRIGGERS.stream()
+                        .noneMatch(trigger -> StringUtils.equalsIgnoreCase(type, trigger)));
     }
 
     private boolean isDebugMode() {