Merge remote-tracking branch 'origin/endgame-202307' 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.79.0](#3790)
   - [3.78.1](#3781)
   - [3.78.0](#3780)
   - [3.77.0](#3770)
@@ -99,6 +100,19 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
   - [3.0.7](#307)
   - [3.0.6](#306)
 
+## 3.79.0
+### Added
+- Support for creating Azure Spring apps/services of Enterprise/Standard/Basic tier in IDE.    
+- Support for managing deployment target services directly in Project Explorer.    
+
+### Fixed
+- status shows inactive after creating/refreshing spring app.
+- error may occur when importing document into SQL container.
+- error may occur when connecting to the storage emulator and running locally.
+- error may occur when deploy function app.
+- HDInsight Job view nodes are displayed as 'folder icon + cluster name'.
+- HDInsight Linked cluster cannot display in Azure Explorer when not signed in.
+
 ## 3.78.1
 ### Fixed
 - Fix: error pops when starting/stopping/restarting spring app.

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

@@ -17,6 +17,7 @@
 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 com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 
 import javax.annotation.Nonnull;
 import java.util.Objects;
@@ -40,19 +41,19 @@ public void execute() {
         final Module module = getModule();
         final Resource consumer = getModuleConsumer(module);
         final AzureModule azureModule = AzureModule.from(module);
-        final Profile profile = azureModule.getDefaultProfile();
-        if (Objects.isNull(profile)) {
-            return;
-        }
-        final Connection<?,?> connection = ConnectionManager.getDefinitionOrDefault(resource.getDefinition(),
+        final AzureTaskManager tm = AzureTaskManager.getInstance();
+        tm.runAndWait(() -> tm.write(() -> {
+            final Profile profile = azureModule.initializeWithDefaultProfileIfNot();
+            final Connection<?, ?> connection = ConnectionManager.getDefinitionOrDefault(resource.getDefinition(),
                 consumer.getDefinition()).define(resource, consumer);
-        if (connection.validate(this.project)) {
-            profile.createOrUpdateConnection(connection);
-            profile.save();
-            final String message = String.format("The connection between %s and %s has been successfully created.",
+            if (connection.validate(this.project)) {
+                profile.createOrUpdateConnection(connection);
+                profile.save();
+                final String message = String.format("The connection between %s and %s has been successfully created.",
                     resource.getName(), consumer.getName());
-            AzureMessager.getMessager().success(message);
-        }
+                AzureMessager.getMessager().success(message);
+            }
+        }));
     }
 
     @Nonnull
@@ -63,7 +64,7 @@ public String getName() {
 
     private Resource<ApplicationInsight> getResource() {
         final String applicationInsightsId = (String) Objects.requireNonNull(context.getParameter("applicationInsightsId"),
-                "`applicationInsightsId` should not be null to create a resource connection");
+            "`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-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/FunctionAppConfigFormPanelAdvance.java

@@ -77,6 +77,7 @@ protected void textChanged(@Nonnull final DocumentEvent documentEvent) {
                 final ApplicationInsightsComboBox insightsComboBox = appServiceMonitorPanel.getApplicationInsightsComboBox();
                 insightsComboBox.removeItem(insightsConfig);
                 insightsComboBox.setValue(insightsConfig);
+                insightsComboBox.reloadItems();
             }
         });
     }

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

@@ -115,6 +115,7 @@ public class FunctionUtils {
         REQUIRED_ATTRIBUTE_MAP.put(BindingEnum.HttpTrigger, Arrays.asList("authLevel"));
     }
 
+    @AzureOperation(name = "internal/function.save_app_settings_to_security_storage")
     public static void saveAppSettingsToSecurityStorage(String key, Map<String, String> appSettings) {
         if (StringUtils.isEmpty(key)) {
             return;
@@ -123,6 +124,7 @@ public static void saveAppSettingsToSecurityStorage(String key, Map<String, Stri
         IntelliJSecureStore.getInstance().savePassword(AZURE_FUNCTIONS_APP_SETTINGS, key, null, appSettingsJsonValue);
     }
 
+    @AzureOperation(name = "internal/function.load_app_settings_from_security_storage")
     public static Map<String, String> loadAppSettingsFromSecurityStorage(String key) {
         if (StringUtils.isEmpty(key)) {
             return new HashMap<>();

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

@@ -102,7 +102,7 @@ public class FunctionRunState extends AzureRunProfileState<Boolean> {
     private static final ComparableVersion MINIMUM_JAVA_9_SUPPORTED_VERSION_V2 = new ComparableVersion("2.7.2628");
     private static final BindingEnum[] FUNCTION_WITHOUT_FUNCTION_EXTENSION = {BindingEnum.HttpOutput, BindingEnum.HttpTrigger};
     private static final List<String> AZURE_WEB_JOBS_STORAGE_NOT_REQUIRED_TRIGGERS = Arrays.asList("httptrigger", "kafkatrigger", "rabbitmqtrigger",
-            "orchestrationTrigger", "activityTrigger", "entityTrigger");
+            "activityTrigger", "entityTrigger");
     private static final String CONNECTION_TITLE = "AzureWebJobsStorage is missing";
     private static final String CONNECTION_DESCRIPTION = "Please set the resource connection for AzureWebJobsStorage.";
     private boolean isDebuggerLaunched;

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

@@ -49,7 +49,8 @@ public AppServiceComboBox(final Project project) {
 
     @Override
     public void setValue(T val, Boolean fixed) {
-        if (isDraftResource(val) && !this.draftItems.contains(val)) {
+        if (isDraftResource(val)) {
+            this.draftItems.remove(val);
             this.draftItems.add(0, val);
             this.reloadItems();
         }

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

@@ -52,7 +52,8 @@ public void setSubscription(Subscription subscription) {
 
     @Override
     public void setValue(final ApplicationInsightsConfig val, Boolean fixed) {
-        if (val != null && val.isNewCreate() && !this.draftItems.contains(val)) {
+        if (val != null && val.isNewCreate()) {
+            this.draftItems.remove(val);
             this.draftItems.add(0, val);
             this.reloadItems();
         }

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

@@ -97,7 +97,8 @@ public void setRegion(Region region) {
 
     @Override
     public void setValue(@Nullable AppServicePlan val, Boolean fixed) {
-        if (Objects.nonNull(val) && val.isDraftForCreating() && !this.draftItems.contains(val)) {
+        if (Objects.nonNull(val) && val.isDraftForCreating()) {
+            this.draftItems.remove(val);
             this.draftItems.add(0, val);
             this.reloadItems();
         }

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

@@ -48,7 +48,8 @@ public void setAppService(final String appServiceId) {
 
     @Override
     public void setValue(DeploymentSlotConfig val, Boolean fixed) {
-        if (isDraftResource(val) && !this.draftItems.contains(val)) {
+        if (isDraftResource(val)) {
+            this.draftItems.remove(val);
             this.draftItems.add(0, val);
             this.reloadItems();
         }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-bicep/src/main/resources/META-INF/azure-intellij-plugin-bicep.xml

@@ -28,30 +28,30 @@
                                 id="org.wso2.lsp4intellij.contributors.LSPCompletionContributor" language="any"/>
         <!-- needed for completion as well as signature help -->
         <typedHandler implementation="org.wso2.lsp4intellij.listeners.LSPTypedHandler"
-                      id="LSPTypedHandler"/>
+                      id="Azure.LSPTypedHandler"/>
 
         <!-- needed for code diagnostics -->
-        <externalAnnotator id="LSPAnnotator" language="TEXT"
+        <externalAnnotator id="Azure.LSPAnnotator" language="TEXT"
                            implementationClass="org.wso2.lsp4intellij.contributors.annotator.LSPAnnotator"/>
 
         <!-- needed for Workspace Symbols -->
         <gotoSymbolContributor implementation="org.wso2.lsp4intellij.contributors.symbol.LSPSymbolContributor"
-                               id="LSPSymbolContributor"/>
+                               id="Azure.LSPSymbolContributor"/>
 
         <!-- needed for renaming -->
-        <renameHandler implementation="org.wso2.lsp4intellij.contributors.rename.LSPRenameHandler" id="LSPRenameHandler" order="first"/>
-        <renamePsiElementProcessor implementation="org.wso2.lsp4intellij.contributors.rename.LSPRenameProcessor" id="LSPRenameProcessor" order="first"/>
+        <renameHandler implementation="org.wso2.lsp4intellij.contributors.rename.LSPRenameHandler" id="Azure.LSPRenameHandler" order="first"/>
+        <renamePsiElementProcessor implementation="org.wso2.lsp4intellij.contributors.rename.LSPRenameProcessor" id="Azure.LSPRenameProcessor" order="first"/>
     </extensions>
 
     <actions>
         <!-- needed for hover -->
         <action id="org.intellij.sdk.action.QuickDocAction" class="org.wso2.lsp4intellij.actions.LSPQuickDocAction" text="Show Quick Doc"/>
-        <action class="org.wso2.lsp4intellij.actions.LSPGotoDeclarationAction" id="GotoDeclaration" use-shortcut-of="GotoDeclaration"
+        <action class="org.wso2.lsp4intellij.actions.LSPGotoDeclarationAction" id="Azure.GotoDeclaration" use-shortcut-of="GotoDeclaration"
                 overrides="true" text="Go to Declaration or Usages"/>
-        <action class="org.wso2.lsp4intellij.actions.LSPReformatAction" id="ReformatCode" use-shortcut-of="ReformatCode"
+        <action class="org.wso2.lsp4intellij.actions.LSPReformatAction" id="Azure.ReformatCode" use-shortcut-of="ReformatCode"
                 overrides="true" text="Reformat Code" />
         <!-- needed for find references -->
-        <action class="org.wso2.lsp4intellij.actions.LSPReferencesAction" id="LSPFindUsages" text="Find Usages">
+        <action class="org.wso2.lsp4intellij.actions.LSPReferencesAction" id="Azure.LSPFindUsages" text="Find Usages">
             <keyboard-shortcut first-keystroke="shift alt F7" keymap="$default"/>
         </action>
     </actions>