Add support for Lambda runtime Python 3.10 (#3594)

vchikoti1998 · rli · web-flow · commit e2da13936163 · 2023-04-18T14:16:38.000-07:00
* Add support for Lambda runtime Python 3.10

* Added sdk files

* detekt issues

* Added test data

* Changed to official sdks

---------

Co-authored-by: Richard Li &lt;742829+rli@users.noreply.github.com&gt;
diff --git a/.changes/next-release/feature-a74ea09f-0d8f-4da0-9c48-7f08a07b01fc.json b/.changes/next-release/feature-a74ea09f-0d8f-4da0-9c48-7f08a07b01fc.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Add support for Lambda runtime Python 3.10"
+}
diff --git a/core/src/software/aws/toolkits/core/lambda/LambdaRuntime.kt b/core/src/software/aws/toolkits/core/lambda/LambdaRuntime.kt
@@ -28,6 +28,7 @@ enum class LambdaRuntime(
     PYTHON3_7(Runtime.PYTHON3_7),
     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),
     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/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
@@ -45,7 +45,8 @@ class PythonLocalLambdaRunConfigurationIntegrationTest(private val runtime: Runt
         fun data(): Collection<Array<Runtime>> = listOf(
             arrayOf(Runtime.PYTHON3_7),
             arrayOf(Runtime.PYTHON3_8),
-            arrayOf(Runtime.PYTHON3_9)
+            arrayOf(Runtime.PYTHON3_9),
+            arrayOf(Runtime.PYTHON3_10)
         )
     }
 
diff --git a/jetbrains-core/resources/META-INF/ext-python.xml b/jetbrains-core/resources/META-INF/ext-python.xml
@@ -22,6 +22,7 @@
         <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.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.python.Python310ImageDebugSupport"/>
         <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
@@ -93,6 +93,13 @@ class Python39ImageDebugSupport : PythonImageDebugSupport() {
     override val bootstrapPath: String = "/var/runtime/bootstrap.py"
 }
 
+class Python310ImageDebugSupport : PythonImageDebugSupport() {
+    override val id: String = LambdaRuntime.PYTHON3_10.toString()
+    override fun displayName() = LambdaRuntime.PYTHON3_10.toString().capitalize()
+    override val pythonPath: String = "/var/lang/bin/python3.10"
+    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
@@ -22,10 +22,12 @@ class PythonRuntimeGroup : SdkBasedRuntimeGroup() {
     override val supportedRuntimes = listOf(
         LambdaRuntime.PYTHON3_7,
         LambdaRuntime.PYTHON3_8,
-        LambdaRuntime.PYTHON3_9
+        LambdaRuntime.PYTHON3_9,
+        LambdaRuntime.PYTHON3_10
     )
 
     override fun runtimeForSdk(sdk: Sdk): LambdaRuntime? = when {
+        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
         sdk.sdkType is PythonSdkType && PythonSdkType.getLanguageLevelForSdk(sdk).isAtLeast(LanguageLevel.PYTHON37) -> LambdaRuntime.PYTHON3_7
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,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_7, LambdaRuntime.PYTHON3_8, LambdaRuntime.PYTHON3_9)
-private val eventBridgeTemplateRuntimes = setOf(LambdaRuntime.PYTHON3_7, LambdaRuntime.PYTHON3_8, LambdaRuntime.PYTHON3_9)
+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)
 
 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.9" />
+              <option name="runtime" value="python3.10" />
               <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_9)
+            assertThat(runConfiguration.runtime()).isEqualTo(LambdaRuntime.PYTHON3_10)
             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
@@ -33,4 +33,10 @@ class PythonHandlerCompletionProviderTest {
         val provider = HandlerCompletionProvider(projectRule.project, LambdaRuntime.PYTHON3_9)
         assertFalse(provider.isCompletionSupported)
     }
+
+    @Test
+    fun completionIsNotSupportedPython310() {
+        val provider = HandlerCompletionProvider(projectRule.project, LambdaRuntime.PYTHON3_10)
+        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
@@ -40,4 +40,12 @@ class PythonRuntimeGroupTest {
 
         assertThat(sut.determineRuntime(module)).isEqualTo(LambdaRuntime.PYTHON3_9)
     }
+
+    @Test
+    fun testRuntimeDetection310() {
+        val module = projectRule.module
+        projectRule.setModuleSdk(module, PyTestSdk("3.10.0"))
+
+        assertThat(sut.determineRuntime(module)).isEqualTo(LambdaRuntime.PYTHON3_10)
+    }
 }
diff --git a/testdata/samProjects/image/python3.10/hello_world/Dockerfile b/testdata/samProjects/image/python3.10/hello_world/Dockerfile
@@ -0,0 +1,10 @@
+FROM public.ecr.aws/lambda/python:3.10
+
+COPY app.py requirements.txt ./
+
+RUN python3.10 -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.10/hello_world/app.py b/testdata/samProjects/image/python3.10/hello_world/app.py
@@ -0,0 +1,8 @@
+import json
+
+
+def lambda_handler(event, context):
+    return {
+        "statusCode": 200,
+        "body": {"message": str(event).upper()},
+    }
diff --git a/testdata/samProjects/image/python3.10/hello_world/requirements.txt b/testdata/samProjects/image/python3.10/hello_world/requirements.txt
diff --git a/testdata/samProjects/image/python3.10/template.yaml b/testdata/samProjects/image/python3.10/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.10"
 +}
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ class PythonLocalLambdaRunConfigurationIntegrationTest(private val runtime: Runt`
`45`	`45`	`fun data(): Collection<Array<Runtime>> = listOf(`
`46`	`46`	`arrayOf(Runtime.PYTHON3_7),`
`47`	`47`	`arrayOf(Runtime.PYTHON3_8),`
`48`		`- arrayOf(Runtime.PYTHON3_9)`
	`48`	`+ arrayOf(Runtime.PYTHON3_9),`
	`49`	`+ arrayOf(Runtime.PYTHON3_10)`
`49`	`50`	`)`
`50`	`51`	`}`
`51`	`52`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,10 @@ class PythonHandlerCompletionProviderTest {`
`33`	`33`	`val provider = HandlerCompletionProvider(projectRule.project, LambdaRuntime.PYTHON3_9)`
`34`	`34`	`assertFalse(provider.isCompletionSupported)`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+ @Test`
	`38`	`+ fun completionIsNotSupportedPython310() {`
	`39`	`+ val provider = HandlerCompletionProvider(projectRule.project, LambdaRuntime.PYTHON3_10)`
	`40`	`+ assertFalse(provider.isCompletionSupported)`
	`41`	`+ }`
`36`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,12 @@ class PythonRuntimeGroupTest {`
`40`	`40`
`41`	`41`	`assertThat(sut.determineRuntime(module)).isEqualTo(LambdaRuntime.PYTHON3_9)`
`42`	`42`	`}`
	`43`	`+`
	`44`	`+ @Test`
	`45`	`+ fun testRuntimeDetection310() {`
	`46`	`+ val module = projectRule.module`
	`47`	`+ projectRule.setModuleSdk(module, PyTestSdk("3.10.0"))`
	`48`	`+`
	`49`	`+ assertThat(sut.determineRuntime(module)).isEqualTo(LambdaRuntime.PYTHON3_10)`
	`50`	`+ }`
`43`	`51`	`}`