Enable DotNet 3.1 local lambda debug support (#2119)

Author: abrooksv

.changes/next-release/feature-cb714c4a-bf88-4450-b65b-ed13cf91c44a.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Add support for debugging dotnet 3.1 local lambdas (requires minimum SAM CLI version of 1.4.0)"
+}

jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/LambdaDaemonHost.kt

@@ -19,7 +19,6 @@ import com.intellij.psi.SmartPointerManager
 import com.jetbrains.rdclient.util.idea.LifetimedProjectComponent
 import com.jetbrains.rider.model.lambdaDaemonModel
 import com.jetbrains.rider.projectView.solution
-import software.amazon.awssdk.services.lambda.model.Runtime
 import software.aws.toolkits.jetbrains.services.lambda.dotnet.DotNetLambdaHandlerResolver
 import software.aws.toolkits.jetbrains.services.lambda.dotnet.element.RiderLambdaHandlerFakePsiElement
 import software.aws.toolkits.jetbrains.services.lambda.execution.LambdaRunConfigurationType
@@ -96,12 +95,8 @@ class LambdaDaemonHost(project: Project) : LifetimedProjectComponent(project) {
         val configurationType = ConfigurationTypeUtil.findConfigurationType(LambdaRunConfigurationType::class.java)
         val runConfigurations = runManager.getConfigurationsList(configurationType)
 
-        val isDebug = executor is DefaultDebugExecutor
-
         var settings = runConfigurations.filterIsInstance<LocalLambdaRunConfiguration>().firstOrNull { configuration ->
-            configuration.handler() == handler &&
-                // TODO: Get rid of the check when SAM CLI provide support for dotnet 3.1 lambda debug
-                (if (isDebug) configuration.runtime() != Runtime.DOTNETCORE3_1 else true)
+            configuration.handler() == handler
         }?.let { configuration ->
             runManager.findSettings(configuration)
         }
@@ -112,12 +107,7 @@ class LambdaDaemonHost(project: Project) : LifetimedProjectComponent(project) {
             val template = runManager.getConfigurationTemplate(factory)
 
             val configuration = template.configuration as LocalLambdaRunConfiguration
-            val activeRuntime = DotNetRuntimeUtils.getCurrentDotNetCoreRuntime()
-
-            // TODO: Get rid of the check when SAM CLI provide support for dotnet 3.1 lambda debug
-            val runtime =
-                if (isDebug && activeRuntime == Runtime.DOTNETCORE3_1) DotNetRuntimeUtils.defaultDotNetCoreRuntime
-                else activeRuntime
+            val runtime = DotNetRuntimeUtils.getCurrentDotNetCoreRuntime()
 
             LocalLambdaRunConfigurationProducer.setAccountOptions(configuration)
             configuration.useHandler(runtime, handler)

jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamDebugSupport.kt

@@ -41,7 +41,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.jetbrains.concurrency.AsyncPromise
 import org.jetbrains.concurrency.Promise
-import software.amazon.awssdk.services.lambda.model.Runtime
 import software.aws.toolkits.jetbrains.services.lambda.execution.local.SamDebugSupport
 import software.aws.toolkits.jetbrains.services.lambda.execution.local.SamRunningState
 import software.aws.toolkits.jetbrains.utils.ApplicationThreadPoolScope
@@ -73,22 +72,20 @@ class DotNetSamDebugSupport : SamDebugSupport {
         private const val REMOTE_DEBUGGER_DIR = "/tmp/lambci_debug_files"
         private const val REMOTE_NETCORE_CLI_PATH = "/var/lang/bin/dotnet"
         private const val NUMBER_OF_DEBUG_PORTS = 2
+
+        private const val FIND_PID_SCRIPT =
+            """
+                for i in `ls /proc/*/exe` ; do
+                    symlink=`readlink  ${'$'}i 2>/dev/null`;
+                    if [[ "${'$'}symlink" == *"/dotnet" ]]; then
+                        echo  ${'$'}i | sed -n 's/.*\/proc\/\(.*\)\/exe.*/\1/p'
+                    fi;
+                done;
+            """
     }
 
     override fun getDebugPorts(): List<Int> = NetUtils.findAvailableSocketPorts(NUMBER_OF_DEBUG_PORTS).toList()
 
-    /**
-     * Check whether the JatBrains.Rider.Worker.Launcher app (that is required to run Debugger) is downloaded into Rider SDK.
-     */
-    override fun isSupported(runtime: Runtime): Boolean {
-        // TODO: Remove when SAM adds debug support
-        if (runtime == Runtime.DOTNETCORE3_1) {
-            return false
-        }
-
-        return true
-    }
-
     override fun patchCommandLine(debugPorts: List<Int>, commandLine: GeneralCommandLine) {
         commandLine.withParameters("--debugger-path")
             .withParameters(DotNetDebuggerUtils.debuggerBinDir.path)
@@ -259,7 +256,7 @@ class DotNetSamDebugSupport : SamDebugSupport {
                 dockerContainer,
                 "/bin/sh",
                 "-c",
-                """find /proc -mindepth 2 -maxdepth 2 -name exe -exec ls -l {} \; 2>/dev/null | grep -e '/dotnet$' | sed -n 's/.*\/proc\/\(.*\)\/exe.*/\1/p'"""
+                FIND_PID_SCRIPT
             )
         ).stdout.trim().nullize()
     }.toInt()