feat(sam): python 3.10 support for SAM, lambda #3269

previous (python 3.9): 08bf494

Signed-off-by: Nikolas Komonen <[email protected]>

Author: nkomonen-amazon

README.quickstart.cloud9.md

@@ -89,7 +89,7 @@ When you're satisfied with performance, you can [deploy your serverless applicat
 The Toolkit _local SAM debugging_ feature supports these runtimes:
 
 -   JavaScript (Node.js 12.x, 14.x)
--   Python (3.7, 3.8, 3.9)
+-   Python (3.7, 3.8, 3.9, 3.10)
 
 For more information see [Working with AWS Serverless Applications](https://docs.aws.amazon.com/cloud9/latest/user-guide/serverless-apps-toolkit.html) in the user guide.
 

src/eventSchemas/models/schemaCodeLangs.ts

@@ -54,7 +54,7 @@ export function getLanguageDetails(language: SchemaCodeLangs): {
 }
 
 export function supportsEventBridgeTemplates(runtime: Runtime): boolean {
-    return ['python3.7', 'python3.8', 'python3.9', 'go1.x'].includes(runtime)
+    return ['python3.7', 'python3.8', 'python3.9', 'python3.10', 'go1.x'].includes(runtime)
 }
 
 export function getApiValueForSchemasDownload(runtime: Runtime): string {

src/integrationTest/sam.test.ts

@@ -112,6 +112,15 @@ const scenarios: TestScenario[] = [
     //     language: 'python',
     //     dependencyManager: 'pip',
     // },
+    {
+        runtime: 'python3.10',
+        displayName: 'python 3.10 (ZIP)',
+        path: 'hello_world/app.py',
+        debugSessionType: 'python',
+        language: 'python',
+        dependencyManager: 'pip',
+        vscodeMinimum: '1.65.0',
+    },
     {
         runtime: 'java8',
         displayName: 'java8 (Gradle ZIP)',
@@ -212,6 +221,16 @@ const scenarios: TestScenario[] = [
     //     language: 'python',
     //     dependencyManager: 'pip',
     // },
+    {
+        runtime: 'python3.10',
+        displayName: 'python 3.10 (ZIP)',
+        baseImage: 'amazon/python3.10-base',
+        path: 'hello_world/app.py',
+        debugSessionType: 'python',
+        language: 'python',
+        dependencyManager: 'pip',
+        vscodeMinimum: '1.65.0',
+    },
     {
         runtime: 'go1.x',
         displayName: 'go1.x (Image)',
@@ -536,7 +555,10 @@ describe('SAM Integration Tests', async function () {
                 })
 
                 it('target=api: invokes and attaches on debug request (F5)', async function () {
-                    if (skipLanguagesOnApi.includes(scenario.language)) {
+                    if (
+                        skipLanguagesOnApi.includes(scenario.language) ||
+                        semver.lt(vscode.version, scenario.vscodeMinimum)
+                    ) {
                         this.skip()
                     }
 
@@ -551,6 +573,10 @@ describe('SAM Integration Tests', async function () {
                 })
 
                 it('target=template: invokes and attaches on debug request (F5)', async function () {
+                    if (semver.lt(vscode.version, scenario.vscodeMinimum)) {
+                        this.skip()
+                    }
+
                     setTestTimeout(this.test?.fullTitle(), debugTimeout)
                     await testTarget('template')
                 })

src/lambda/models/samLambdaRuntime.ts

@@ -33,7 +33,12 @@ export const nodeJsRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>([
     'nodejs14.x',
     'nodejs12.x',
 ])
-export const pythonRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>(['python3.9', 'python3.8', 'python3.7'])
+export const pythonRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>([
+    'python3.10',
+    'python3.9',
+    'python3.8',
+    'python3.7',
+])
 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'])

src/shared/sam/debugger/pythonSamDebug.ts

@@ -256,6 +256,8 @@ function getPythonExeAndBootstrap(runtime: Runtime) {
             return { python: '/var/lang/bin/python3.8', bootstrap: '/var/runtime/bootstrap.py' }
         case 'python3.9':
             return { python: '/var/lang/bin/python3.9', bootstrap: '/var/runtime/bootstrap.py' }
+        case 'python3.10':
+            return { python: '/var/lang/bin/python3.10', bootstrap: '/var/runtime/bootstrap.py' }
         default:
             throw new Error(`Python SAM debug logic ran for invalid Python runtime: ${runtime}`)
     }

src/test/eventSchemas/model/schemaCodeLangs.test.ts

@@ -29,7 +29,8 @@ describe('getApiValueForSchemasDownload', function () {
             switch (runtime) {
                 case 'python3.7':
                 case 'python3.8':
-                case 'python3.9': {
+                case 'python3.9':
+                case 'python3.10': {
                     const result = getApiValueForSchemasDownload(runtime)
                     assert.strictEqual(result, 'Python36', 'Api value used by schemas api')
                     break

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

@@ -71,6 +71,7 @@ describe('runtimes', function () {
             'nodejs14.x',
             'nodejs16.x',
             'nodejs18.x',
+            'python3.10',
             'python3.7',
             'python3.8',
             'python3.9',
@@ -80,6 +81,7 @@ describe('runtimes', function () {
             'nodejs14.x',
             'nodejs16.x',
             'nodejs18.x',
+            'python3.10',
             'python3.7',
             'python3.8',
             'python3.9',
@@ -97,6 +99,7 @@ describe('runtimes', function () {
             'nodejs14.x',
             'nodejs16.x',
             'nodejs18.x',
+            'python3.10',
             'python3.7',
             'python3.8',
             'python3.9',
@@ -113,6 +116,7 @@ describe('runtimes', function () {
             'nodejs14.x',
             'nodejs16.x',
             'nodejs18.x',
+            'python3.10',
             'python3.7',
             'python3.8',
             'python3.9',

src/test/lambda/models/samTemplates.test.ts

@@ -66,6 +66,7 @@ describe('getSamTemplateWizardOption', function () {
                 case 'python3.7':
                 case 'python3.8':
                 case 'python3.9':
+                case 'python3.10':
                     assert.deepStrictEqual(
                         result,
                         validPythonTemplateOptions,