Fix another instance of credentials being resolved on EDT (#2431)

Author: rli

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonDebugUtils.kt

@@ -9,39 +9,47 @@ import com.intellij.xdebugger.XDebugProcessStarter
 import com.intellij.xdebugger.XDebugSession
 import com.jetbrains.python.PythonHelper
 import com.jetbrains.python.debugger.PyDebugProcess
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import software.aws.toolkits.jetbrains.services.PathMapper
 import software.aws.toolkits.jetbrains.services.PathMapping
 import software.aws.toolkits.jetbrains.services.lambda.execution.sam.SamRunningState
 
 object PythonDebugUtils {
     const val DEBUGGER_VOLUME_PATH = "/tmp/lambci_debug_files"
 
-    fun createDebugProcess(
+    suspend fun createDebugProcess(
         environment: ExecutionEnvironment,
         state: SamRunningState,
         debugHost: String,
         debugPorts: List<Int>
-    ): XDebugProcessStarter = object : XDebugProcessStarter() {
-        override fun start(session: XDebugSession): XDebugProcess {
+    ): XDebugProcessStarter {
+        val executionResult = withContext(Dispatchers.IO) {
+            // needs to run off EDT since it resolves credentials
+            state.execute(environment.executor, environment.runner)
+        }
+
+        return object : XDebugProcessStarter() {
+            override fun start(session: XDebugSession): XDebugProcess {
 
-            val mappings = state.pathMappings.plus(
-                listOf(
-                    PathMapping(
-                        PythonHelper.DEBUGGER.pythonPathEntry,
-                        DEBUGGER_VOLUME_PATH
+                val mappings = state.pathMappings.plus(
+                    listOf(
+                        PathMapping(
+                            PythonHelper.DEBUGGER.pythonPathEntry,
+                            DEBUGGER_VOLUME_PATH
+                        )
                     )
                 )
-            )
 
-            val executionResult = state.execute(environment.executor, environment.runner)
-            return PyDebugProcess(
-                session,
-                executionResult.executionConsole,
-                executionResult.processHandler,
-                debugHost,
-                debugPorts.first()
-            ).also {
-                it.positionConverter = PathMapper.PositionConverter(PathMapper(mappings))
+                return PyDebugProcess(
+                    session,
+                    executionResult.executionConsole,
+                    executionResult.processHandler,
+                    debugHost,
+                    debugPorts.first()
+                ).also {
+                    it.positionConverter = PathMapper.PositionConverter(PathMapper(mappings))
+                }
             }
         }
     }

jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsDebugUtils.kt

@@ -17,6 +17,8 @@ import com.intellij.xdebugger.XDebugProcessStarter
 import com.intellij.xdebugger.XDebugSession
 import com.jetbrains.debugger.wip.WipLocalVmConnection
 import com.jetbrains.nodeJs.NodeChromeDebugProcess
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import org.jetbrains.io.LocalFileFinder
 import software.aws.toolkits.jetbrains.services.PathMapping
 import software.aws.toolkits.jetbrains.services.lambda.execution.sam.SamRunningState
@@ -25,36 +27,42 @@ import java.net.InetSocketAddress
 object NodeJsDebugUtils {
     private const val NODE_MODULES = "node_modules"
 
-    fun createDebugProcess(
+    suspend fun createDebugProcess(
         environment: ExecutionEnvironment,
         state: SamRunningState,
         debugHost: String,
         debugPorts: List<Int>
-    ): XDebugProcessStarter = object : XDebugProcessStarter() {
-        override fun start(session: XDebugSession): XDebugProcess {
-            val mappings = createBiMapMappings(state.pathMappings)
-            val fileFinder = RemoteDebuggingFileFinder(mappings, LocalFileSystemFileFinder())
+    ): XDebugProcessStarter {
+        val executionResult = withContext(Dispatchers.IO) {
+            // needs to run off EDT since it resolves credentials
+            state.execute(environment.executor, environment.runner)
+        }
+
+        return object : XDebugProcessStarter() {
+            override fun start(session: XDebugSession): XDebugProcess {
+                val mappings = createBiMapMappings(state.pathMappings)
+                val fileFinder = RemoteDebuggingFileFinder(mappings, LocalFileSystemFileFinder())
 
-            val connection = WipLocalVmConnection()
-            val executionResult = state.execute(environment.executor, environment.runner)
+                val connection = WipLocalVmConnection()
 
-            val process = NodeChromeDebugProcess(session, fileFinder, connection, executionResult)
+                val process = NodeChromeDebugProcess(session, fileFinder, connection, executionResult)
 
-            val processHandler = executionResult.processHandler
-            val socketAddress = InetSocketAddress(debugHost, debugPorts.first())
+                val processHandler = executionResult.processHandler
+                val socketAddress = InetSocketAddress(debugHost, debugPorts.first())
 
-            if (processHandler == null || processHandler.isStartNotified) {
-                connection.open(socketAddress)
-            } else {
-                processHandler.addProcessListener(
-                    object : ProcessAdapter() {
-                        override fun startNotified(event: ProcessEvent) {
-                            connection.open(socketAddress)
+                if (processHandler == null || processHandler.isStartNotified) {
+                    connection.open(socketAddress)
+                } else {
+                    processHandler.addProcessListener(
+                        object : ProcessAdapter() {
+                            override fun startNotified(event: ProcessEvent) {
+                                connection.open(socketAddress)
+                            }
                         }
-                    }
-                )
+                    )
+                }
+                return process
             }
-            return process
         }
     }