Merge endgame-202311

.github/workflows/build.yml

@@ -35,7 +35,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: microsoft/azure-maven-plugins
-          ref: develop
+          ref: endgame-202311
           path: azure-maven-plugins
 
       # Check out current repository

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.83.0](#3830)
   - [3.82.0](#3820)
   - [3.81.0](#3810)
   - [3.80.0](#3800)
@@ -104,6 +105,20 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
   - [3.0.7](#307)
   - [3.0.6](#306)
 
+## 3.83.0
+### Added
+- Add Azure Key Vault support in Azure Toolkits
+  * Resource Management features in Azure explorer
+    - Create new secret/certificate/key in toolkts
+    - View/Download secret/certificate/key (need Azure CLI installed)
+  * Code assistance of Key Vault for Spring project
+
+### Fixed
+- Get the error of "AzureToolkitRuntimeException" when opening project with resource connection configuration file
+- Get duplicate property key when connect resource from .properties
+- Generate deprecated configurations with code completions in spring properties
+- Build task will be removed for project with resource connection
+
 ## 3.82.0
 ### Added
 - Code assistance of Azure resources for Spring and Azure Functions.

PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml

@@ -27,7 +27,7 @@
   <parent>
     <groupId>com.microsoft.azuretools</groupId>
     <artifactId>utils</artifactId>
-    <version>3.83.0-SNAPSHOT</version>
+    <version>3.83.0</version>
   </parent>
   <groupId>com.microsoft.azuretools</groupId>
   <artifactId>com.microsoft.azuretools.sdk.lib</artifactId>
@@ -39,9 +39,9 @@
   </organization>
 
   <properties>
-    <azuretool.version>3.83.0-SNAPSHOT</azuretool.version>
+    <azuretool.version>3.83.0</azuretool.version>
     <azuretool.sdk.version>3.32.0.qualifier</azuretool.sdk.version>
-    <azure.toolkit-lib.version>0.39.0-SNAPSHOT</azure.toolkit-lib.version>
+    <azure.toolkit-lib.version>0.39.2</azure.toolkit-lib.version>
   </properties>
   <dependencyManagement>
     <dependencies>

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/META-INF/MANIFEST.MF

@@ -43,4 +43,4 @@ Export-Package: com.microsoft.azuretools.appservice,
  com.microsoft.azuretools.appservice.handlers,
  com.microsoft.azuretools.appservice.ui
 Bundle-ClassPath: .,
- target/lib/azure-toolkit-ide-appservice-lib-0.39.0-SNAPSHOT.jar
+ target/lib/azure-toolkit-ide-appservice-lib-0.39.2.jar

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/pom.xml

@@ -13,7 +13,7 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-toolkit-ide-appservice-lib</artifactId>
-      <version>0.39.0-SNAPSHOT</version>
+      <version>0.39.2</version>
     </dependency>
   </dependencies>
   <repositories>

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/META-INF/MANIFEST.MF

@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
- target/lib/azure-toolkit-ide-springcloud-lib-0.39.0-SNAPSHOT.jar
+ target/lib/azure-toolkit-ide-springcloud-lib-0.39.2.jar
 Import-Package: com.microsoft.azuretools.core.actions,
  org.eclipse.core.expressions,
  org.eclipse.jface.text.hyperlink,

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/pom.xml

@@ -13,7 +13,7 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-toolkit-ide-springcloud-lib</artifactId>
-      <version>0.39.0-SNAPSHOT</version>
+      <version>0.39.2</version>
     </dependency>
   </dependencies>
   <build>

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

@@ -131,7 +131,7 @@ public String getLocalSettingsJsonPath() {
     @javax.annotation.Nullable
     public String getDefaultLocalSettingsJsonPath(final Module module) {
         // workaround to get module file, todo: investigate the process canceled exception with FilenameIndex API
-        return Paths.get(ModuleUtil.getModuleDirPath(module), "local.settings.json").toString();
+        return Objects.isNull(module) || Objects.isNull(module.getModuleFilePath()) ? null : Paths.get(ModuleUtil.getModuleDirPath(module), "local.settings.json").toString();
     }
 
     public Map<String, String> getAppSettings() {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/appservice/input/AppServiceNameInput.java

@@ -3,7 +3,7 @@
 import com.microsoft.azure.toolkit.ide.guidance.ComponentContext;
 import com.microsoft.azure.toolkit.ide.guidance.config.InputConfig;
 import com.microsoft.azure.toolkit.ide.guidance.input.GuidanceInput;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Nonnull;
 

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

@@ -17,7 +17,7 @@
 import com.microsoft.azure.toolkit.lib.appservice.function.FunctionApp;
 import com.microsoft.azure.toolkit.lib.common.action.Action;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Nonnull;
 import java.util.List;
@@ -43,11 +43,11 @@ public void execute() throws Exception {
         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",
-                functionId)).listFunctions(true);
+            functionId)).listFunctions(true);
         final FunctionEntity target = functionEntities.stream().filter(entity -> StringUtils.equals(entity.getName(), trigger))
-                .findFirst().orElse(functionEntities.get(0));
+            .findFirst().orElse(functionEntities.get(0));
         final Action.Id<FunctionEntity> action = PlatformUtils.isIdeaUltimate() ?
-                FunctionAppActionsContributor.TRIGGER_FUNCTION_WITH_HTTP_CLIENT : FunctionAppActionsContributor.TRIGGER_FUNCTION_IN_BROWSER;
+            FunctionAppActionsContributor.TRIGGER_FUNCTION_WITH_HTTP_CLIENT : FunctionAppActionsContributor.TRIGGER_FUNCTION_IN_BROWSER;
         final DataContext context = dataId -> CommonDataKeys.PROJECT.getName().equals(dataId) ? project : null;
         final AnActionEvent event = AnActionEvent.createFromAnAction(new EmptyAction(), null, "azure.guidance.summary", context);
         IntellijAzureActionManager.getInstance().getAction(action).handle(target, event);

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

@@ -10,7 +10,7 @@
 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 org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.jetbrains.annotations.Nullable;
 
@@ -21,7 +21,7 @@
 import java.util.regex.Pattern;
 
 public class AddAppSettingsDialog extends AzureDialog<Pair<String, String>>
-        implements AzureForm<Pair<String, String>> {
+    implements AzureForm<Pair<String, String>> {
 
     private static final Pattern APP_SETTINGS_NAME_PATTERN = Pattern.compile("^[a-zA-Z0-9_\\.]+$");
 

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-base/build.gradle

@@ -42,8 +42,8 @@ allprojects {
     }
 
     ext {
-        azureToolkitLibsVersion = "0.39.0-SNAPSHOT"
-        azureToolkitIdeLibsVersion = "0.39.0-SNAPSHOT"
+        azureToolkitLibsVersion = "0.39.2"
+        azureToolkitIdeLibsVersion = "0.39.2"
     }
 
     dependencyManagement {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-base/gradle.properties

@@ -1,4 +1,4 @@
-pluginVersion=3.83.0-SNAPSHOT
+pluginVersion=3.83.0
 intellijDisplayVersion=2023.1
 intellij_version=IU-2023.1
 dep_plugins=org.intellij.scala:2023.1.6

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

@@ -2,7 +2,7 @@
              xmlns:xi="http://www.w3.org/2001/XInclude">
   <id>com.microsoft.tooling.msservices.intellij.azure</id>
   <name>Azure Toolkit</name>
-  <version>3.83.0-SNAPSHOT</version>
+  <version>3.83.0</version>
   <vendor email="[email protected]" url="http://www.microsoft.com">Microsoft</vendor>
 
   <description>

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cognitiveservices/src/main/java/com/microsoft/azure/toolkit/intellij/cognitiveservices/chatbox/sourcecode/ViewCodePanel.java

@@ -7,7 +7,6 @@
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.ex.FileTypeManagerEx;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.ui.ComboBox;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.ui.EditorTextField;
@@ -20,7 +19,7 @@
 import com.microsoft.azure.toolkit.lib.cognitiveservices.CognitiveAccount;
 import com.microsoft.azure.toolkit.lib.cognitiveservices.CognitiveDeployment;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
-import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang3.BooleanUtils;
 
 import javax.annotation.Nonnull;
 import javax.swing.*;

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cognitiveservices/src/main/java/com/microsoft/azure/toolkit/intellij/cognitiveservices/components/CognitiveSubscriptionComboBox.java

@@ -11,7 +11,7 @@
 import com.microsoft.azure.toolkit.lib.cognitiveservices.AzureCognitiveServices;
 import com.microsoft.azure.toolkit.lib.common.model.Subscription;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang3.BooleanUtils;
 
 import javax.annotation.Nonnull;
 import java.util.*;
@@ -29,15 +29,15 @@ public CognitiveSubscriptionComboBox(boolean listUnselectedSubscriptions) {
     @Override
     protected List<Subscription> loadItems() {
         final List<Subscription> subscriptions = Optional.of(super.loadItems()).filter(CollectionUtils::isNotEmpty)
-                .orElseGet(this::getAllSubscriptions);
+            .orElseGet(this::getAllSubscriptions);
         this.status = subscriptions.stream().collect(Collectors.toMap(subscription -> subscription,
-                subscription -> Azure.az(AzureCognitiveServices.class).isOpenAIEnabled(subscription.getId())));
+            subscription -> Azure.az(AzureCognitiveServices.class).isOpenAIEnabled(subscription.getId())));
         return subscriptions;
     }
 
     private List<Subscription> getAllSubscriptions() {
         return listUnselectedSubscriptions && Azure.az(AzureAccount.class).isLoggedIn() ?
-                Azure.az(AzureAccount.class).getAccount().getSubscriptions() : Collections.emptyList();
+            Azure.az(AzureAccount.class).getAccount().getSubscriptions() : Collections.emptyList();
     }
 
     @Override

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cognitiveservices/src/main/java/com/microsoft/azure/toolkit/intellij/cognitiveservices/creation/CognitiveAccountCreationDialog.java

@@ -21,7 +21,7 @@
 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 org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nonnull;
@@ -37,7 +37,7 @@
 
 public class CognitiveAccountCreationDialog extends AzureDialog<CognitiveAccountDraft> implements AzureForm<CognitiveAccountDraft> {
     public static final String REGISTER_SUBSCRIPTION_TEXT = "Azure OpenAI Service is currently available to customers via an application form. The selected subscription has not been enabled for use of the service and does not have quota for any pricing tiers. " +
-            "<a href = \"https://aka.ms/oai/access\">Click here to request access to Azure OpenAI service</a>.\u2197";
+        "<a href = \"https://aka.ms/oai/access\">Click here to request access to Azure OpenAI service</a>.\u2197";
     private JLabel lblSubscription;
     private CognitiveSubscriptionComboBox cbSubscription;
     private JLabel lblResourceGroup;
@@ -112,7 +112,7 @@ private void createUIComponents() {
             @Override
             protected @NotNull HyperlinkListener createHyperlinkListener() {
                 return event -> Optional.of(event).filter(e -> e.getEventType() == HyperlinkEvent.EventType.ACTIVATED)
-                        .ifPresent(ignore -> AzureActionManager.getInstance().getAction(CognitiveServicesActionsContributor.ENABLE_OPENAI).handle(cbSubscription.getValue()));
+                    .ifPresent(ignore -> AzureActionManager.getInstance().getAction(CognitiveServicesActionsContributor.ENABLE_OPENAI).handle(cbSubscription.getValue()));
             }
         };
 
@@ -139,7 +139,7 @@ public CognitiveAccountDraft getValue() {
         final String name = Objects.requireNonNull(txtName.getValue());
         final ResourceGroup resourceGroup = Objects.requireNonNull(cbResourceGroup.getValue());
         final CognitiveAccountDraft draft = Azure.az(AzureCognitiveServices.class)
-                .accounts(subscription.getId()).create(name, resourceGroup.getName());
+            .accounts(subscription.getId()).create(name, resourceGroup.getName());
         final CognitiveAccountDraft.Config config = new CognitiveAccountDraft.Config();
         config.setResourceGroup(resourceGroup);
         config.setName(name);

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cognitiveservices/src/main/java/com/microsoft/azure/toolkit/intellij/cognitiveservices/playground/SystemMessagePanel.java

@@ -24,7 +24,7 @@
 import lombok.Setter;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils;
 
 import javax.annotation.Nonnull;
 import javax.swing.*;
@@ -40,9 +40,9 @@
 public class SystemMessagePanel implements AzureForm<SystemMessage> {
     private static final int DEBOUNCE_DELAY = 200;
     public static final String SYSTEM_MESSAGE_DESCRIPTION = "Use a template to get started, or just start writing your own system " +
-            "message below. Want some tips? <a href = \"https://go.microsoft.com/fwlink/?linkid=2235756\">Learn more</a>\u2197";
+        "message below. Want some tips? <a href = \"https://go.microsoft.com/fwlink/?linkid=2235756\">Learn more</a>\u2197";
     public static final String EXAMPLE_DESCRIPTION = "Add examples to show the chat what responses you want. " +
-            "It will try to mimic any responses you add here so make sure they match the rules you laid out in the system message.";
+        "It will try to mimic any responses you add here so make sure they match the rules you laid out in the system message.";
     public static final String CHANGE_SYSTEM_MESSAGE_CONFIRM_MESSAGE = "Loading a new example will replace the current system message and start a new chat session. To save the current system message, copy it to a separate document before continuing.";
     public static final String UPDATE_SYSTEM_MESSAGE = "Update system message?";
     private JPanel pnlRoot;
@@ -74,8 +74,8 @@ public SystemMessagePanel() {
 
     private void init() {
         final Action<Void> addExampleAction = new Action<Void>(Action.Id.of("user/openai.add_example"))
-                .withAuthRequired(false)
-                .withHandler(ignore -> this.onAddNewExample());
+            .withAuthRequired(false)
+            .withHandler(ignore -> this.onAddNewExample());
         this.btnAddExample.setAction(addExampleAction);
         this.btnAddExample.setIcon(AllIcons.General.Add);
 

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-containerapps/src/main/java/com/microsoft/azure/toolkit/intellij/containerapps/properties/ContainerAppPropertiesEditor.java

@@ -21,7 +21,6 @@
 import com.microsoft.azure.toolkit.lib.Azure;
 import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
 import com.microsoft.azure.toolkit.lib.common.action.Action;
-import com.microsoft.azure.toolkit.lib.common.bundle.AzureString;
 import com.microsoft.azure.toolkit.lib.common.model.AzResource;
 import com.microsoft.azure.toolkit.lib.common.model.Region;
 import com.microsoft.azure.toolkit.lib.common.model.Subscription;
@@ -154,12 +153,11 @@ private void initListeners() {
                 .withIdParam(this.containerApp.getName())
                 .withHandler(ignore -> this.refresh());
         this.btnRefresh.setAction(refreshAction);
-        final AzureString saveTitle = AzureString.format("Saving updates of app(%s)", this.draft.getName());
         final Action<Void> saveAction = new Action<Void>(Action.Id.of("user/containerapps.update_container_app.app"))
                 .withAuthRequired(true)
                 .withSource(this.containerApp)
                 .withIdParam(this.containerApp.getName())
-                .withHandler(ignore -> tm.runInBackground(saveTitle, this::save));
+                .withHandler(ignore -> this.save());
         this.saveButton.setAction(saveAction);
     }
 
@@ -239,7 +237,7 @@ private void save() {
         final ContainerAppDraft.Config config = Optional.ofNullable(this.draft.getConfig()).orElseGet(ContainerAppDraft.Config::new);
         config.setIngressConfig(ingressConfig);
         draft.setConfig(config);
-        AzureTaskManager.getInstance().runInBackground("Saving updates", this.draft::commit);
+        AzureTaskManager.getInstance().runInBackground("save updates", this.draft::commit);
     }
 
     private void reset() {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-containerregistry/src/main/java/com/microsoft/azure/toolkit/intellij/container/model/DockerHost.java

@@ -10,7 +10,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 @Data
 @EqualsAndHashCode