fix(sam): remove .NET core 3.1 #3859

No longer supported by Lambda.
https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html

Author: justinmk3

.changes/next-release/Deprecation-f9d02208-eb97-4c44-810c-013fabb4a7d9.json

@@ -0,0 +1,4 @@
+{
+	"type": "Deprecation",
+	"description": "SAM: removed support for .NET core 3.1 [Lambda runtime](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html)"
+}

src/lambda/local/debugConfiguration.ts

@@ -25,7 +25,7 @@ import globals from '../../shared/extensionGlobals'
  * Magic path on the Docker image.
  * https://github.com/aws/aws-sam-cli/blob/2201b17bff0a438b934abbb53f6c76eff9ccfa6d/samcli/local/docker/lambda_container.py#L25
  */
-export const dotnetCoreDebuggerPath = '/tmp/lambci_debug_files/vsdbg'
+export const dotnetDebuggerPath = '/tmp/lambci_debug_files/vsdbg'
 export const goDebuggerPath = '/tmp/lambci_debug_files'
 
 export interface NodejsDebugConfiguration extends SamLaunchRequestArgs {
@@ -68,8 +68,8 @@ export interface PythonCloud9DebugConfiguration extends SamLaunchRequestArgs {
     readonly remoteRoot: string
 }
 
-export interface DotNetCoreDebugConfiguration extends SamLaunchRequestArgs {
-    readonly runtimeFamily: RuntimeFamily.DotNetCore
+export interface DotNetDebugConfiguration extends SamLaunchRequestArgs {
+    readonly runtimeFamily: RuntimeFamily.DotNet
     processName: string
     pipeTransport: PipeTransport
     windows: {
@@ -90,7 +90,7 @@ export interface GoDebugConfiguration extends SamLaunchRequestArgs {
 export interface PipeTransport {
     pipeProgram: 'sh' | 'powershell'
     pipeArgs: string[]
-    debuggerPath: typeof dotnetCoreDebuggerPath
+    debuggerPath: typeof dotnetDebuggerPath
     pipeCwd: string
 }
 

src/lambda/models/samLambdaRuntime.ts

@@ -19,7 +19,7 @@ export enum RuntimeFamily {
     Unknown,
     Python,
     NodeJS,
-    DotNetCore,
+    DotNet,
     Go,
     Java,
 }
@@ -52,7 +52,7 @@ export const pythonRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>([
 ])
 export const goRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>(['go1.x'])
 export const javaRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>(['java11', 'java8', 'java8.al2'])
-export const dotNetRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>(['dotnetcore3.1', 'dotnet6'])
+export const dotNetRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>(['dotnet6'])
 
 /**
  * Deprecated runtimes can be found at https://docs.aws.amazon.com/lambda/latest/dg/runtime-support-policy.html
@@ -74,7 +74,7 @@ export const deprecatedRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>([
 const defaultRuntimes = ImmutableMap<RuntimeFamily, Runtime>([
     [RuntimeFamily.NodeJS, 'nodejs14.x'],
     [RuntimeFamily.Python, 'python3.9'],
-    [RuntimeFamily.DotNetCore, 'dotnetcore3.1'],
+    [RuntimeFamily.DotNet, 'dotnet6'],
     [RuntimeFamily.Go, 'go1.x'],
     [RuntimeFamily.Java, 'java11'],
 ])
@@ -143,7 +143,7 @@ export function getFamily(runtime: string): RuntimeFamily {
     } else if (pythonRuntimes.has(runtime)) {
         return RuntimeFamily.Python
     } else if (dotNetRuntimes.has(runtime) || runtime === dotnet50) {
-        return RuntimeFamily.DotNetCore
+        return RuntimeFamily.DotNet
     } else if (goRuntimes.has(runtime)) {
         return RuntimeFamily.Go
     } else if (javaRuntimes.has(runtime)) {
@@ -192,7 +192,7 @@ export function getRuntimeFamily(langId: string): RuntimeFamily {
         case 'javascript':
             return RuntimeFamily.NodeJS
         case 'csharp':
-            return RuntimeFamily.DotNetCore
+            return RuntimeFamily.DotNet
         case 'python':
             return RuntimeFamily.Python
         case 'go':
@@ -219,7 +219,7 @@ function getRuntimesForFamily(family: RuntimeFamily): ImmutableSet<Runtime> | un
             return nodeJsRuntimes
         case RuntimeFamily.Python:
             return pythonRuntimes
-        case RuntimeFamily.DotNetCore:
+        case RuntimeFamily.DotNet:
             return dotNetRuntimes
         case RuntimeFamily.Go:
             return goRuntimes

src/shared/codelens/codeLensUtils.ts

@@ -346,7 +346,7 @@ export async function makeCSharpCodeLensProvider(configuration: SamCliSettings):
                 document,
                 handlers,
                 token,
-                runtimeFamily: RuntimeFamily.DotNetCore,
+                runtimeFamily: RuntimeFamily.DotNet,
             })
         },
     }

src/shared/sam/cli/samCliValidator.ts

@@ -14,7 +14,6 @@ export const minSamCliVersionForImageSupport = '1.13.0'
 export const maxSamCliVersionExclusive = '2.0.0'
 export const minSamCliVersionForGoSupport = '1.18.1'
 export const minSamCliVersionForArmSupport = '1.33.0'
-export const minSamCliVersionForDotnet31Support = '1.4.0'
 
 // Errors
 export class InvalidSamCliError extends ToolkitError {}

src/shared/sam/debugger/awsSamDebugger.ts

@@ -636,7 +636,7 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
                 launchConfig = await pythonDebug.makePythonDebugConfig(launchConfig)
                 break
             }
-            case RuntimeFamily.DotNetCore: {
+            case RuntimeFamily.DotNet: {
                 // Make a DotNet launch-config from the generic config.
                 launchConfig = await csharpDebug.makeCsharpConfig(launchConfig)
                 break
@@ -711,7 +711,7 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
                 config.type = 'python'
                 return await pythonDebug.invokePythonLambda(this.ctx, config as PythonDebugConfiguration)
             }
-            case RuntimeFamily.DotNetCore: {
+            case RuntimeFamily.DotNet: {
                 config.type = 'coreclr'
                 return await csharpDebug.invokeCsharpLambda(this.ctx, config)
             }

src/shared/sam/debugger/csharpSamDebug.ts

@@ -6,10 +6,9 @@
 import { chmod, ensureDir, writeFile } from 'fs-extra'
 import * as os from 'os'
 import * as path from 'path'
-import * as semver from 'semver'
 import {
-    DotNetCoreDebugConfiguration,
-    dotnetCoreDebuggerPath,
+    DotNetDebugConfiguration,
+    dotnetDebuggerPath,
     getCodeRoot,
     isImageLambdaConfig,
 } from '../../../lambda/local/debugConfiguration'
@@ -24,8 +23,6 @@ import { HttpResourceFetcher } from '../../resourcefetcher/httpResourceFetcher'
 import { getLogger } from '../../logger'
 import * as vscode from 'vscode'
 import * as nls from 'vscode-nls'
-import { getSamCliVersion } from '../cli/samCliContext'
-import { minSamCliVersionForDotnet31Support } from '../cli/samCliValidator'
 import globals from '../../extensionGlobals'
 const localize = nls.loadMessageBundle()
 
@@ -47,13 +44,19 @@ export async function makeCsharpConfig(config: SamLaunchRequestArgs): Promise<Sa
 
     config = {
         ...config,
+        // https://github.com/dotnet/vscode-csharp/blob/a270be4f2f1236d9bc1b31b6214f1672096788b7/src/lsptoolshost/debugger.ts#L45C1-L54
+        // The "ms-dotnettools.csharp" extension declares:
+        //  - "coreclr" as the debugger type for ".NET 5+ and .NET Core"
+        //  - "dotnet" as the debugger type for "C#"
+        // but haven't found the actual circumstances when "dotnet" works while "coreclr" doesn't.
+        // type: config.runtime == 'dotnet5.0' ? 'coreclr' : 'dotnet',
         type: 'coreclr',
         request: config.noDebug ? 'launch' : 'attach',
-        runtimeFamily: RuntimeFamily.DotNetCore,
+        runtimeFamily: RuntimeFamily.DotNet,
     }
 
     if (!config.noDebug) {
-        config = await makeCoreCLRDebugConfiguration(config, originalCodeRoot)
+        config = await makeDotnetDebugConfiguration(config, originalCodeRoot)
     }
 
     return config
@@ -72,20 +75,10 @@ export async function invokeCsharpLambda(ctx: ExtContext, config: SamLaunchReque
     config.onWillAttachDebugger = waitForPort
 
     if (!config.noDebug) {
-        const samCliVersion = await getSamCliVersion(ctx.samCliContext())
-        // TODO: Remove this when min sam version is >= 1.4.0
-        if (semver.lt(samCliVersion, minSamCliVersionForDotnet31Support)) {
+        if (config.architecture === 'arm64') {
             vscode.window.showWarningMessage(
                 localize(
-                    'AWS.output.sam.local.no.net.3.1.debug',
-                    'Debugging dotnetcore3.1 lambdas requires a minimum SAM CLI version of 1.4.0. Function will run locally without debug.'
-                )
-            )
-            config.noDebug = true
-        } else if (config.architecture === 'arm64') {
-            vscode.window.showWarningMessage(
-                localize(
-                    'AWS.output.sam.local.no.arm.net.3.1.debug',
+                    'AWS.sam.noArm.dotnet.debug',
                     'The vsdbg debugger does not currently support the arm64 architecture. Function will run locally without debug.'
                 )
             )
@@ -215,12 +208,12 @@ function getSamProjectDirPathForFile(filepath: string): string {
 }
 
 /**
- * Creates a CLR launch-config composed with the given `config`.
+ * Creates a .NET launch-config composed with the given `config`.
  */
-export async function makeCoreCLRDebugConfiguration(
+export async function makeDotnetDebugConfiguration(
     config: SamLaunchRequestArgs,
     codeUri: string
-): Promise<DotNetCoreDebugConfiguration> {
+): Promise<DotNetDebugConfiguration> {
     if (config.noDebug) {
         throw Error(`SAM debug: invalid config ${config}`)
     }
@@ -265,22 +258,22 @@ export async function makeCoreCLRDebugConfiguration(
 
     return {
         ...config,
-        runtimeFamily: RuntimeFamily.DotNetCore,
+        runtimeFamily: RuntimeFamily.DotNet,
         request: 'attach',
         // Since SAM CLI 1.0 we cannot assume PID=1. So use processName=dotnet
         // instead of processId=1.
         processName: 'dotnet',
         pipeTransport: {
             pipeProgram: 'sh',
             pipeArgs,
-            debuggerPath: dotnetCoreDebuggerPath,
+            debuggerPath: dotnetDebuggerPath,
             pipeCwd: codeUri,
         },
         windows: {
             pipeTransport: {
                 pipeProgram: 'powershell',
                 pipeArgs,
-                debuggerPath: dotnetCoreDebuggerPath,
+                debuggerPath: dotnetDebuggerPath,
                 pipeCwd: codeUri,
             },
         },

src/shared/sam/localLambdaRunner.ts

@@ -532,7 +532,7 @@ export function shouldAppendRelativePathToFuncHandler(runtime: string): boolean
         case RuntimeFamily.NodeJS:
         case RuntimeFamily.Python:
             return true
-        case RuntimeFamily.DotNetCore:
+        case RuntimeFamily.DotNet:
             return false
         // if the runtime exists but for some reason we forgot to cover it here, throw anyway so we remember to cover it
         default:

src/test/lambda/local/debugConfiguration.test.ts

@@ -10,7 +10,7 @@ import * as fs from 'fs-extra'
 import { RuntimeFamily } from '../../../lambda/models/samLambdaRuntime'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
 import { DefaultSamLocalInvokeCommand } from '../../../shared/sam/cli/samCliLocalInvoke'
-import { makeCoreCLRDebugConfiguration } from '../../../shared/sam/debugger/csharpSamDebug'
+import { makeDotnetDebugConfiguration } from '../../../shared/sam/debugger/csharpSamDebug'
 import * as testutil from '../../testUtil'
 import { SamLaunchRequestArgs } from '../../../shared/sam/debugger/awsSamDebugger'
 import * as pathutil from '../../../shared/utilities/pathUtils'
@@ -43,7 +43,7 @@ describe('makeCoreCLRDebugConfiguration', function () {
             name: 'fake-launch-config',
             workspaceFolder: fakeWorkspaceFolder,
             codeRoot: fakeWorkspaceFolder.uri.fsPath,
-            runtimeFamily: RuntimeFamily.DotNetCore,
+            runtimeFamily: RuntimeFamily.DotNet,
             type: 'coreclr',
             request: 'attach',
             // cfnTemplate?: CloudFormation.Template
@@ -73,7 +73,7 @@ describe('makeCoreCLRDebugConfiguration', function () {
 
     async function makeConfig({ codeUri = tempFolder }: { codeUri?: string; port?: number }) {
         const fakeLaunchConfig = await makeFakeSamLaunchConfig()
-        return makeCoreCLRDebugConfiguration(fakeLaunchConfig, codeUri)
+        return makeDotnetDebugConfiguration(fakeLaunchConfig, codeUri)
     }
 
     describe('windows', function () {
@@ -144,7 +144,7 @@ describe('isImageLambdaConfig', function () {
             name: 'fake-launch-config',
             workspaceFolder: fakeWorkspaceFolder,
             codeRoot: fakeWorkspaceFolder.uri.fsPath,
-            runtimeFamily: RuntimeFamily.DotNetCore,
+            runtimeFamily: RuntimeFamily.DotNet,
             request: 'launch',
             type: 'launch',
             runtime: 'fakedotnet' as Runtime,
@@ -173,7 +173,7 @@ describe('isImageLambdaConfig', function () {
             name: 'fake-launch-config',
             workspaceFolder: fakeWorkspaceFolder,
             codeRoot: fakeWorkspaceFolder.uri.fsPath,
-            runtimeFamily: RuntimeFamily.DotNetCore,
+            runtimeFamily: RuntimeFamily.DotNet,
             request: 'launch',
             type: 'launch',
             runtime: 'fakedotnet' as Runtime,
@@ -199,7 +199,7 @@ describe('isImageLambdaConfig', function () {
             name: 'fake-launch-config',
             workspaceFolder: fakeWorkspaceFolder,
             codeRoot: fakeWorkspaceFolder.uri.fsPath,
-            runtimeFamily: RuntimeFamily.DotNetCore,
+            runtimeFamily: RuntimeFamily.DotNet,
             request: 'launch',
             type: 'launch',
             runtime: 'fakedotnet' as Runtime,

src/test/lambda/models/samLambdaRuntime.test.ts

@@ -92,7 +92,6 @@ describe('runtimes', function () {
     it('vscode', function () {
         assert.deepStrictEqual(samLambdaCreatableRuntimes(false).toArray().sort(), [
             'dotnet6',
-            'dotnetcore3.1',
             'go1.x',
             'java11',
             'java8',
@@ -109,7 +108,6 @@ describe('runtimes', function () {
         assert.deepStrictEqual(samImageLambdaRuntimes(false).toArray().sort(), [
             'dotnet5.0',
             'dotnet6',
-            'dotnetcore3.1',
             'go1.x',
             'java11',
             'java8',