From b3dbc16ef082e6d2fb238dedcede86697305e224 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Thu, 28 Nov 2024 16:34:35 +0000
Subject: [PATCH] Remove dotnet-lambda package

Stop using `dotnet-lambda package` and instead just manually publish the application for AWS Lambda and ZIP it.
---
 .github/workflows/build.yml                    | 11 +++++++++++
 build.ps1                                      | 18 ++++++------------
 .../aws-lambda-tools-defaults.json             |  1 -
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 40502ddcc..9a6b7ae5e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -108,6 +108,17 @@ jobs:
       shell: pwsh
       run: ./build.ps1
 
+    - name: Create Lambda ZIP file
+      if: runner.os == 'Linux'
+      shell: bash
+      run: |
+        cd "./artifacts/publish/AdventOfCode.Site/release_linux-arm64" || exit
+        if [ -f "./bootstrap" ]
+        then
+          chmod +x ./bootstrap
+        fi
+        zip -r "../../../lambda.zip" . || exit 1
+
     - name: Publish lambda
       uses: actions/upload-artifact@v4
       if: runner.os == 'Linux' && success()
diff --git a/build.ps1 b/build.ps1
index a4689bcfc..a3a31d8cb 100755
--- a/build.ps1
+++ b/build.ps1
@@ -16,7 +16,7 @@ $solutionPath = $PSScriptRoot
 $sdkFile = Join-Path $solutionPath "global.json"
 
 $dotnetVersion = (Get-Content $sdkFile | Out-String | ConvertFrom-Json).sdk.version
-$installDotNetSdk = $false;
+$installDotNetSdk = $false
 
 if (($null -eq (Get-Command "dotnet" -ErrorAction SilentlyContinue)) -and ($null -eq (Get-Command "dotnet.exe" -ErrorAction SilentlyContinue))) {
     Write-Information "The .NET SDK is not installed."
@@ -66,7 +66,7 @@ else {
 
 $dotnet = Join-Path "$env:DOTNET_INSTALL_DIR" "dotnet"
 
-if ($installDotNetSdk -eq $true) {
+if ($installDotNetSdk) {
     $env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH"
 }
 
@@ -78,7 +78,7 @@ if ($LASTEXITCODE -ne 0) {
     throw "dotnet build failed with exit code $LASTEXITCODE"
 }
 
-if ($SkipTests -eq $false) {
+if (-Not $SkipTests) {
     Write-Information "Running tests..."
 
     $additionalArgs = @()
@@ -102,7 +102,7 @@ if ($SkipTests -eq $false) {
     }
 }
 
-if ($SkipPublish -eq $false) {
+if (-Not $SkipPublish) {
 
     Write-Information "Publishing application..."
 
@@ -115,15 +115,9 @@ if ($SkipPublish -eq $false) {
         throw "dotnet publish failed with exit code $LASTEXITCODE"
     }
 
-    $packageFile = Join-Path $PSScriptRoot "artifacts" "publish" "lambda.zip"
-
-    # Requires that `dotnet tool restore` is run first
-    dotnet tool run dotnet-lambda `
-        package `
-        --output-package $packageFile `
-        --project-location $projectPath
+    & $dotnet publish $projectFile /p:PublishForAWSLambda=true
 
     if ($LASTEXITCODE -ne 0) {
-        throw "dotnet-lambda package failed with exit code $LASTEXITCODE"
+        throw "dotnet publish for Lambda failed with exit code $LASTEXITCODE"
     }
 }
diff --git a/src/AdventOfCode.Site/aws-lambda-tools-defaults.json b/src/AdventOfCode.Site/aws-lambda-tools-defaults.json
index 373effeb9..fc247aaf8 100644
--- a/src/AdventOfCode.Site/aws-lambda-tools-defaults.json
+++ b/src/AdventOfCode.Site/aws-lambda-tools-defaults.json
@@ -10,7 +10,6 @@
   "function-name": "adventofcode",
   "function-runtime": "provided.al2023",
   "function-timeout": 30,
-  "msbuild-parameters": "/p:PublishForAWSLambda=true",
   "package-type": "Zip",
   "runtime": "linux-arm64",
   "s3-bucket": "adventofcode",