Support java17 lambda runtime (#3611)

vchikoti1998 · web-flow · commit 2e4c003602f4 · 2023-04-27T16:12:03.000-07:00
* Support java17 lambda runtime

* Few tests changed to java17

* Added minSam versions for Java17

* Reverted localLambdaRunConfigurationTest file

* Added changeLog

* reverted sam test files

* moved to offfical sdk
diff --git a/.changes/next-release/feature-dcd47603-f7e4-4481-9278-30953aa38631.json b/.changes/next-release/feature-dcd47603-f7e4-4481-9278-30953aa38631.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Add support for Lambda Runtime Java17"
+}
diff --git a/core/src/software/aws/toolkits/core/lambda/LambdaRuntime.kt b/core/src/software/aws/toolkits/core/lambda/LambdaRuntime.kt
@@ -25,6 +25,7 @@ enum class LambdaRuntime(
     JAVA8(Runtime.JAVA8),
     JAVA8_AL2(Runtime.JAVA8_AL2, minSamDebugging = "1.2.0", architectures = ARM_COMPATIBLE),
     JAVA11(Runtime.JAVA11, architectures = ARM_COMPATIBLE),
+    JAVA17(Runtime.JAVA17, minSamDebugging = "1.81.0", minSamInit = "1.81.0", architectures = ARM_COMPATIBLE),
     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),
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.48"
+awsSdk = "2.20.55"
 commonmark = "0.17.1"
 detekt = "1.21.0"
 intellijGradle = "1.13.2"
diff --git a/jetbrains-core/it/software/aws/toolkits/jetbrains/services/lambda/java/JavaLocalLambdaRunConfigurationIntegrationTest.kt b/jetbrains-core/it/software/aws/toolkits/jetbrains/services/lambda/java/JavaLocalLambdaRunConfigurationIntegrationTest.kt
@@ -39,7 +39,8 @@ class JavaLocalLambdaRunConfigurationIntegrationTest(private val runtime: Lambda
         fun data() = listOf(
             arrayOf(LambdaRuntime.JAVA8),
             arrayOf(LambdaRuntime.JAVA8_AL2),
-            arrayOf(LambdaRuntime.JAVA11)
+            arrayOf(LambdaRuntime.JAVA11),
+            arrayOf(LambdaRuntime.JAVA17)
         )
     }
 
@@ -73,6 +74,7 @@ class JavaLocalLambdaRunConfigurationIntegrationTest(private val runtime: Lambda
         val compatibility = when (runtime) {
             LambdaRuntime.JAVA8, LambdaRuntime.JAVA8_AL2 -> "1.8"
             LambdaRuntime.JAVA11 -> "11"
+            LambdaRuntime.JAVA17 -> "17"
             else -> throw NotImplementedError()
         }
 
diff --git a/jetbrains-core/resources/META-INF/ext-java.xml b/jetbrains-core/resources/META-INF/ext-java.xml
@@ -19,6 +19,7 @@
         <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.java.Java8ImageDebugSupport"/>
         <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.java.Java8Al2ImageDebugSupport"/>
         <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.java.Java11ImageDebugSupport"/>
+        <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.java.Java17ImageDebugSupport"/>
         <handlerResolver id="JAVA" implementationClass="software.aws.toolkits.jetbrains.services.lambda.java.JavaLambdaHandlerResolver"/>
         <sam.projectWizard id="JAVA" implementationClass="software.aws.toolkits.jetbrains.services.lambda.java.JavaSamProjectWizard"/>
     </extensions>
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/java/JavaDebugSupport.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/java/JavaDebugSupport.kt
@@ -74,6 +74,16 @@ open class Java11ImageDebugSupport : JavaImageDebugSupport() {
     )
 }
 
+open class Java17ImageDebugSupport : JavaImageDebugSupport() {
+    override val id: String = LambdaRuntime.JAVA17.toString()
+    override fun displayName() = LambdaRuntime.JAVA17.toString().capitalize()
+    override fun containerEnvVars(debugPorts: List<Int>): Map<String, String> = mapOf(
+        "_JAVA_OPTIONS" to "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=*:${debugPorts.first()} " +
+            "-XX:MaxHeapSize=2834432k -XX:MaxMetaspaceSize=163840k -XX:ReservedCodeCacheSize=81920k -XX:+UseSerialGC " +
+            "-XX:-TieredCompilation -Djava.net.preferIPv4Stack=true"
+    )
+}
+
 private val edtContext = getCoroutineUiContext()
 
 private suspend fun createDebugProcess(
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/java/JavaRuntimeGroup.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/java/JavaRuntimeGroup.kt
@@ -23,7 +23,8 @@ class JavaRuntimeGroup : SdkBasedRuntimeGroup() {
     override val supportedRuntimes: List<LambdaRuntime> = listOf(
         LambdaRuntime.JAVA8,
         LambdaRuntime.JAVA8_AL2,
-        LambdaRuntime.JAVA11
+        LambdaRuntime.JAVA11,
+        LambdaRuntime.JAVA17
     )
 
     override fun runtimeForSdk(sdk: Sdk): LambdaRuntime? {
@@ -35,8 +36,10 @@ class JavaRuntimeGroup : SdkBasedRuntimeGroup() {
     }
 
     private fun determineRuntimeForSdk(sdk: JavaSdkVersion) = when {
+        // TODO: is this actually the right logic?
         sdk <= JavaSdkVersion.JDK_1_8 -> LambdaRuntime.JAVA8_AL2
         sdk <= JavaSdkVersion.JDK_11 -> LambdaRuntime.JAVA11
+        sdk <= JavaSdkVersion.JDK_17 -> LambdaRuntime.JAVA17
         else -> null
     }
 
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/java/JavaSamProjectWizard.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/java/JavaSamProjectWizard.kt
@@ -41,8 +41,8 @@ class JavaSamProjectWizard : SamProjectWizard {
 }
 
 abstract class JavaSamProjectTemplate : SamAppTemplateBased() {
-    override fun supportedZipRuntimes() = setOf(LambdaRuntime.JAVA8, LambdaRuntime.JAVA8_AL2, LambdaRuntime.JAVA11)
-    override fun supportedImageRuntimes() = setOf(LambdaRuntime.JAVA8, LambdaRuntime.JAVA8_AL2, LambdaRuntime.JAVA11)
+    override fun supportedZipRuntimes() = setOf(LambdaRuntime.JAVA8, LambdaRuntime.JAVA8_AL2, LambdaRuntime.JAVA11, LambdaRuntime.JAVA17)
+    override fun supportedImageRuntimes() = setOf(LambdaRuntime.JAVA8, LambdaRuntime.JAVA8_AL2, LambdaRuntime.JAVA11, LambdaRuntime.JAVA17)
 
     // Helper method to locate the build file, such as pom.xml in the project content root.
     protected fun locateBuildFile(contentRoot: VirtualFile, buildFileName: String): VirtualFile? {
diff --git a/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/java/JavaHandlerCompletionProviderTest.kt b/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/java/JavaHandlerCompletionProviderTest.kt
@@ -27,4 +27,10 @@ class JavaHandlerCompletionProviderTest {
         val provider = HandlerCompletionProvider(projectRule.project, LambdaRuntime.JAVA11)
         assertFalse(provider.isCompletionSupported)
     }
+
+    @Test
+    fun completionIsNotSupportedJava17() {
+        val provider = HandlerCompletionProvider(projectRule.project, LambdaRuntime.JAVA17)
+        assertFalse(provider.isCompletionSupported)
+    }
 }
diff --git a/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/java/JavaLambdaHandlerResolverTest.kt b/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/java/JavaLambdaHandlerResolverTest.kt
@@ -84,7 +84,7 @@ class JavaLambdaHandlerResolverTest {
         runInEdtAndWait {
             val elements = Lambda.findPsiElementsForHandler(
                 fixture.project,
-                Runtime.JAVA8,
+                Runtime.JAVA17,
                 "com.example.LambdaHandler"
             )
             assertThat(elements).hasSize(1)
@@ -116,7 +116,7 @@ class JavaLambdaHandlerResolverTest {
         runInEdtAndWait {
             val elements = Lambda.findPsiElementsForHandler(
                 fixture.project,
-                Runtime.JAVA8,
+                Runtime.JAVA17,
                 "com.example.LambdaHandler::handleRequest"
             )
             assertThat(elements).hasSize(1)
@@ -148,7 +148,7 @@ class JavaLambdaHandlerResolverTest {
         runInEdtAndWait {
             val elements = Lambda.findPsiElementsForHandler(
                 fixture.project,
-                Runtime.JAVA8,
+                Runtime.JAVA17,
                 "com.example.LambdaHandler::handleRequest"
             )
             assertThat(elements).hasSize(1)
@@ -166,7 +166,7 @@ class JavaLambdaHandlerResolverTest {
         runInEdtAndWait {
             val elements = Lambda.findPsiElementsForHandler(
                 fixture.project,
-                Runtime.JAVA8,
+                Runtime.JAVA17,
                 "com.example.LambdaHandler"
             )
             assertThat(elements).isEmpty()
@@ -194,7 +194,7 @@ class JavaLambdaHandlerResolverTest {
         runInEdtAndWait {
             val elements = Lambda.findPsiElementsForHandler(
                 fixture.project,
-                Runtime.JAVA8,
+                Runtime.JAVA17,
                 "com.example.LambdaHandler::someMethod"
             )
             assertThat(elements).isEmpty()
@@ -237,7 +237,7 @@ class JavaLambdaHandlerResolverTest {
         runInEdtAndWait {
             val elements = Lambda.findPsiElementsForHandler(
                 fixture.project,
-                Runtime.JAVA8,
+                Runtime.JAVA17,
                 "com.example.ConcreteHandler::handleRequest"
             )
             assertThat(elements).hasSize(1)
@@ -273,7 +273,7 @@ class JavaLambdaHandlerResolverTest {
         )
 
         runInEdtAndWait {
-            val isHandlerValid: (String) -> Boolean = { handler -> Lambda.isHandlerValid(fixture.project, Runtime.JAVA11, handler) }
+            val isHandlerValid: (String) -> Boolean = { handler -> Lambda.isHandlerValid(fixture.project, Runtime.JAVA17, handler) }
 
             assertThat(isHandlerValid("com.example.LambdaHandler::streamsOnly")).isTrue
             assertThat(isHandlerValid("com.example.LambdaHandler::contextAndAnything")).isTrue
@@ -304,7 +304,7 @@ class JavaLambdaHandlerResolverTest {
         )
 
         runInEdtAndWait {
-            val isHandlerValid: (String) -> Boolean = { handler -> Lambda.isHandlerValid(fixture.project, Runtime.JAVA11, handler) }
+            val isHandlerValid: (String) -> Boolean = { handler -> Lambda.isHandlerValid(fixture.project, Runtime.JAVA17, handler) }
 
             assertThat(isHandlerValid("com.example.LambdaHandler::works")).isTrue
             assertThat(isHandlerValid("com.example.LambdaHandler::alsoWorks")).isTrue
@@ -337,7 +337,7 @@ class JavaLambdaHandlerResolverTest {
         )
 
         runInEdtAndWait {
-            val isHandlerValid: (String) -> Boolean = { handler -> Lambda.isHandlerValid(fixture.project, Runtime.JAVA11, handler) }
+            val isHandlerValid: (String) -> Boolean = { handler -> Lambda.isHandlerValid(fixture.project, Runtime.JAVA17, handler) }
 
             assertThat(isHandlerValid("com.example.LambdaHandler::works")).isTrue
             assertThat(isHandlerValid("com.example.LambdaHandler::doesntWork")).isFalse
@@ -368,7 +368,7 @@ class JavaLambdaHandlerResolverTest {
         runInEdtAndWait {
             val elements = Lambda.findPsiElementsForHandler(
                 fixture.project,
-                Runtime.JAVA8,
+                Runtime.JAVA17,
                 "com.example.LambdaHandler::handleRequest"
             )
             assertThat(elements[0]).isInstanceOfSatisfying(PsiMethod::class.java) {
@@ -401,7 +401,7 @@ class JavaLambdaHandlerResolverTest {
         runInEdtAndWait {
             val elements = Lambda.findPsiElementsForHandler(
                 fixture.project,
-                Runtime.JAVA8,
+                Runtime.JAVA17,
                 "com.example.LambdaHandler::handleRequest"
             )
             assertThat(elements[0]).isInstanceOfSatisfying(PsiMethod::class.java) {
@@ -434,7 +434,7 @@ class JavaLambdaHandlerResolverTest {
         runInEdtAndWait {
             val elements = Lambda.findPsiElementsForHandler(
                 fixture.project,
-                Runtime.JAVA8,
+                Runtime.JAVA17,
                 "com.example.LambdaHandler::handleRequest"
             )
             assertThat(elements).isEmpty()
@@ -462,7 +462,7 @@ class JavaLambdaHandlerResolverTest {
             runInEdtAndWait {
                 val elements = Lambda.findPsiElementsForHandler(
                     projectRule.project,
-                    Runtime.JAVA8,
+                    Runtime.JAVA17,
                     "com.example.LambdaHandler::handleRequest"
                 )
                 assertThat(elements).isEmpty()
diff --git a/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/java/JavaRuntimeGroupTest.kt b/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/java/JavaRuntimeGroupTest.kt
@@ -52,7 +52,9 @@ class JavaRuntimeGroupTest(
             arrayOf<Any?>("Java 9", { IdeaTestUtil.getMockJdk9() }, LambdaRuntime.JAVA11),
             arrayOf<Any?>("Java 10", { IdeaTestUtil.getMockJdk(LanguageLevel.JDK_10.toJavaVersion()) }, LambdaRuntime.JAVA11),
             arrayOf<Any?>("Java 11", { IdeaTestUtil.getMockJdk(LanguageLevel.JDK_11.toJavaVersion()) }, LambdaRuntime.JAVA11),
-            arrayOf<Any?>("Java 12", { IdeaTestUtil.getMockJdk(LanguageLevel.JDK_12.toJavaVersion()) }, null)
+            arrayOf<Any?>("Java 12", { IdeaTestUtil.getMockJdk(LanguageLevel.JDK_12.toJavaVersion()) }, LambdaRuntime.JAVA17),
+            arrayOf<Any?>("Java 17", { IdeaTestUtil.getMockJdk(LanguageLevel.JDK_17.toJavaVersion()) }, LambdaRuntime.JAVA17),
+            arrayOf<Any?>("Java 18", { IdeaTestUtil.getMockJdk(LanguageLevel.JDK_18.toJavaVersion()) }, null)
         )
     }
 }
diff --git a/testdata/samProjects/image/java17/maven/UpperFunction/Dockerfile b/testdata/samProjects/image/java17/maven/UpperFunction/Dockerfile
@@ -0,0 +1,15 @@
+FROM public.ecr.aws/docker/library/maven:latest as build-image
+
+WORKDIR "/task"
+COPY src/ src/
+COPY pom.xml ./
+
+RUN mvn -q clean install
+RUN mvn dependency:copy-dependencies -DincludeScope=compile
+
+FROM public.ecr.aws/lambda/java:17
+
+COPY --from=build-image /task/target/classes /var/task/
+COPY --from=build-image /task/target/dependency /var/task/lib
+
+CMD ["App::handleRequest"]
diff --git a/testdata/samProjects/image/java17/maven/UpperFunction/pom.xml b/testdata/samProjects/image/java17/maven/UpperFunction/pom.xml
@@ -0,0 +1,43 @@
+<!-- Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>helloworld</groupId>
+    <artifactId>HelloWorld</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    <name>A sample Hello World created for SAM CLI.</name>
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.1.1</version>
+                <configuration>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/testdata/samProjects/image/java17/maven/UpperFunction/src/main/java/helloworld/App.java b/testdata/samProjects/image/java17/maven/UpperFunction/src/main/java/helloworld/App.java
@@ -0,0 +1,8 @@
+// Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+public class App {
+    public String handleRequest(String request) {
+        return request.toUpperCase();
+    }
+}
diff --git a/testdata/samProjects/image/java17/maven/template.yaml b/testdata/samProjects/image/java17/maven/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: UpperFunction
+      Dockerfile: Dockerfile
diff --git a/testdata/samProjects/zip/java17/HelloWorldFunction/pom.xml b/testdata/samProjects/zip/java17/HelloWorldFunction/pom.xml
@@ -0,0 +1,44 @@
+<!-- Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>helloworld</groupId>
+    <artifactId>HelloWorld</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    <name>A sample Hello World created for SAM CLI.</name>
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+            <version>1.2.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <configuration>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/testdata/samProjects/zip/java17/HelloWorldFunction/src/main/java/helloworld/App.java b/testdata/samProjects/zip/java17/HelloWorldFunction/src/main/java/helloworld/App.java
@@ -0,0 +1,8 @@
+// Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+public class App {
+    public String handleRequest(String request) {
+        return request.toUpperCase();
+    }
+}
diff --git a/testdata/samProjects/zip/java17/template.yaml b/testdata/samProjects/zip/java17/template.yaml
@@ -0,0 +1,16 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+
+Resources:
+  SomeFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      CodeUri: HelloWorldFunction
+      Handler: helloworld.App::handleRequest
+      Runtime: java17
+      Timeout: 900
+      MemorySize: 512
+      Environment:
+        Variables:
+          PARAM1: Value
+          PARAM2: Value2

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "feature",
 +  "description" : "Add support for Lambda Runtime Java17"
 +}
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@ class JavaLocalLambdaRunConfigurationIntegrationTest(private val runtime: Lambda`
`39`	`39`	`fun data() = listOf(`
`40`	`40`	`arrayOf(LambdaRuntime.JAVA8),`
`41`	`41`	`arrayOf(LambdaRuntime.JAVA8_AL2),`
`42`		`- arrayOf(LambdaRuntime.JAVA11)`
	`42`	`+ arrayOf(LambdaRuntime.JAVA11),`
	`43`	`+ arrayOf(LambdaRuntime.JAVA17)`
`43`	`44`	`)`
`44`	`45`	`}`
`45`	`46`
`@@ -73,6 +74,7 @@ class JavaLocalLambdaRunConfigurationIntegrationTest(private val runtime: Lambda`
`73`	`74`	`val compatibility = when (runtime) {`
`74`	`75`	`LambdaRuntime.JAVA8, LambdaRuntime.JAVA8_AL2 -> "1.8"`
`75`	`76`	`LambdaRuntime.JAVA11 -> "11"`
	`77`	`+ LambdaRuntime.JAVA17 -> "17"`
`76`	`78`	`else -> throw NotImplementedError()`
`77`	`79`	`}`
`78`	`80`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ class JavaRuntimeGroup : SdkBasedRuntimeGroup() {`
`23`	`23`	`override val supportedRuntimes: List<LambdaRuntime> = listOf(`
`24`	`24`	`LambdaRuntime.JAVA8,`
`25`	`25`	`LambdaRuntime.JAVA8_AL2,`
`26`		`- LambdaRuntime.JAVA11`
	`26`	`+ LambdaRuntime.JAVA11,`
	`27`	`+ LambdaRuntime.JAVA17`
`27`	`28`	`)`
`28`	`29`
`29`	`30`	`override fun runtimeForSdk(sdk: Sdk): LambdaRuntime? {`
`@@ -35,8 +36,10 @@ class JavaRuntimeGroup : SdkBasedRuntimeGroup() {`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`private fun determineRuntimeForSdk(sdk: JavaSdkVersion) = when {`
	`39`	`+ // TODO: is this actually the right logic?`
`38`	`40`	`sdk <= JavaSdkVersion.JDK_1_8 -> LambdaRuntime.JAVA8_AL2`
`39`	`41`	`sdk <= JavaSdkVersion.JDK_11 -> LambdaRuntime.JAVA11`
	`42`	`+ sdk <= JavaSdkVersion.JDK_17 -> LambdaRuntime.JAVA17`
`40`	`43`	`else -> null`
`41`	`44`	`}`
`42`	`45`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ class JavaSamProjectWizard : SamProjectWizard {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`abstract class JavaSamProjectTemplate : SamAppTemplateBased() {`
`44`		`- override fun supportedZipRuntimes() = setOf(LambdaRuntime.JAVA8, LambdaRuntime.JAVA8_AL2, LambdaRuntime.JAVA11)`
`45`		`- override fun supportedImageRuntimes() = setOf(LambdaRuntime.JAVA8, LambdaRuntime.JAVA8_AL2, LambdaRuntime.JAVA11)`
	`44`	`+ override fun supportedZipRuntimes() = setOf(LambdaRuntime.JAVA8, LambdaRuntime.JAVA8_AL2, LambdaRuntime.JAVA11, LambdaRuntime.JAVA17)`
	`45`	`+ override fun supportedImageRuntimes() = setOf(LambdaRuntime.JAVA8, LambdaRuntime.JAVA8_AL2, LambdaRuntime.JAVA11, LambdaRuntime.JAVA17)`
`46`	`46`
`47`	`47`	`// Helper method to locate the build file, such as pom.xml in the project content root.`
`48`	`48`	`protected fun locateBuildFile(contentRoot: VirtualFile, buildFileName: String): VirtualFile? {`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,10 @@ class JavaHandlerCompletionProviderTest {`
`27`	`27`	`val provider = HandlerCompletionProvider(projectRule.project, LambdaRuntime.JAVA11)`
`28`	`28`	`assertFalse(provider.isCompletionSupported)`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+ @Test`
	`32`	`+ fun completionIsNotSupportedJava17() {`
	`33`	`+ val provider = HandlerCompletionProvider(projectRule.project, LambdaRuntime.JAVA17)`
	`34`	`+ assertFalse(provider.isCompletionSupported)`
	`35`	`+ }`
`30`	`36`	`}`