Merge pull request #9561 from microsoft/endgame-202410

Merge endgame to 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.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/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-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-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/fileexplorer/VirtualFileActions.java

@@ -131,14 +131,14 @@ public void beforeFileClosed(FileEditorManager source, VirtualFile file) {
 
     public static VirtualFile getVirtualFile(String fileId, FileEditorManager manager) {
         return Arrays.stream(manager.getOpenFiles())
-            .filter(f -> StringUtils.equals(f.getUserData(FILE_ID), fileId))
-            .findAny().orElse(null);
+                .filter(f -> StringUtils.equals(f.getUserData(FILE_ID), fileId))
+                .findAny().orElse(null);
     }
 
     public static VirtualFile createVirtualFile(String fileId, String fileName, File file, FileEditorManager manager) {
         return Arrays.stream(manager.getOpenFiles())
-            .filter(f -> StringUtils.equals(f.getUserData(FILE_ID), fileId))
-            .findAny().orElse(createTempVirtualFile(fileId, fileName, file, manager));
+                .filter(f -> StringUtils.equals(f.getUserData(FILE_ID), fileId))
+                .findAny().orElse(createTempVirtualFile(fileId, fileName, file, manager));
     }
 
     @SneakyThrows
@@ -147,7 +147,13 @@ private static VirtualFile createTempVirtualFile(final String fileId, final Stri
         final VirtualFile virtualFile = new RemoteVirtualFile(origin, fileName);
         virtualFile.setCharset(StandardCharsets.UTF_8);
         virtualFile.putUserData(FILE_ID, fileId);
-        virtualFile.setWritable(true);
+        AzureTaskManager.getInstance().runLater(() -> {
+            try {
+                WriteAction.run(() -> virtualFile.setWritable(true));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
         return virtualFile;
     }
 

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-service-explorer/src/main/java/com/microsoft/azure/toolkit/intellij/explorer/AzureExplorer.java

@@ -202,9 +202,10 @@ public ActionUpdateThread getActionUpdateThread() {
             };
             final AnAction feedbackAction = ActionManager.getInstance().getAction("Actions.ProvideFeedback");
             final AnAction getStartAction = ActionManager.getInstance().getAction("Actions.GettingStart");
+            final AnAction startCloudShellAction = ActionManager.getInstance().getAction("AzureToolkit.CloudShell.Start");
             final AnAction signInAction = ActionManager.getInstance().getAction("AzureToolkit.AzureSignIn");
             final AnAction selectSubscriptionsAction = ActionManager.getInstance().getAction("AzureToolkit.SelectSubscriptions");
-            toolWindow.setTitleActions(Arrays.asList(getStartAction, refreshAction, selectSubscriptionsAction, signInAction, Separator.create(), feedbackAction));
+            toolWindow.setTitleActions(Arrays.asList(getStartAction, refreshAction, selectSubscriptionsAction, startCloudShellAction, signInAction, Separator.create(), feedbackAction));
             if (toolWindow instanceof ToolWindowEx) {
                 final AnAction devBlogsAction = ActionManager.getInstance().getAction("AzureToolkit.ViewDevBlogs");
                 final AnAction documentAction = ActionManager.getInstance().getAction("AzureToolkit.ViewToolingDocument");

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

@@ -27,11 +27,10 @@
   <change-notes>
     <![CDATA[
     <html>
-      <h2 id="3-92-0">3.92.0</h2>
+      <h2 id="3-93-0">3.93.0</h2>
       <ul>
-      <li>Added Managed identity support for Azure Functions.</li>
-      <li>Fixed <a href="https://github.com/microsoft/azure-tools-for-java/issues/8473">#8473</a>: Class initialization must not depend on services. Consider using instance of the service on-demand instead.</li>
-      <li>Fixed <a href="https://github.com/microsoft/azure-tools-for-java/issues/8497">#8497</a>: fix support for swap.</li>
+      <li>Support IntelliJ 2024.3 Beta</li>
+      <li>Support Azure Cloud Shell (Thanks for @rafaelldi)</li>
       </ul>
       <p>You may get the full change log <a href="https://github.com/Microsoft/azure-tools-for-java/blob/develop/CHANGELOG.md">here</a></p>
     </html>