Add Lambda Runtime Support for Python_3.11 (#3776)

vchikoti1998 · rli · web-flow · commit 229ee118f08e · 2023-08-02T17:08:32.000-07:00
* Add Python_3.11 support

* Updated plugin versions

* updated sdk dependency with latest version

---------

Co-authored-by: Richard Li &lt;742829+rli@users.noreply.github.com&gt;
diff --git a/.changes/next-release/feature-5fdc8035-c665-4e94-9ce3-03f0179c881c.json b/.changes/next-release/feature-5fdc8035-c665-4e94-9ce3-03f0179c881c.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Add support for Lambda runtime Python 3.11"
+}
diff --git a/core/src/software/aws/toolkits/core/lambda/LambdaRuntime.kt b/core/src/software/aws/toolkits/core/lambda/LambdaRuntime.kt
@@ -30,6 +30,7 @@ enum class LambdaRuntime(
     PYTHON3_8(Runtime.PYTHON3_8, architectures = ARM_COMPATIBLE),
     PYTHON3_9(Runtime.PYTHON3_9, minSamDebugging = "1.28.0", minSamInit = "1.28.0", architectures = ARM_COMPATIBLE),
     PYTHON3_10(Runtime.PYTHON3_10, minSamDebugging = "1.78.0", minSamInit = "1.78.0", architectures = ARM_COMPATIBLE),
+    PYTHON3_11(Runtime.PYTHON3_11, minSamDebugging = "1.87.0", minSamInit = "1.87.0", architectures = ARM_COMPATIBLE),
     DOTNET5_0(null, minSamInit = "1.16.0", runtimeOverride = "dotnet5.0"),
     DOTNET6_0(Runtime.DOTNET6, minSamDebugging = "1.40.1", minSamInit = "1.40.1", architectures = ARM_COMPATIBLE);
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 apacheCommons = "2.8.0"
 assertJ = "3.20.2" # Upgrading leads to SAM errors: https://youtrack.jetbrains.com/issue/KT-17765
 # match with <root>/settings.gradle.kts
-awsSdk = "2.20.55"
+awsSdk = "2.20.111"
 commonmark = "0.17.1"
 detekt = "1.23.0"
 intellijGradle = "1.13.2"
diff --git a/jetbrains-core/it/software/aws/toolkits/jetbrains/services/lambda/python/PythonLocalLambdaRunConfigurationIntegrationTest.kt b/jetbrains-core/it/software/aws/toolkits/jetbrains/services/lambda/python/PythonLocalLambdaRunConfigurationIntegrationTest.kt
@@ -46,7 +46,8 @@ class PythonLocalLambdaRunConfigurationIntegrationTest(private val runtime: Runt
             arrayOf(Runtime.PYTHON3_7),
             arrayOf(Runtime.PYTHON3_8),
             arrayOf(Runtime.PYTHON3_9),
-            arrayOf(Runtime.PYTHON3_10)
+            arrayOf(Runtime.PYTHON3_10),
+            arrayOf(Runtime.PYTHON3_11)
         )
     }
 
diff --git a/jetbrains-core/resources/META-INF/ext-python.xml b/jetbrains-core/resources/META-INF/ext-python.xml
@@ -23,6 +23,7 @@
         <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.python.Python38ImageDebugSupport"/>
         <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.python.Python39ImageDebugSupport"/>
         <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.python.Python310ImageDebugSupport"/>
+        <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.python.Python311ImageDebugSupport"/>
         <sam.projectWizard id="PYTHON" implementationClass="software.aws.toolkits.jetbrains.services.lambda.python.PythonSamProjectWizard"/>
     </extensions>
     <extensions defaultExtensionNs="aws.toolkit.codewhisperer">
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonDebugSupport.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonDebugSupport.kt
@@ -100,6 +100,13 @@ class Python310ImageDebugSupport : PythonImageDebugSupport() {
     override val bootstrapPath: String = "/var/runtime/bootstrap.py"
 }
 
+class Python311ImageDebugSupport : PythonImageDebugSupport() {
+    override val id: String = LambdaRuntime.PYTHON3_11.toString()
+    override fun displayName() = LambdaRuntime.PYTHON3_11.toString().capitalize()
+    override val pythonPath: String = "/var/lang/bin/python3.11"
+    override val bootstrapPath: String = "/var/runtime/bootstrap.py"
+}
+
 private const val DEBUGGER_VOLUME_PATH = "/tmp/lambci_debug_files"
 
 private fun createDebugProcess(
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonRuntimeGroup.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonRuntimeGroup.kt
@@ -23,10 +23,12 @@ class PythonRuntimeGroup : SdkBasedRuntimeGroup() {
         LambdaRuntime.PYTHON3_7,
         LambdaRuntime.PYTHON3_8,
         LambdaRuntime.PYTHON3_9,
-        LambdaRuntime.PYTHON3_10
+        LambdaRuntime.PYTHON3_10,
+        LambdaRuntime.PYTHON3_11
     )
 
     override fun runtimeForSdk(sdk: Sdk): LambdaRuntime? = when {
+        sdk.sdkType is PythonSdkType && PythonSdkType.getLanguageLevelForSdk(sdk).isAtLeast(LanguageLevel.PYTHON311) -> LambdaRuntime.PYTHON3_11
         sdk.sdkType is PythonSdkType && PythonSdkType.getLanguageLevelForSdk(sdk).isAtLeast(LanguageLevel.PYTHON310) -> LambdaRuntime.PYTHON3_10
         sdk.sdkType is PythonSdkType && PythonSdkType.getLanguageLevelForSdk(sdk).isAtLeast(LanguageLevel.PYTHON39) -> LambdaRuntime.PYTHON3_9
         sdk.sdkType is PythonSdkType && PythonSdkType.getLanguageLevelForSdk(sdk).isAtLeast(LanguageLevel.PYTHON38) -> LambdaRuntime.PYTHON3_8
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonSamProjectWizard.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonSamProjectWizard.kt
@@ -22,8 +22,10 @@ import software.aws.toolkits.jetbrains.services.lambda.wizard.SdkSelector
 import software.aws.toolkits.jetbrains.services.lambda.wizard.TemplateParameters
 import software.aws.toolkits.resources.message
 
-private val pythonTemplateRuntimes = setOf(LambdaRuntime.PYTHON3_7, LambdaRuntime.PYTHON3_8, LambdaRuntime.PYTHON3_9, LambdaRuntime.PYTHON3_10)
-private val eventBridgeTemplateRuntimes = setOf(LambdaRuntime.PYTHON3_7, LambdaRuntime.PYTHON3_8, LambdaRuntime.PYTHON3_9, LambdaRuntime.PYTHON3_10)
+private val pythonTemplateRuntimes =
+    setOf(LambdaRuntime.PYTHON3_7, LambdaRuntime.PYTHON3_8, LambdaRuntime.PYTHON3_9, LambdaRuntime.PYTHON3_10, LambdaRuntime.PYTHON3_11)
+private val eventBridgeTemplateRuntimes =
+    setOf(LambdaRuntime.PYTHON3_7, LambdaRuntime.PYTHON3_8, LambdaRuntime.PYTHON3_9, LambdaRuntime.PYTHON3_10, LambdaRuntime.PYTHON3_11)
 
 class PythonSamProjectWizard : SamProjectWizard {
     override fun createSdkSelectionPanel(projectLocation: TextFieldWithBrowseButton?): SdkSelector = when {
diff --git a/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/local/LocalLambdaRunConfigurationTest.kt b/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/local/LocalLambdaRunConfigurationTest.kt
@@ -654,7 +654,7 @@ class LocalLambdaRunConfigurationTest {
               <option name="inputIsFile" value="false" />
               <option name="logicalFunctionName" />
               <option name="regionId" value="us-west-2" />
-              <option name="runtime" value="python3.10" />
+              <option name="runtime" value="python3.11" />
               <option name="templateFile" />
               <option name="useTemplate" value="false" />
               <method v="2" />
@@ -672,7 +672,7 @@ class LocalLambdaRunConfigurationTest {
             assertThat(runConfiguration.logicalId()).isNull()
             assertThat(runConfiguration.handler()).isEqualTo("helloworld.App::handleRequest")
             assertThat(runConfiguration.architecture()).isEqualTo(LambdaArchitecture.ARM64.toString())
-            assertThat(runConfiguration.runtime()).isEqualTo(LambdaRuntime.PYTHON3_10)
+            assertThat(runConfiguration.runtime()).isEqualTo(LambdaRuntime.PYTHON3_11)
             assertThat(runConfiguration.environmentVariables()).containsAllEntriesOf(mapOf("Foo" to "Bar"))
             assertThat(runConfiguration.regionId()).isEqualTo("us-west-2")
             assertThat(runConfiguration.credentialProviderId()).isEqualTo("profile:default")
diff --git a/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/python/PythonHandlerCompletionProviderTest.kt b/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/python/PythonHandlerCompletionProviderTest.kt
@@ -39,4 +39,10 @@ class PythonHandlerCompletionProviderTest {
         val provider = HandlerCompletionProvider(projectRule.project, LambdaRuntime.PYTHON3_10)
         assertFalse(provider.isCompletionSupported)
     }
+
+    @Test
+    fun completionIsNotSupportedPython311() {
+        val provider = HandlerCompletionProvider(projectRule.project, LambdaRuntime.PYTHON3_11)
+        assertFalse(provider.isCompletionSupported)
+    }
 }
diff --git a/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/python/PythonRuntimeGroupTest.kt b/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/python/PythonRuntimeGroupTest.kt
@@ -48,4 +48,12 @@ class PythonRuntimeGroupTest {
 
         assertThat(sut.determineRuntime(module)).isEqualTo(LambdaRuntime.PYTHON3_10)
     }
+
+    @Test
+    fun testRuntimeDetection311() {
+        val module = projectRule.module
+        projectRule.setModuleSdk(module, PyTestSdk("3.11.0"))
+
+        assertThat(sut.determineRuntime(module)).isEqualTo(LambdaRuntime.PYTHON3_11)
+    }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -23,7 +23,7 @@ buildscript {
     // also since this is a settings plugin, we can't use a version catalog
     // TODO: can we serve a remote cache out of CloudFront instead? https://docs.gradle.org/8.1/userguide/build_cache.html#sec:build_cache_configure_remote
     dependencies {
-        classpath(platform("software.amazon.awssdk:bom:2.20.48"))
+        classpath(platform("software.amazon.awssdk:bom:2.20.111"))
     }
 }
 
diff --git a/testdata/samProjects/image/python3.11/hello_world/Dockerfile b/testdata/samProjects/image/python3.11/hello_world/Dockerfile
@@ -0,0 +1,10 @@
+FROM public.ecr.aws/lambda/python:3.11
+
+COPY app.py requirements.txt ./
+
+RUN python3.11 -m pip install -r requirements.txt
+
+ENV _HANDLER="app.lambda_handler"
+
+# Command can be overwritten by providing a different command in the template directly.
+CMD ["app.lambda_handler"]
diff --git a/testdata/samProjects/image/python3.11/hello_world/app.py b/testdata/samProjects/image/python3.11/hello_world/app.py
@@ -0,0 +1,10 @@
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  SPDX-License-Identifier: Apache-2.0
+import json
+
+
+def lambda_handler(event, context):
+    return {
+        "statusCode": 200,
+        "body": {"message": str(event).upper()},
+    }
diff --git a/testdata/samProjects/image/python3.11/hello_world/requirements.txt b/testdata/samProjects/image/python3.11/hello_world/requirements.txt
diff --git a/testdata/samProjects/image/python3.11/template.yaml b/testdata/samProjects/image/python3.11/template.yaml
@@ -0,0 +1,13 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+
+Resources:
+  SomeFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      PackageType: Image
+      Timeout: 900
+    Metadata:
+      DockerTag: v1
+      DockerContext: hello_world
+      Dockerfile: Dockerfile

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "feature",
 +  "description" : "Add support for Lambda runtime Python 3.11"
 +}
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ class PythonLocalLambdaRunConfigurationIntegrationTest(private val runtime: Runt`
`46`	`46`	`arrayOf(Runtime.PYTHON3_7),`
`47`	`47`	`arrayOf(Runtime.PYTHON3_8),`
`48`	`48`	`arrayOf(Runtime.PYTHON3_9),`
`49`		`- arrayOf(Runtime.PYTHON3_10)`
	`49`	`+ arrayOf(Runtime.PYTHON3_10),`
	`50`	`+ arrayOf(Runtime.PYTHON3_11)`
`50`	`51`	`)`
`51`	`52`	`}`
`52`	`53`
Original file line number	Diff line number	Diff line change
`@@ -39,4 +39,10 @@ class PythonHandlerCompletionProviderTest {`
`39`	`39`	`val provider = HandlerCompletionProvider(projectRule.project, LambdaRuntime.PYTHON3_10)`
`40`	`40`	`assertFalse(provider.isCompletionSupported)`
`41`	`41`	`}`
	`42`	`+`
	`43`	`+ @Test`
	`44`	`+ fun completionIsNotSupportedPython311() {`
	`45`	`+ val provider = HandlerCompletionProvider(projectRule.project, LambdaRuntime.PYTHON3_11)`
	`46`	`+ assertFalse(provider.isCompletionSupported)`
	`47`	`+ }`
`42`	`48`	`}`