feat: lambda dotnet 8 support (#14026)

* feat: lambda dotnet 8 support

* chore: update tests

* chore: one more test

* chore: lint

* chore: test pin node version

* chore: test with skip prompts for node install

* chore: move -y flag

* chore: switch to nodejs-lts with version

* chore: revert changes to build windows

* chore: remove ls of restricted dir

* chore: remove use of /Users/aluja in windows

* chore: try with /root

* chore: remove unneeded jq install

* chore: update /Users/aluja to be actual value

* chore: remove duplicate code for loading aws profile

* chore: fix test

Author: awsluja

codebuild_specs/run_e2e_tests_windows.yml

@@ -25,7 +25,6 @@ env:
 phases:
   build:
     commands:
-      - choco install -fy jq
       - git config --global core.longpaths true
       - bash ./codebuild_specs/scripts-windows/load-e2e-cache.sh
       - bash ./codebuild_specs/scripts-windows/rename-packaged-cli.sh

codebuild_specs/scripts-windows/shared-scripts-windows.sh

@@ -98,9 +98,6 @@ function _loadTestAccountCredentials {
 function _lsOut {
     ls ..
     ls ~
-    ls $HOME
-    ls $HOME/..
-    ls $HOME/../..
 }
 function _build {
     echo Windows Build
@@ -120,8 +117,8 @@ function _install_packaged_cli_win {
     echo Move to CLI Binary to already existing PATH
     # This is a Hack to make sure the Amplify CLI is in the PATH
 
-    cp $CODEBUILD_SRC_DIR/out/amplify.exe $HOME/AppData/Local/Microsoft/WindowsApps
-    ls $HOME/AppData/Local/Microsoft/WindowsApps
+    cp $CODEBUILD_SRC_DIR/out/amplify.exe C:/Users/ContainerAdministrator/AppData/Local/Microsoft/WindowsApps
+    ls C:/Users/ContainerAdministrator/AppData/Local/Microsoft/WindowsApps
 
     # reset working directory
     cd $CODEBUILD_SRC_DIR

packages/amplify-dotnet-function-runtime-provider/amplify-plugin.json

@@ -11,8 +11,8 @@
     },
     "runtimes": [
       {
-        "name": ".NET 6",
-        "value": "dotnet6"
+        "name": ".NET 8",
+        "value": "dotnet8"
       }
     ]
   }

packages/amplify-dotnet-function-runtime-provider/src/constants.ts

@@ -1,4 +1,6 @@
-export const currentSupportedVersion = '6.0';
-export const dotnet6 = 'dotnet6';
+// see https://aws.amazon.com/blogs/compute/introducing-the-net-8-runtime-for-aws-lambda
+// https://docs.aws.amazon.com/lambda/latest/dg/lambda-csharp.html
+export const currentSupportedVersion = '8.0';
+export const dotnet8 = 'dotnet8';
 export const handlerMethodName = 'LambdaHandler';
 export const executableName = 'dotnet';

packages/amplify-dotnet-function-runtime-provider/src/index.ts

@@ -1,5 +1,5 @@
 import { FunctionRuntimeContributorFactory } from '@aws-amplify/amplify-function-plugin-interface';
-import { dotnet6 } from './constants';
+import { dotnet8 } from './constants';
 import { detectDotNet } from './utils/detect';
 import { build } from './utils/build';
 import { packageAssemblies } from './utils/package';
@@ -10,14 +10,14 @@ export const functionRuntimeContributorFactory: FunctionRuntimeContributorFactor
     checkDependencies: detectDotNet,
     contribute: async (contributionRequest) => {
       switch (contributionRequest.selection) {
-        case dotnet6:
+        case dotnet8:
           return {
             runtime: {
-              name: '.NET 6',
-              value: dotnet6,
-              cloudTemplateValue: dotnet6,
+              name: '.NET 8',
+              value: dotnet8,
+              cloudTemplateValue: dotnet8,
               defaultHandler: `${contributionRequest.contributionContext.resourceName}::${contributionRequest.contributionContext.resourceName}.${contributionRequest.contributionContext.functionName}::LambdaHandler`,
-              layerExecutablePath: dotnet6,
+              layerExecutablePath: dotnet8,
             },
           };
         default:

packages/amplify-dotnet-function-runtime-provider/src/utils/detect.ts

@@ -21,7 +21,7 @@ export const detectDotNet = async (): Promise<CheckDependenciesResult> => {
   if (sdkResult.exitCode !== 0) {
     throw new Error(`${executableName} failed SDK detection, exit code was ${sdkResult.exitCode}`);
   }
-  const requiredSdkRegex = /^6\.0/m;
+  const requiredSdkRegex = /^8\.0/m;
   const sdkInstalled = installedSdks && installedSdks.match(requiredSdkRegex);
 
   const toolResult = execa.sync(executableName, ['tool', 'list', '--global']);
@@ -37,13 +37,13 @@ export const detectDotNet = async (): Promise<CheckDependenciesResult> => {
     if (installedToolList.match(/^amazon\.lambda\.tools/m)) {
       toolInstalled = true;
     }
-    const requiredTestToolVersionRegex = /^amazon\.lambda\.testtool-6\.0/m;
+    const requiredTestToolVersionRegex = /^amazon\.lambda\.testtool-8\.0/m;
     if (installedToolList.match(requiredTestToolVersionRegex)) {
       testToolInstalled = true;
     }
   }
 
-  // Verify that a dotnet 6 SDK and the dotnet Lambda tools is installed locally
+  // Verify that a dotnet 8 SDK and the dotnet Lambda tools is installed locally
   if (sdkInstalled && toolInstalled && testToolInstalled) {
     return {
       hasRequiredDependencies: true,
@@ -54,15 +54,15 @@ export const detectDotNet = async (): Promise<CheckDependenciesResult> => {
       errorMessage: 'Unable to detect required dependencies:\n',
     };
     if (!sdkInstalled) {
-      result.errorMessage += '- The .NET 6 SDK must be installed. It can be installed from https://dotnet.microsoft.com/download\n';
+      result.errorMessage += '- The .NET 8 SDK must be installed. It can be installed from https://dotnet.microsoft.com/download\n';
     }
     if (!toolInstalled) {
       result.errorMessage +=
         '- The Amazon.Lambda.Tools global tool must be installed. Please install by running "dotnet tool install -g Amazon.Lambda.Tools".\n';
     }
     if (!testToolInstalled) {
       result.errorMessage +=
-        '- The Amazon.Lambda.TestTool-6.0 global tool must be installed. Please install by running "dotnet tool install -g Amazon.Lambda.TestTool-6.0".\n';
+        '- The Amazon.Lambda.TestTool-8.0 global tool must be installed. Please install by running "dotnet tool install -g Amazon.Lambda.TestTool-8.0".\n';
     }
     return result;
   }

packages/amplify-dotnet-function-runtime-provider/src/utils/invoke.ts

@@ -14,7 +14,7 @@ export const invoke = async (request: InvocationRequest): Promise<string> => {
     tempDir = fs.mkdtempSync(path.join(request.srcRoot, 'amplify'));
     eventFile = path.join(tempDir, 'event.json');
     fs.writeFileSync(eventFile, request.event);
-    const lambdaTestTool = 'lambda-test-tool-6.0';
+    const lambdaTestTool = 'lambda-test-tool-8.0';
     const execPromise = execa(
       executableName,
       [lambdaTestTool, '--no-ui', '--function-handler', request.handler, '--payload', eventFile, '--pause-exit', 'false'],

packages/amplify-dotnet-function-runtime-provider/src/utils/package.ts

@@ -14,7 +14,7 @@ export const packageAssemblies = async (request: PackageRequest, context: any):
   }
 
   const packageHash = (await context.amplify.hashDir(distPath, [])) as string;
-  const framework = 'net6.0';
+  const framework = 'net8.0';
   try {
     const result = execa.sync(
       executableName,

packages/amplify-dotnet-function-template-provider/amplify-plugin.json

@@ -7,7 +7,7 @@
     "conditions": {
       "provider": "awscloudformation",
       "services": ["Lambda"],
-      "runtime": ["dotnet6"]
+      "runtime": ["dotnet8"]
     },
     "templates": [
       {

packages/amplify-dotnet-function-template-provider/resources/lambda/Crud/Function.csproj.ejs

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <AWSProjectType>Lambda</AWSProjectType>
   </PropertyGroup>