Merge pull request #995 from JetBrains/endgame-202410

Merge Endgame 202410

Author: rafaelldi

.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

@@ -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/AddLibrary/AzureLibraries/pom.xml

@@ -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/META-INF/MANIFEST.MF

@@ -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.appservice/pom.xml

@@ -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/META-INF/MANIFEST.MF

@@ -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-eclipse/com.microsoft.azuretools.springcloud/pom.xml

@@ -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/.idea/gradle.xml

@@ -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);
         }