SAM .NET 6 support (#3079)

breedloj · web-flow · commit 44bb11abbc99 · 2022-03-03T14:30:41.000-08:00
diff --git a/.changes/next-release/feature-6c8fc962-83b0-405a-b8c1-8bcf2069598c.json b/.changes/next-release/feature-6c8fc962-83b0-405a-b8c1-8bcf2069598c.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Added support for .NET 6 runtime for creating and debugging SAM functions"
+}
diff --git a/buildspec/linuxIntegrationTests.yml b/buildspec/linuxIntegrationTests.yml
@@ -19,6 +19,10 @@ phases:
       - export DOCKER_USERNAME=`echo $DOCKER_HUB_TOKEN | jq -r '.username'`
       - export DOCKER_PASSWORD=`echo $DOCKER_HUB_TOKEN | jq -r '.password'`
       - docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD || true
+      - |
+        if [ "$ALTERNATIVE_IDE_PROFILE_NAME" != "2021.1" ]; then
+            DOTNET_ROOT="/root/.dotnet" /usr/local/bin/dotnet-install.sh --channel 6.0
+        fi
 
   build:
     commands:
diff --git a/core/src/software/aws/toolkits/core/lambda/LambdaRuntime.kt b/core/src/software/aws/toolkits/core/lambda/LambdaRuntime.kt
@@ -29,7 +29,8 @@ 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),
     DOTNETCORE3_1(Runtime.DOTNETCORE3_1),
-    DOTNET5_0(null, minSamInit = "1.16.0", runtimeOverride = "dotnet5.0");
+    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);
 
     override fun toString() = runtime?.toString() ?: runtimeOverride ?: throw IllegalStateException("LambdaRuntime has no runtime or override string")
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 apacheCommons = "2.8.0"
 assertJ = "3.20.2" # Upgrading leads to SAM errors: https://youtrack.jetbrains.com/issue/KT-17765
-awsSdk = "2.17.76"
+awsSdk = "2.17.138"
 commonmark = "0.17.1"
 detekt = "1.18.1"
 intellijGradle = "1.4.0"
diff --git a/jetbrains-rider/ReSharper.AWS/src/AWS.Daemon/AWS.Daemon.csproj b/jetbrains-rider/ReSharper.AWS/src/AWS.Daemon/AWS.Daemon.csproj
@@ -7,7 +7,7 @@
 
     <ItemGroup>
         <PackageReference Include="JetBrains.Rider.SDK" Version="$(RiderSDKVersion)" />
-        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.$(NetFrameworkTarget)" Version="1.0.0" />
+        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.$(NetFrameworkTarget)" Version="1.0.2" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/jetbrains-rider/ReSharper.AWS/src/AWS.Localization/AWS.Localization.csproj b/jetbrains-rider/ReSharper.AWS/src/AWS.Localization/AWS.Localization.csproj
@@ -7,7 +7,7 @@
 
     <ItemGroup>
         <PackageReference Include="JetBrains.Rider.SDK" Version="$(RiderSDKVersion)" />
-        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.$(NetFrameworkTarget)" Version="1.0.0" />
+        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.$(NetFrameworkTarget)" Version="1.0.2" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/jetbrains-rider/ReSharper.AWS/src/AWS.Project/AWS.Project.csproj b/jetbrains-rider/ReSharper.AWS/src/AWS.Project/AWS.Project.csproj
@@ -7,7 +7,7 @@
 
     <ItemGroup>
         <PackageReference Include="JetBrains.Rider.SDK" Version="$(RiderSDKVersion)" />
-        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.$(NetFrameworkTarget)" Version="1.0.0" />
+        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.$(NetFrameworkTarget)" Version="1.0.2" />
     </ItemGroup>
 
 </Project>
diff --git a/jetbrains-rider/ReSharper.AWS/src/AWS.Psi/AWS.Psi.csproj b/jetbrains-rider/ReSharper.AWS/src/AWS.Psi/AWS.Psi.csproj
@@ -7,7 +7,7 @@
 
     <ItemGroup>
       <PackageReference Include="JetBrains.Rider.SDK" Version="$(RiderSDKVersion)" />
-      <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.$(NetFrameworkTarget)" Version="1.0.0" />
+      <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.$(NetFrameworkTarget)" Version="1.0.2" />
     </ItemGroup>
 
 </Project>
diff --git a/jetbrains-rider/ReSharper.AWS/src/AWS.Settings/AWS.Settings.csproj b/jetbrains-rider/ReSharper.AWS/src/AWS.Settings/AWS.Settings.csproj
@@ -7,7 +7,7 @@
 
     <ItemGroup>
         <PackageReference Include="JetBrains.Rider.SDK" Version="$(RiderSDKVersion)" />
-        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.$(NetFrameworkTarget)" Version="1.0.0" />
+        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.$(NetFrameworkTarget)" Version="1.0.2" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/jetbrains-rider/it-213+/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotnetLocalLambdaRunConfigurationIntegrationTest.kt b/jetbrains-rider/it-213+/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotnetLocalLambdaRunConfigurationIntegrationTest.kt
@@ -0,0 +1,11 @@
+// Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.lambda.dotnet
+
+import software.aws.toolkits.core.lambda.LambdaRuntime
+
+class Dotnet60LocalLambdaRunConfigurationIntegrationTest : DotnetLocalLambdaRunConfigurationIntegrationTestBase("EchoLambda6X", LambdaRuntime.DOTNET6_0)
+
+class Dotnet60LocalLambdaImageRunConfigurationIntegrationTest :
+    DotnetLocalLambdaImageRunConfigurationIntegrationTestBase("ImageLambda6X", LambdaRuntime.DOTNET6_0)
diff --git a/jetbrains-rider/resources/META-INF/ext-rider.xml b/jetbrains-rider/resources/META-INF/ext-rider.xml
@@ -31,6 +31,7 @@
         <sam.runtimeDebugSupport id="DOTNET" implementationClass="software.aws.toolkits.jetbrains.services.lambda.dotnet.DotNetRuntimeDebugSupport"/>
         <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.dotnet.Dotnet31ImageDebug"/>
         <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.dotnet.Dotnet50ImageDebug"/>
+        <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.dotnet.Dotnet60ImageDebug"/>
         <sam.projectWizard id="DOTNET" implementationClass="software.aws.toolkits.jetbrains.services.lambda.dotnet.DotNetSamProjectWizard"/>
     </extensions>
 
diff --git a/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetRuntimeGroup.kt b/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetRuntimeGroup.kt
@@ -22,7 +22,8 @@ class DotNetRuntimeGroup : SdkBasedRuntimeGroup() {
     )
     override val supportedRuntimes = listOf(
         LambdaRuntime.DOTNETCORE3_1,
-        LambdaRuntime.DOTNET5_0
+        LambdaRuntime.DOTNET5_0,
+        LambdaRuntime.DOTNET6_0
     )
 
     override fun runtimeForSdk(sdk: Sdk): LambdaRuntime? = null
diff --git a/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectTemplate.kt b/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectTemplate.kt
@@ -16,6 +16,6 @@ class DotNetSamProjectTemplate : SamAppTemplateBased() {
 
     override fun description(): String = message("sam.init.template.hello_world.description")
 
-    override fun supportedZipRuntimes(): Set<LambdaRuntime> = setOf(LambdaRuntime.DOTNETCORE3_1)
-    override fun supportedImageRuntimes(): Set<LambdaRuntime> = setOf(LambdaRuntime.DOTNETCORE3_1, LambdaRuntime.DOTNET5_0)
+    override fun supportedZipRuntimes(): Set<LambdaRuntime> = setOf(LambdaRuntime.DOTNETCORE3_1, LambdaRuntime.DOTNET6_0)
+    override fun supportedImageRuntimes(): Set<LambdaRuntime> = setOf(LambdaRuntime.DOTNETCORE3_1, LambdaRuntime.DOTNET5_0, LambdaRuntime.DOTNET6_0)
 }
diff --git a/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotnetDebugSupport.kt b/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotnetDebugSupport.kt
@@ -77,3 +77,8 @@ class Dotnet50ImageDebug : DotnetImageDebugSupport() {
     override val id: String = LambdaRuntime.DOTNET5_0.toString()
     override fun displayName() = LambdaRuntime.DOTNET5_0.toString().capitalize()
 }
+
+class Dotnet60ImageDebug : DotnetImageDebugSupport() {
+    override val id: String = LambdaRuntime.DOTNET6_0.toString()
+    override fun displayName() = LambdaRuntime.DOTNET6_0.toString().capitalize()
+}
diff --git a/jetbrains-rider/testData/solutions/EchoLambda6X/EchoLambda.sln b/jetbrains-rider/testData/solutions/EchoLambda6X/EchoLambda.sln
@@ -0,0 +1,10 @@
+﻿
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EchoLambda", "src\HelloWorld\EchoLambda.csproj", "{CE37B7BD-5345-439A-9D36-C85C9697CCA7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{26111B38-0CBD-4F3C-9598-275DE0F6E99C}"
+ProjectSection(SolutionItems) = preProject
+EndProjectSection
+EndProject
+Global
+EndGlobal
diff --git a/jetbrains-rider/testData/solutions/EchoLambda6X/expected.gold b/jetbrains-rider/testData/solutions/EchoLambda6X/expected.gold
@@ -0,0 +1,5 @@
+--> Function.cs:15(455,507) // return System.Environment.GetEnvironmentVariables();
+Function.FunctionHandler() in EchoLambda, EchoLambda.dll
+    +this = Function: null
+    +context = LambdaContext: null
+
diff --git a/jetbrains-rider/testData/solutions/EchoLambda6X/src/HelloWorld/EchoLambda.csproj b/jetbrains-rider/testData/solutions/EchoLambda6X/src/HelloWorld/EchoLambda.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Amazon.Lambda.Core" Version="1.2.0" />
+    <PackageReference Include="Amazon.Lambda.Serialization.Json" Version="1.8.0" />
+  </ItemGroup>
+</Project>
+
diff --git a/jetbrains-rider/testData/solutions/EchoLambda6X/src/HelloWorld/Function.cs b/jetbrains-rider/testData/solutions/EchoLambda6X/src/HelloWorld/Function.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Amazon.Lambda.Core;
+
+// Assembly attribute to enable the Lambda function's JSON input to be converted into a .NET class.
+[assembly: LambdaSerializer(typeof(Amazon.Lambda.Serialization.Json.JsonSerializer))]
+
+namespace EchoLambda
+{
+    public class Function
+    {
+        public System.Collections.IDictionary FunctionHandler(ILambdaContext context)
+        {
+            return System.Environment.GetEnvironmentVariables();
+        }
+    }
+}
diff --git a/jetbrains-rider/testData/solutions/ImageLambda6X/ImageLambda.sln b/jetbrains-rider/testData/solutions/ImageLambda6X/ImageLambda.sln
@@ -0,0 +1,11 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageLambda", "src\HelloWorld\HelloWorld.csproj", "{CE37B7BD-6345-439A-9D36-C85C9697CCA7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{26111B38-0CBD-4F3C-9598-275DE0F6E99C}"
+ProjectSection(SolutionItems) = preProject
+	template.yaml = template.yaml
+EndProjectSection
+EndProject
+EndProjectSection
+Global
+EndGlobal
diff --git a/jetbrains-rider/testData/solutions/ImageLambda6X/expected.gold b/jetbrains-rider/testData/solutions/ImageLambda6X/expected.gold
@@ -0,0 +1,5 @@
+--> Function.cs:15(455,507) // return System.Environment.GetEnvironmentVariables();
+Function.FunctionHandler() in EchoLambda, HelloWorld.dll
+    +this = Function: null
+    +context = LambdaContext: null
+
diff --git a/jetbrains-rider/testData/solutions/ImageLambda6X/src/HelloWorld/Dockerfile b/jetbrains-rider/testData/solutions/ImageLambda6X/src/HelloWorld/Dockerfile
@@ -0,0 +1,23 @@
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-image
+
+ARG FUNCTION_DIR="/build"
+ARG SAM_BUILD_MODE="run"
+ENV PATH="/root/.dotnet/tools:${PATH}"
+
+RUN apt-get update && apt-get -y install zip
+
+RUN mkdir $FUNCTION_DIR
+WORKDIR $FUNCTION_DIR
+COPY Function.cs HelloWorld.csproj aws-lambda-tools-defaults.json $FUNCTION_DIR/
+RUN dotnet tool install -g Amazon.Lambda.Tools
+
+# Build and Copy artifacts depending on build mode.
+RUN mkdir -p build_artifacts
+RUN if [ "$SAM_BUILD_MODE" = "debug" ]; then dotnet lambda package --configuration Debug; else dotnet lambda package --configuration Release; fi
+RUN if [ "$SAM_BUILD_MODE" = "debug" ]; then cp -r /build/bin/Debug/net6.0/publish/* /build/build_artifacts; else cp -r /build/bin/Release/net6.0/publish/* /build/build_artifacts; fi
+
+FROM public.ecr.aws/lambda/dotnet:6
+
+COPY --from=build-image /build/build_artifacts/ /var/task/
+# Command can be overwritten by providing a different command in the template directly.
+CMD ["HelloWorld::EchoLambda.Function::FunctionHandler"]
diff --git a/jetbrains-rider/testData/solutions/ImageLambda6X/src/HelloWorld/Function.cs b/jetbrains-rider/testData/solutions/ImageLambda6X/src/HelloWorld/Function.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Amazon.Lambda.Core;
+
+// Assembly attribute to enable the Lambda function's JSON input to be converted into a .NET class.
+[assembly: LambdaSerializer(typeof(Amazon.Lambda.Serialization.Json.JsonSerializer))]
+
+namespace EchoLambda
+{
+    public class Function
+    {
+        public System.Collections.IDictionary FunctionHandler(ILambdaContext context)
+        {
+            return System.Environment.GetEnvironmentVariables();
+        }
+    }
+}
diff --git a/jetbrains-rider/testData/solutions/ImageLambda6X/src/HelloWorld/HelloWorld.csproj b/jetbrains-rider/testData/solutions/ImageLambda6X/src/HelloWorld/HelloWorld.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Amazon.Lambda.Core" Version="1.2.0" />
+    <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.3.0" />
+    <PackageReference Include="Amazon.Lambda.Serialization.Json" Version="1.8.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+  </ItemGroup>
+</Project>
+
diff --git a/jetbrains-rider/testData/solutions/ImageLambda6X/src/HelloWorld/aws-lambda-tools-defaults.json b/jetbrains-rider/testData/solutions/ImageLambda6X/src/HelloWorld/aws-lambda-tools-defaults.json
@@ -0,0 +1,12 @@
+{
+    "Information": [
+        "This file provides default values for the deployment wizard inside Visual Studio and the AWS Lambda commands added to the .NET Core CLI.",
+        "To learn more about the Lambda commands with the .NET Core CLI execute the following command at the command line in the project root directory.",
+        "dotnet lambda help",
+        "All the command line options for the Lambda command can be specified in this file."
+    ],
+    "profile": "",
+    "region": "",
+    "configuration": "Release",
+    "template": "template.yaml"
+}
diff --git a/jetbrains-rider/testData/solutions/ImageLambda6X/template.yaml b/jetbrains-rider/testData/solutions/ImageLambda6X/template.yaml
@@ -0,0 +1,12 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+
+Resources:
+  HelloWorldFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      PackageType: Image
+    Metadata:
+      DockerTag: dotnet6-v1
+      DockerContext: ./src/HelloWorld
+      Dockerfile: Dockerfile

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "feature",
 +  "description" : "Added support for .NET 6 runtime for creating and debugging SAM functions"
 +}