Merge pull request #9534 from microsoft/hanli/fixes-202410

Resolve issues in end game bits

Author: wangmingliang-ms

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

@@ -47,7 +47,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 = "[^/]+";
@@ -131,12 +131,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-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;
     }