SAM Lambda ARM support (#2997)

Author: breedloj

.changes/next-release/feature-a1e4fc12-5147-41eb-b5b4-e2169c3d0e20.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Add SAM Lambda ARM support"
+}

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

@@ -0,0 +1,31 @@
+// Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.core.lambda
+
+import software.amazon.awssdk.services.lambda.model.Architecture
+
+enum class LambdaArchitecture(
+    private val architecture: Architecture,
+    val minSam: String? = null,
+) {
+    X86_64(Architecture.X86_64),
+    ARM64(Architecture.ARM64, minSam = "1.33.0");
+
+    override fun toString() = architecture.toString()
+
+    fun toSdkArchitecture() = architecture.validOrNull
+
+    companion object {
+        fun fromValue(value: String?): LambdaArchitecture? = if (value == null) {
+            null
+        } else {
+            values().find { it.toString() == value }
+        }
+
+        fun fromValue(value: Architecture): LambdaArchitecture? = values().find { it.architecture == value }
+
+        val DEFAULT = X86_64
+        val ARM_COMPATIBLE = listOf(X86_64, ARM64)
+    }
+}

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

@@ -4,11 +4,13 @@
 package software.aws.toolkits.core.lambda
 
 import software.amazon.awssdk.services.lambda.model.Runtime
+import software.aws.toolkits.core.lambda.LambdaArchitecture.Companion.ARM_COMPATIBLE
 
 enum class LambdaRuntime(
     private val runtime: Runtime?,
     val minSamInit: String? = null,
     val minSamDebugging: String? = null,
+    val architectures: List<LambdaArchitecture>? = listOf(LambdaArchitecture.DEFAULT),
     private val runtimeOverride: String? = null
 ) {
     GO1_X(
@@ -17,15 +19,15 @@ enum class LambdaRuntime(
         // and 1.17.0 broke the arguments
         minSamDebugging = "1.18.1"
     ),
-    NODEJS12_X(Runtime.NODEJS12_X),
-    NODEJS14_X(Runtime.NODEJS14_X, minSamDebugging = "1.17.0", minSamInit = "1.17.0"),
+    NODEJS12_X(Runtime.NODEJS12_X, architectures = ARM_COMPATIBLE),
+    NODEJS14_X(Runtime.NODEJS14_X, minSamDebugging = "1.17.0", minSamInit = "1.17.0", architectures = ARM_COMPATIBLE),
     JAVA8(Runtime.JAVA8),
-    JAVA8_AL2(Runtime.JAVA8_AL2, minSamDebugging = "1.2.0"),
-    JAVA11(Runtime.JAVA11),
+    JAVA8_AL2(Runtime.JAVA8_AL2, minSamDebugging = "1.2.0", architectures = ARM_COMPATIBLE),
+    JAVA11(Runtime.JAVA11, architectures = ARM_COMPATIBLE),
     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"),
+    PYTHON3_8(Runtime.PYTHON3_8, architectures = ARM_COMPATIBLE),
+    PYTHON3_9(Runtime.PYTHON3_9, minSamDebugging = "1.28.0", minSamInit = "1.28.0", architectures = ARM_COMPATIBLE),
     DOTNETCORE3_1(Runtime.DOTNETCORE3_1),
     DOTNET5_0(null, minSamInit = "1.16.0", runtimeOverride = "dotnet5.0");
 

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

@@ -3,6 +3,8 @@
 
 package software.aws.toolkits.core.lambda
 
+import software.amazon.awssdk.services.lambda.model.Architecture
 import software.amazon.awssdk.services.lambda.model.Runtime
 
 val Runtime?.validOrNull: Runtime? get() = this?.takeUnless { it == Runtime.UNKNOWN_TO_SDK_VERSION }
+val Architecture?.validOrNull: Architecture? get() = this?.takeUnless { it == Architecture.UNKNOWN_TO_SDK_VERSION }

jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/CloudFormationTemplate.kt

@@ -9,6 +9,7 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiElement
 import org.jetbrains.yaml.YAMLFileType
 import org.jetbrains.yaml.YAMLLanguage
+import org.jetbrains.yaml.psi.YAMLSequence
 import software.aws.toolkits.jetbrains.services.cloudformation.yaml.YamlCloudFormationTemplate
 import software.aws.toolkits.resources.message
 import java.io.File
@@ -51,6 +52,8 @@ interface NamedMap {
     fun getScalarProperty(key: String): String
     fun getOptionalScalarProperty(key: String): String?
     fun setScalarProperty(key: String, value: String)
+    fun getSequenceProperty(key: String): YAMLSequence
+    fun getOptionalSequenceProperty(key: String): YAMLSequence?
 }
 
 interface Resource : NamedMap {
@@ -96,6 +99,14 @@ class MutableParameter(private val copyFrom: Parameter) : Parameter {
         throw NotImplementedError()
     }
 
+    override fun getSequenceProperty(key: String): YAMLSequence {
+        throw NotImplementedError()
+    }
+
+    override fun getOptionalSequenceProperty(key: String): YAMLSequence? {
+        throw NotImplementedError()
+    }
+
     override fun defaultValue(): String? = defaultValue
 
     override fun description(): String? = description

jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/Resources.kt

@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.services.cloudformation
 
 import software.amazon.awssdk.services.lambda.model.PackageType
+import software.aws.toolkits.jetbrains.services.cloudformation.yaml.YamlCloudFormationTemplate.Companion.getTextValues
 import software.aws.toolkits.resources.message
 
 interface Function : Resource {
@@ -17,6 +18,7 @@ interface Function : Resource {
 
     fun runtime(): String = getScalarProperty("Runtime")
     fun handler(): String = getScalarProperty("Handler")
+    fun architectures(): List<String>? = getOptionalSequenceProperty("Architectures")?.getTextValues()
     fun timeout(): Int? = getOptionalScalarProperty("Timeout")?.toInt()
     fun memorySize(): Int? = getOptionalScalarProperty("MemorySize")?.toInt()
 }

jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/yaml/YamlCloudFormationTemplate.kt

@@ -15,6 +15,8 @@ import org.jetbrains.yaml.YAMLLanguage
 import org.jetbrains.yaml.psi.YAMLFile
 import org.jetbrains.yaml.psi.YAMLKeyValue
 import org.jetbrains.yaml.psi.YAMLMapping
+import org.jetbrains.yaml.psi.YAMLScalar
+import org.jetbrains.yaml.psi.YAMLSequence
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.jetbrains.services.cloudformation.CloudFormationParameter
@@ -77,6 +79,12 @@ class YamlCloudFormationTemplate(template: YAMLFile) : CloudFormationTemplate {
         override fun setScalarProperty(key: String, value: String) {
             throw NotImplementedError()
         }
+
+        override fun getSequenceProperty(key: String): YAMLSequence = getOptionalSequenceProperty(key)
+            ?: throw IllegalStateException(message("cloudformation.missing_property", key, logicalName))
+
+        override fun getOptionalSequenceProperty(key: String): YAMLSequence? = delegate.getKeyValueByKey(key)
+            ?.children?.filterIsInstance<YAMLSequence>()?.firstOrNull()
     }
 
     private class YamlResource(
@@ -102,6 +110,12 @@ class YamlCloudFormationTemplate(template: YAMLFile) : CloudFormationTemplate {
             properties().putKeyValue(newKeyValue)
         }
 
+        override fun getSequenceProperty(key: String): YAMLSequence = getOptionalSequenceProperty(key)
+            ?: throw IllegalStateException(message("cloudformation.missing_property", key, logicalName))
+
+        override fun getOptionalSequenceProperty(key: String): YAMLSequence? =
+            properties().getKeyValueByKey(key)?.children?.filterIsInstance<YAMLSequence>()?.firstOrNull()
+
         override fun getScalarMetadata(key: String): String = getOptionalScalarMetadata(key)
             ?: throw IllegalStateException(message("cloudformation.missing_property", key, logicalName))
 
@@ -124,6 +138,11 @@ class YamlCloudFormationTemplate(template: YAMLFile) : CloudFormationTemplate {
         override fun setScalarProperty(key: String, value: String) {
             throw NotImplementedError()
         }
+
+        override fun getSequenceProperty(key: String): YAMLSequence = getOptionalSequenceProperty(key)
+            ?: throw IllegalStateException(message("cloudformation.missing_property", key, logicalName))
+        override fun getOptionalSequenceProperty(key: String): YAMLSequence? = delegate.getKeyValueByKey(key)
+            ?.children?.filterIsInstance<YAMLSequence>()?.firstOrNull()
     }
 
     companion object {
@@ -144,6 +163,8 @@ class YamlCloudFormationTemplate(template: YAMLFile) : CloudFormationTemplate {
             return yamlKeyValue.asResource(YamlCloudFormationTemplate(yamlKeyValue.containingFile as YAMLFile))
         }
 
+        fun YAMLSequence.getTextValues(): List<String> = this.items.map { it.value }.filterIsInstance<YAMLScalar>().map { it.textValue }
+
         private fun YAMLKeyValue.asResource(cloudFormationTemplate: CloudFormationTemplate): Resource? {
             if (PsiTreeUtil.getParentOfType(this, YAMLKeyValue::class.java)?.keyText == "Resources") {
                 val yamlValue = this.value as? YAMLMapping ?: return null

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

@@ -16,6 +16,7 @@ import software.amazon.awssdk.services.lambda.model.FunctionConfiguration
 import software.amazon.awssdk.services.lambda.model.PackageType
 import software.amazon.awssdk.services.lambda.model.Runtime
 import software.amazon.awssdk.services.lambda.model.TracingMode
+import software.aws.toolkits.core.lambda.LambdaRuntime
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.jetbrains.services.iam.IamRole
@@ -32,6 +33,10 @@ import software.aws.toolkits.jetbrains.ui.SliderPanel
 object Lambda {
     private val LOG = getLogger<Lambda>()
 
+    fun findPsiElementsForHandler(project: Project, runtime: LambdaRuntime, handler: String): Array<NavigatablePsiElement> {
+        runtime.toSdkRuntime()?.let { return findPsiElementsForHandler(project, it, handler) } ?: return emptyArray()
+    }
+
     fun findPsiElementsForHandler(project: Project, runtime: Runtime, handler: String): Array<NavigatablePsiElement> {
         val resolver = runtime.runtimeGroup?.let { LambdaHandlerResolver.getInstanceOrNull(it) } ?: return emptyArray()
 

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

@@ -47,7 +47,8 @@ abstract class LambdaBuilder {
         SamTemplateUtils.writeDummySamTemplate(
             tempFile = dummyTemplate,
             logicalId = dummyLogicalId,
-            runtime = runtime,
+            runtime = runtime.toSdkRuntime() ?: throw IllegalStateException("Cannot map runtime $runtime to SDK runtime."),
+            architecture = settings.architecture.toSdkArchitecture(),
             handler = handlerForDummyTemplate(settings, element),
             timeout = settings.timeout,
             memorySize = settings.memorySize,

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

@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.services.lambda
 
 import com.intellij.util.text.SemVer
+import software.aws.toolkits.core.lambda.LambdaArchitecture
 import software.aws.toolkits.core.lambda.LambdaRuntime
 import software.aws.toolkits.jetbrains.services.lambda.sam.SamExecutable
 
@@ -14,3 +15,7 @@ fun LambdaRuntime.minSamDebuggingVersion(): SemVer =
 fun LambdaRuntime.minSamInitVersion(): SemVer =
     minSamInit?.let { SemVer.parseFromText(it) ?: throw IllegalStateException("$this has bad minSamInitVersion! It should be a semver string!") }
         ?: SamExecutable.minVersion
+
+fun LambdaArchitecture.minSamVersion(): SemVer =
+    minSam?.let { SemVer.parseFromText(it) ?: throw IllegalStateException("$this has bad minSamInitVersion! It should be a semver string!") }
+        ?: SamExecutable.minVersion