Merge pull request #995 from JetBrains/endgame-202410

Merge Endgame 202410

.github/workflows/build.yml

@@ -28,7 +28,7 @@ concurrency:
 
 env:
   # Branches from the https://github.com/microsoft/azure-maven-plugins and https://github.com/microsoft/azure-tools-for-java repositories
-  ENDGAME_VERSION: endgame-202408
+  ENDGAME_VERSION: endgame-202410
 
 jobs:
 

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.93.0](#3930)
   - [3.92.0](#3920)
   - [3.91.0](#3910)
   - [3.90.0](#3900)
@@ -114,6 +115,10 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
   - [3.0.7](#307)
   - [3.0.6](#306)
 
+## 3.93.0
+- Support IntelliJ 2024.3 Beta
+- Support Azure Cloud Shell (Thanks for @rafaelldi)
+
 ## 3.92.0
 - Added Managed identity support for Azure Functions.
 - Fixed [#8473](https://github.com/microsoft/azure-tools-for-java/issues/8473): Class initialization must not depend on services. Consider using instance of the service on-demand instead.

PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml

@@ -27,7 +27,7 @@
   <parent>
     <groupId>com.microsoft.azuretools</groupId>
     <artifactId>utils</artifactId>
-    <version>3.92.0</version>
+    <version>3.93.0</version>
   </parent>
   <groupId>com.microsoft.azuretools</groupId>
   <artifactId>com.microsoft.azuretools.sdk.lib</artifactId>
@@ -39,9 +39,9 @@
   </organization>
 
   <properties>
-    <azuretool.version>3.92.0</azuretool.version>
+    <azuretool.version>3.93.0</azuretool.version>
     <azuretool.sdk.version>3.32.0.qualifier</azuretool.sdk.version>
-    <azure.toolkit-lib.version>0.48.0</azure.toolkit-lib.version>
+    <azure.toolkit-lib.version>0.49.0</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.48.0.jar
+ target/lib/azure-toolkit-ide-appservice-lib-0.49.0.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.48.0</version>
+      <version>0.49.0</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.48.0.jar
+ target/lib/azure-toolkit-ide-springcloud-lib-0.49.0.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.48.0</version>
+      <version>0.49.0</version>
     </dependency>
   </dependencies>
   <build>

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

@@ -52,8 +52,6 @@ public void execute() throws Exception {
         webAppConfig.subscriptionId(subscription.getId());
         webAppConfig.runtime(RuntimeConfig.fromRuntime(WebAppRuntime.getDefaultJavaseRuntime()));
 
-        final String rgName = Utils.generateRandomResourceName(String.format("rg-%s", name), 90);
-        webAppConfig.resourceGroup(rgName);
 	    final WebAppBase<?, ?, ?> webApp = WebAppService.getInstance().createWebApp(webAppConfig);
         context.applyResult(WEBAPP_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/appservice/action/SSHIntoWebAppAction.java

@@ -11,6 +11,7 @@
 import com.microsoft.azure.toolkit.ide.common.action.ResourceCommonActionsContributor;
 import com.microsoft.azure.toolkit.intellij.common.TerminalUtils;
 import com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem;
+import com.microsoft.azure.toolkit.lib.appservice.model.Runtime;
 import com.microsoft.azure.toolkit.lib.appservice.webapp.WebApp;
 import com.microsoft.azure.toolkit.lib.common.action.Action;
 import com.microsoft.azure.toolkit.lib.common.action.AzureActionManager;
@@ -30,6 +31,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.AbstractList;
+import java.util.Optional;
 
 import static com.microsoft.azure.toolkit.intellij.common.AzureBundle.message;
 import static com.microsoft.azure.toolkit.lib.common.operation.OperationBundle.description;
@@ -47,7 +49,7 @@ public class SSHIntoWebAppAction {
     private static final String WEB_APP_DOCKER_PREFIX = "DOCKER|";
     private static final String CMD_SSH_TO_LOCAL_PROXY =
             "ssh -o StrictHostKeyChecking=no -o \"UserKnownHostsFile /dev/null\" -o \"LogLevel ERROR\" %[email protected] -p %d";
-
+    private static final Integer TERMINAL_MAX_SIZE = 1024 * 8;
     private static final String WEBAPP_TERMINAL_TABLE_NAME = "SSH - %s";
     private static final String RESOURCE_GROUP_PATH_PREFIX = "resourceGroups/";
     private static final String RESOURCE_ELEMENT_PATTERN = "[^/]+";
@@ -70,7 +72,7 @@ public void execute() {
         final AzureString title = description("user/webapp.connect_ssh.app", webAppName);
         AzureTaskManager.getInstance().runInBackground(new AzureTask<>(project, title, false,
                 () -> {
-                    if (webApp.getRuntime().getOperatingSystem() == OperatingSystem.WINDOWS) {
+                    if (Optional.ofNullable(webApp.getRuntime()).map(Runtime::getOperatingSystem).orElse(null) == OperatingSystem.WINDOWS) {
                         AzureMessager.getMessager().warning(message("webapp.ssh.windowsNotSupport"));
                         return;
                     }
@@ -131,12 +133,14 @@ private static boolean waitForInputPassword(TtyConnector connector) throws Illeg
         final int interval = 500;
         final int times = 30000 / interval;
         while (count++ < times) {
-            final AbstractList<Byte> outputCache = (AbstractList<Byte>) FieldUtils.readField(connector, "outputCache", true);
-            Byte[] bytes = new Byte[outputCache.size()];
-            bytes = outputCache.toArray(bytes);
-            final byte[] myBuf = ArrayUtils.toPrimitive(bytes);
-            if (myBuf != null && new String(myBuf, StandardCharsets.UTF_8).contains("password:")) {
-                return true;
+            try {
+                final char[] result = new char[TERMINAL_MAX_SIZE];
+                connector.read(result, 0, TERMINAL_MAX_SIZE -1 );
+                if (new String(result).contains("password:")) {
+                    return true;
+                }
+            } catch (final IOException ignore) {
+                continue;
             }
             Thread.sleep(interval);
         }

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

@@ -42,8 +42,8 @@ allprojects {
     }
 
     ext {
-        azureToolkitLibsVersion = "0.48.0"
-        azureToolkitIdeLibsVersion = "0.48.0"
+        azureToolkitLibsVersion = "0.49.0"
+        azureToolkitIdeLibsVersion = "0.49.0"
     }
 
     dependencyManagement {

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

@@ -1,8 +1,8 @@
-pluginVersion=3.92.0
-intellijDisplayVersion=2024.1
-intellij_version=IU-241-EAP-SNAPSHOT
-scala_plugin=org.intellij.scala:2024.1.2
-patchPluginXmlSinceBuild=241.12662.62
+pluginVersion=3.93.0
+intellijDisplayVersion=2024.2
+intellij_version=IU-242-EAP-SNAPSHOT
+scala_plugin=org.intellij.scala:2024.2.5
+patchPluginXmlSinceBuild=242.15523.18
 needPatchVersion=true
 javaVersion=17
 sources=true

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.92.0</version>
+  <version>3.93.0</version>
   <vendor email="[email protected]" url="http://www.microsoft.com">Microsoft</vendor>
 
   <description>

PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-cloud-shell/src/main/kotlin/com/microsoft/azure/toolkit/intellij/cloudshell/actions/UploadToCloudShellAction.kt → PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cloud-shell/src/main/kotlin/com/microsoft/azure/toolkit/intellij/cloudshell/actions/UploadToCloudShellAction.kt

@@ -15,6 +15,7 @@ import com.intellij.openapi.fileChooser.FileChooserDescriptor
 import com.intellij.openapi.progress.currentThreadCoroutineScope
 import com.intellij.openapi.vfs.VirtualFile
 import com.microsoft.azure.toolkit.intellij.cloudshell.CloudShellService
+import com.microsoft.azure.toolkit.lib.common.messager.AzureMessager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
@@ -35,7 +36,7 @@ class UploadToCloudShellAction : AnAction() {
         val activeConnector = CloudShellService.getInstance(project).activeConnector() ?: return
 
         currentThreadCoroutineScope().launch(Dispatchers.EDT) {
-            val descriptor = FileChooserDescriptor(true, false, false, true, false, true).apply {
+            val descriptor = FileChooserDescriptor(true, false, true, true, false, true).apply {
                 title = "Select File(s) To Upload To Azure Cloud Shell"
             }
             FileChooser.chooseFiles(descriptor, project, null, null, object : FileChooser.FileChooserConsumer {

PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-cloud-shell/src/main/kotlin/com/microsoft/azure/toolkit/intellij/cloudshell/terminal/AzureCloudTerminalRunner.kt → PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cloud-shell/src/main/kotlin/com/microsoft/azure/toolkit/intellij/cloudshell/terminal/AzureCloudTerminalRunner.kt

@@ -9,7 +9,7 @@ package com.microsoft.azure.toolkit.intellij.cloudshell.terminal
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
-import com.intellij.platform.util.coroutines.childScope
+import com.intellij.platform.util.coroutines.namedChildScope
 import com.jediterm.terminal.TtyConnector
 import com.microsoft.azure.toolkit.intellij.cloudshell.CloudShellService
 import com.microsoft.azure.toolkit.intellij.cloudshell.controlchannel.CloudConsoleControlChannelClient
@@ -56,7 +56,7 @@ class AzureCloudTerminalRunner(
             cloudConsoleBaseUrl,
             project
         )
-        controlClient.connect(scope.childScope("CloudConsoleControlChannelClient"))
+        controlClient.connect(scope.namedChildScope("CloudConsoleControlChannelClient"))
 
         val connector = createConnector(process)
         Disposer.register(connector, controlClient)
@@ -70,7 +70,7 @@ class AzureCloudTerminalRunner(
     private fun createConnector(process: CloudTerminalProcess) = AzureCloudProcessTtyConnector(
         process,
         project,
-        scope.childScope("AzureCloudProcessTtyConnector"),
+        scope.namedChildScope("AzureCloudProcessTtyConnector"),
         uploadFileToTerminalUrl,
         previewPortBaseUrl,
         resizeTerminalUrl

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

@@ -5,9 +5,9 @@
 
 package com.microsoft.azure.toolkit.intellij.cognitiveservices.chatbox;
 
-import com.intellij.collaboration.ui.codereview.comment.RoundedPanel;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.ui.JBColor;
+import com.intellij.ui.components.panels.BackgroundRoundedPanel;
 import com.intellij.uiDesigner.core.GridLayoutManager;
 import com.intellij.util.IconUtil;
 import com.microsoft.azure.toolkit.ide.common.icon.AzureIcons;
@@ -50,6 +50,6 @@ private void setValue(MarkdownText markdownText) {
     private void createUIComponents() {
         // final int arc = NotificationBalloonRoundShadowBorderProvider.CORNER_RADIUS.get();
         //noinspection UnstableApiUsage
-        this.messageContainer = new RoundedPanel(new GridLayoutManager(1, 1), 5);
+        this.messageContainer = new BackgroundRoundedPanel(5, new GridLayoutManager(1, 1));
     }
 }

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

@@ -5,11 +5,9 @@
 
 package com.microsoft.azure.toolkit.intellij.cognitiveservices.chatbox;
 
-import com.intellij.collaboration.ui.codereview.comment.RoundedPanel;
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.ui.JBColor;
-import com.intellij.ui.NotificationBalloonRoundShadowBorderProvider;
+import com.intellij.ui.components.panels.BackgroundRoundedPanel;
 import com.intellij.uiDesigner.core.GridLayoutManager;
 import com.intellij.util.IconUtil;
 import com.microsoft.azure.toolkit.ide.common.icon.AzureIcons;
@@ -52,6 +50,6 @@ private void setValue(MarkdownText markdownText) {
     private void createUIComponents() {
         // final int arc = NotificationBalloonRoundShadowBorderProvider.CORNER_RADIUS.get();
         //noinspection UnstableApiUsage
-        this.messageContainer = new RoundedPanel(new GridLayoutManager(1, 1), 5);
+        this.messageContainer = new BackgroundRoundedPanel(5, new GridLayoutManager(1, 1));
     }
 }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-guidance-java/src/main/java/com/microsoft/azure/toolkit/ide/guidance/view/components/CoursePanel.java

@@ -1,8 +1,8 @@
 package com.microsoft.azure.toolkit.ide.guidance.view.components;
 
-import com.intellij.collaboration.ui.codereview.comment.RoundedPanel;
 import com.intellij.openapi.project.Project;
 import com.intellij.ui.JBColor;
+import com.intellij.ui.components.panels.BackgroundRoundedPanel;
 import com.intellij.uiDesigner.core.GridLayoutManager;
 import com.intellij.util.ui.JBFont;
 import com.intellij.util.ui.JBUI;
@@ -21,7 +21,6 @@
 import javax.annotation.Nonnull;
 import javax.swing.*;
 import javax.swing.border.Border;
-import javax.swing.border.CompoundBorder;
 import java.awt.*;
 import java.awt.event.MouseListener;
 import java.util.Arrays;
@@ -41,7 +40,7 @@ public class CoursePanel {
     private boolean isStartedActionTriggered;
     private final boolean showNewUIFlag;
     public static final JBColor NOTIFICATION_BACKGROUND_COLOR =
-            JBColor.namedColor("StatusBar.hoverBackground", new JBColor(15595004, 4606541));
+        JBColor.namedColor("StatusBar.hoverBackground", new JBColor(15595004, 4606541));
 
     public CoursePanel(@Nonnull final CourseConfig course, @Nonnull final Project project) {
         super();
@@ -66,9 +65,9 @@ private void init() {
         }
         this.startButton.setVisible(false);
         final Action<Void> startAction = new Action<Void>(Action.Id.of("user/guidance.open_course.course"))
-                .withAuthRequired(false)
-                .withIdParam(ignore -> this.course.getTitle())
-                .withHandler(ignore -> openGuidance());
+            .withAuthRequired(false)
+            .withIdParam(ignore -> this.course.getTitle())
+            .withHandler(ignore -> openGuidance());
         this.startButton.setAction(startAction);
         this.areaDescription.setFont(JBFont.medium());
         this.areaDescription.setText(course.getDescription());
@@ -130,7 +129,7 @@ private void setBackgroundColor(@Nonnull final JPanel c, @Nonnull final Color co
 
     private void createUIComponents() {
         //noinspection UnstableApiUsage
-        this.rootPanel = new RoundedPanel(new GridLayoutManager(3, 3), 5);
+        this.rootPanel = new BackgroundRoundedPanel(5, new GridLayoutManager(3, 3));
         this.rootPanel.setBorder(BorderFactory.createEmptyBorder());
         this.tagsPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 8, 0));
         this.tagsPanel.setBorder(JBUI.Borders.emptyLeft(-8));

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight-lib/src/main/kotlin/com/microsoft/intellij/feedback/HDInsightReportable.kt

@@ -45,7 +45,7 @@ open class HDInsightReportable(private val shortMessage: String) : DumbAware {
     private val additionalInfo = mutableMapOf<String, String>()
 
     open fun getTitleTags(): Set<String> {
-        return setOf("IntelliJ", "ReportedByUser")
+        return setOf("IntelliJ")
     }
 
     open fun getTitle(): String {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib-java/src/main/kotlin/com/microsfot/azure/toolkit/intellij/feedback/GithubIssue.kt

@@ -32,7 +32,7 @@ import java.nio.charset.StandardCharsets
 class GithubIssue<T : Reportable>(private val reportable: T) {
     private val plugin = reportable.plugin
     private val loginPrefix = "https://github.com/login"
-    private val labels = mutableSetOf("IntelliJ")
+    private val labels = mutableSetOf("IntelliJ Reported")
 
     private val pluginRepo: URI
         get() {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib-java/src/main/kotlin/com/microsfot/azure/toolkit/intellij/feedback/Reportable.kt

@@ -45,7 +45,7 @@ open class Reportable(private val shortMessage: String) : DumbAware {
     private val additionalInfo = mutableMapOf<String, String>()
 
     open fun getTitleTags(): Set<String> {
-        return setOf("IntelliJ", "ReportedByUser")
+        return setOf("IntelliJ")
     }
 
     open fun getTitle(): String {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib-java/src/main/kotlin/com/microsfot/azure/toolkit/intellij/feedback/ReportableFeatureRequest.kt

@@ -32,7 +32,7 @@ class ReportableFeatureRequest(shortMessage: String) : Reportable(shortMessage)
     )
 
     override fun getTitleTags(): Set<String> {
-        return setOf("IntelliJ", "ReportedByUser", "feature-request")
+        return setOf("IntelliJ", "feature-request")
     }
 
     override fun getBody(): String {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib-java/src/main/resources/whatsnew.md

@@ -1,5 +1,10 @@
 <!-- Version: 3.88.0 -->
 # What's new in Azure Toolkit for IntelliJ
+
+## 3.93.0
+- Support IntelliJ 2024.3 Beta
+- Support Azure Cloud Shell (Thanks for @rafaelldi)
+
 ## 3.92.0
 - Added Managed identity support for Azure Functions.
 - Fixed [#8473](https://github.com/microsoft/azure-tools-for-java/issues/8473): Class initialization must not depend on services. Consider using instance of the service on-demand instead.

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/feedback/RatePopup.java

@@ -5,7 +5,6 @@
 
 package com.microsoft.azure.toolkit.intellij.common.feedback;
 
-import com.intellij.collaboration.ui.codereview.comment.RoundedPanel;
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.Balloon;
@@ -16,6 +15,7 @@
 import com.intellij.ui.NotificationBalloonRoundShadowBorderProvider;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.ui.components.ActionLink;
+import com.intellij.ui.components.panels.BackgroundRoundedPanel;
 import com.intellij.uiDesigner.core.GridLayoutManager;
 import com.intellij.util.IconUtil;
 import com.intellij.util.ui.JBUI;
@@ -74,7 +74,7 @@ public RatePopup() {
     private void createUIComponents() {
         final int arc = NotificationBalloonRoundShadowBorderProvider.CORNER_RADIUS.get();
         //noinspection UnstableApiUsage
-        this.contentPanel = new RoundedPanel(new GridLayoutManager(4, 1), arc);
+        this.contentPanel = new BackgroundRoundedPanel(arc, new GridLayoutManager(4, 1));
         this.contentPanel.setPreferredSize(new Dimension(338, 112));
         this.contentPanel.setBackground(BACKGROUND_COLOR);
         this.contentPanel.setBorder(BorderFactory.createEmptyBorder());