Add support for python3.9 lambdas (#2774)

Author: rli

.changes/next-release/feature-d82cf056-794a-4f2e-95bb-6daa771983a9.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Add support for Python 3.9 Lambdas"
+}

core/src/software/aws/toolkits/core/lambda/LambdaRuntime.kt

@@ -27,6 +27,7 @@ enum class LambdaRuntime(
     PYTHON3_6(Runtime.PYTHON3_6),
     PYTHON3_7(Runtime.PYTHON3_7),
     PYTHON3_8(Runtime.PYTHON3_8),
+    PYTHON3_9(Runtime.PYTHON3_9, minSamDebugging = "1.28.0", minSamInit = "1.28.0"),
     DOTNETCORE2_1(Runtime.DOTNETCORE2_1),
     DOTNETCORE3_1(Runtime.DOTNETCORE3_1),
     DOTNET5_0(null, minSamInit = "1.16.0", runtimeOverride = "dotnet5.0");

gradle.properties

@@ -12,7 +12,7 @@ ideProfileName=2020.2
 
 # Common dependencies
 kotlinVersion=1.4.21
-awsSdkVersion=2.17.10
+awsSdkVersion=2.17.19
 coroutinesVersion=1.3.3
 detektVersion=1.17.1
 jacksonVersion=2.11.1

jetbrains-core/it/software/aws/toolkits/jetbrains/services/lambda/python/PythonLocalLambdaRunConfigurationIntegrationTest.kt

@@ -42,7 +42,8 @@ class PythonLocalLambdaRunConfigurationIntegrationTest(private val runtime: Runt
             arrayOf(Runtime.PYTHON2_7),
             arrayOf(Runtime.PYTHON3_6),
             arrayOf(Runtime.PYTHON3_7),
-            arrayOf(Runtime.PYTHON3_8)
+            arrayOf(Runtime.PYTHON3_8),
+            arrayOf(Runtime.PYTHON3_9)
         )
     }
 

jetbrains-core/resources/META-INF/ext-python.xml

@@ -21,6 +21,7 @@
         <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.python.Python36ImageDebugSupport"/>
         <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.python.Python37ImageDebugSupport"/>
         <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.python.Python38ImageDebugSupport"/>
+        <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.python.Python39ImageDebugSupport"/>
         <sam.projectWizard id="PYTHON" implementationClass="software.aws.toolkits.jetbrains.services.lambda.python.PythonSamProjectWizard"/>
     </extensions>
     <extensions defaultExtensionNs="aws.toolkit.clouddebug">

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonDebugSupport.kt

@@ -100,6 +100,13 @@ class Python38ImageDebugSupport : PythonImageDebugSupport() {
     override val bootstrapPath: String = "/var/runtime/bootstrap.py"
 }
 
+class Python39ImageDebugSupport : PythonImageDebugSupport() {
+    override val id: String = LambdaRuntime.PYTHON3_9.toString()
+    override fun displayName() = LambdaRuntime.PYTHON3_9.toString().capitalize()
+    override val pythonPath: String = "/var/lang/bin/python3.9"
+    override val bootstrapPath: String = "/var/runtime/bootstrap.py"
+}
+
 private const val DEBUGGER_VOLUME_PATH = "/tmp/lambci_debug_files"
 
 private fun createDebugProcess(

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonRuntimeGroup.kt

@@ -23,10 +23,12 @@ class PythonRuntimeGroup : SdkBasedRuntimeGroup() {
         LambdaRuntime.PYTHON2_7,
         LambdaRuntime.PYTHON3_6,
         LambdaRuntime.PYTHON3_7,
-        LambdaRuntime.PYTHON3_8
+        LambdaRuntime.PYTHON3_8,
+        LambdaRuntime.PYTHON3_9
     )
 
     override fun runtimeForSdk(sdk: Sdk): LambdaRuntime? = when {
+        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
         sdk.sdkType is PythonSdkType && PythonSdkType.getLanguageLevelForSdk(sdk).isAtLeast(LanguageLevel.PYTHON37) -> LambdaRuntime.PYTHON3_7
         sdk.sdkType is PythonSdkType && PythonSdkType.getLanguageLevelForSdk(sdk).isPy3K -> LambdaRuntime.PYTHON3_6

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonSamProjectWizard.kt

@@ -21,8 +21,8 @@ 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_6, LambdaRuntime.PYTHON3_7, LambdaRuntime.PYTHON3_8)
-private val eventBridgeTemplateRuntimes = setOf(LambdaRuntime.PYTHON3_6, LambdaRuntime.PYTHON3_7, LambdaRuntime.PYTHON3_8)
+private val pythonTemplateRuntimes = setOf(LambdaRuntime.PYTHON3_6, LambdaRuntime.PYTHON3_7, LambdaRuntime.PYTHON3_8, LambdaRuntime.PYTHON3_9)
+private val eventBridgeTemplateRuntimes = setOf(LambdaRuntime.PYTHON3_6, LambdaRuntime.PYTHON3_7, LambdaRuntime.PYTHON3_8, LambdaRuntime.PYTHON3_9)
 
 class PythonSamProjectWizard : SamProjectWizard {
     override fun createSdkSelectionPanel(projectLocation: TextFieldWithBrowseButton?): SdkSelector = when {

testdata/samProjects/image/python3.9/hello_world/Dockerfile

@@ -0,0 +1,10 @@
+FROM public.ecr.aws/lambda/python:3.9
+
+COPY app.py requirements.txt ./
+
+RUN python3.9 -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"]

testdata/samProjects/image/python3.9/hello_world/app.py

@@ -0,0 +1,8 @@
+import json
+
+
+def lambda_handler(event, context):
+    return {
+        "statusCode": 200,
+        "body": {"message": str(event).upper()},
+    }