Merge #3864 csharp/.NET SAM lambda debugging

Author: justinmk3

.changes/next-release/Bug Fix-4df5d8e2-fab0-4613-a704-38b49a71e1fe.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "SAM: local debugging of a .NET lambda may fail if `containerbuild=true`"
+}

src/shared/extensions.ts

@@ -21,6 +21,7 @@ export const VSCODE_EXTENSION_ID = {
     go: 'golang.go',
     java: 'redhat.java',
     javadebug: 'vscjava.vscode-java-debug',
+    dotnet: 'ms-dotnettools.csdevkit',
     git: 'vscode.git',
     remotessh: 'ms-vscode-remote.remote-ssh',
 }

src/shared/sam/cli/samCliBuild.ts

@@ -40,6 +40,8 @@ export interface SamCliBuildInvocationArguments {
      * - false: Lambda will be built on local machine instead of in a Docker image.
      */
     useContainer?: boolean
+    /** sam cli "--mount-with" option. */
+    mountWith?: 'read' | 'write'
     /**
      * Specifies the name or id of an existing Docker network to Lambda Docker containers should connect to,
      * along with the default bridge network.
@@ -106,6 +108,7 @@ export class SamCliBuildInvocation {
         pushIf(invokeArgs, !!this.args.baseDir, '--base-dir', this.args.baseDir!)
         pushIf(invokeArgs, !!this.args.dockerNetwork, '--docker-network', this.args.dockerNetwork!)
         pushIf(invokeArgs, !!this.args.useContainer, '--use-container')
+        pushIf(invokeArgs, !!this.args.mountWith, '--mount-with', this.args.mountWith?.toUpperCase())
         pushIf(invokeArgs, !!this.args.skipPullImage, '--skip-pull-image')
         pushIf(invokeArgs, !!this.args.manifestPath, '--manifest', this.args.manifestPath!)
         pushIf(

src/shared/sam/debugger/awsSamDebugger.ts

@@ -144,6 +144,9 @@ export interface SamLaunchRequestArgs extends AwsSamDebuggerConfiguration {
     /** Path to (generated) directory used as a working/staging area for SAM. */
     baseBuildDir?: string
 
+    /** sam cli "--mount-with" option. */
+    mountWith?: 'read' | 'write'
+
     /**
      * URI of the current editor document.
      * Used as a last resort for deciding `codeRoot` (when there is no `launch.json` nor `template.yaml`)

src/shared/sam/debugger/csharpSamDebug.ts

@@ -55,6 +55,10 @@ export async function makeCsharpConfig(config: SamLaunchRequestArgs): Promise<Sa
         runtimeFamily: RuntimeFamily.DotNet,
     }
 
+    if (config.sam?.containerBuild) {
+        config.mountWith = 'write'
+    }
+
     if (!config.noDebug) {
         config = await makeDotnetDebugConfiguration(config, originalCodeRoot)
     }

src/test/shared/sam/debugger/samDebugConfigProvider.test.ts

@@ -1761,6 +1761,9 @@ describe('SamDebugConfigurationProvider', async function () {
                     templatePath: 'template.yaml',
                     logicalId: 'HelloWorldFunction',
                 },
+                sam: {
+                    containerBuild: true, // #3864
+                },
                 lambda: {
                     environmentVariables: {
                         'test-envvar-1': 'test value 1',
@@ -1800,12 +1803,14 @@ describe('SamDebugConfigurationProvider', async function () {
                 documentUri: vscode.Uri.file(''), // TODO: remove or test.
                 handlerName: 'HelloWorld::HelloWorld.Function::FunctionHandler',
                 invokeTarget: { ...input.invokeTarget },
+                sam: { ...input.sam },
                 lambda: {
                     ...input.lambda,
                 },
                 name: input.name,
                 architecture: 'x86_64',
                 templatePath: pathutil.normalize(path.join(path.dirname(templatePath.fsPath), 'template.yaml')),
+                mountWith: 'write',
 
                 //
                 // Csharp-related fields

src/testInteg/sam.test.ts

@@ -111,6 +111,15 @@ const scenarios: TestScenario[] = [
         dependencyManager: 'gradle',
         vscodeMinimum: '1.50.0',
     },
+    {
+        runtime: 'dotnet6',
+        displayName: 'dotnet6 (ZIP)',
+        path: 'src/HelloWorld/Function.cs',
+        debugSessionType: 'coreclr',
+        language: 'csharp',
+        dependencyManager: 'cli-package',
+        vscodeMinimum: '1.50.0',
+    },
     {
         runtime: 'java8.al2',
         displayName: 'java8.al2 (Maven ZIP)',
@@ -144,7 +153,7 @@ const scenarios: TestScenario[] = [
     {
         runtime: 'nodejs14.x',
         displayName: 'nodejs14.x (Image)',
-        baseImage: `amazon/nodejs14.x-base`,
+        baseImage: 'amazon/nodejs14.x-base',
         path: 'hello-world/app.js',
         debugSessionType: 'pwa-node',
         language: 'javascript',
@@ -154,7 +163,7 @@ const scenarios: TestScenario[] = [
     {
         runtime: 'nodejs16.x',
         displayName: 'nodejs16.x (Image)',
-        baseImage: `amazon/nodejs16.x-base`,
+        baseImage: 'amazon/nodejs16.x-base',
         path: 'hello-world/app.js',
         debugSessionType: 'pwa-node',
         language: 'javascript',
@@ -164,7 +173,7 @@ const scenarios: TestScenario[] = [
     {
         runtime: 'nodejs18.x',
         displayName: 'nodejs18.x (Image)',
-        baseImage: `amazon/nodejs18.x-base`,
+        baseImage: 'amazon/nodejs18.x-base',
         path: 'hello-world/app.mjs',
         debugSessionType: 'pwa-node',
         language: 'javascript',
@@ -208,7 +217,7 @@ const scenarios: TestScenario[] = [
         runtime: 'java8',
         displayName: 'java8 (Maven Image)',
         path: 'HelloWorldFunction/src/main/java/helloworld/App.java',
-        baseImage: `amazon/java8-base`,
+        baseImage: 'amazon/java8-base',
         debugSessionType: 'java',
         language: 'java',
         dependencyManager: 'maven',
@@ -218,7 +227,7 @@ const scenarios: TestScenario[] = [
         runtime: 'java8.al2',
         displayName: 'java8.al2 (Gradle Image)',
         path: 'HelloWorldFunction/src/main/java/helloworld/App.java',
-        baseImage: `amazon/java8.al2-base`,
+        baseImage: 'amazon/java8.al2-base',
         debugSessionType: 'java',
         language: 'java',
         dependencyManager: 'gradle',
@@ -228,12 +237,22 @@ const scenarios: TestScenario[] = [
         runtime: 'java11',
         displayName: 'java11 (Maven Image)',
         path: 'HelloWorldFunction/src/main/java/helloworld/App.java',
-        baseImage: `amazon/java11-base`,
+        baseImage: 'amazon/java11-base',
         debugSessionType: 'java',
         language: 'java',
         dependencyManager: 'maven',
         vscodeMinimum: '1.50.0',
     },
+    {
+        runtime: 'dotnet6',
+        displayName: 'dotnet6 (Image)',
+        path: 'src/HelloWorld/Function.cs',
+        baseImage: 'amazon/dotnet6-base',
+        debugSessionType: 'coreclr',
+        language: 'csharp',
+        dependencyManager: 'cli-package',
+        vscodeMinimum: '1.50.0',
+    },
 ]
 
 async function openSamAppFile(applicationPath: string): Promise<vscode.Uri> {
@@ -469,7 +488,10 @@ describe('SAM Integration Tests', async function () {
                 })
 
                 it('produces an Add Debug Configuration codelens', async function () {
-                    if (semver.lt(vscode.version, scenario.vscodeMinimum)) {
+                    if (
+                        scenario.language === 'csharp' || // TODO
+                        semver.lt(vscode.version, scenario.vscodeMinimum)
+                    ) {
                         this.skip()
                     }
 
@@ -488,9 +510,9 @@ describe('SAM Integration Tests', async function () {
                         case 'python':
                             manifestFile = /^requirements\.txt$/
                             break
-                        case 'csharp':
-                            manifestFile = /^.*\.csproj$/
-                            break
+                        // case 'csharp':
+                        //     manifestFile = /^.*\.csproj$/
+                        //     break
                         case 'go':
                             manifestFile = /^go\.mod$/
                             break