Upgrade deps and fix CloudFormation

Author: quittle

.github/workflows/npm.yml

@@ -32,7 +32,7 @@ jobs:
                   pip3 install awscli --upgrade --user
             - name: NVM Install
               run: |
-                  curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
+                  curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
                   . $HOME/.nvm/nvm.sh
                   nvm install
             - name: NPM Install

.nvmrc

@@ -1 +1 @@
-v16.13.1
+v20.11.0

cloudformation.yml

@@ -9,7 +9,7 @@ Resources:
         Type: AWS::Serverless::LayerVersion
         Properties:
             LayerName: !Ref LayerName
-            CompatibleRuntimes: [nodejs18.x]
+            CompatibleRuntimes: [nodejs20.x]
             ContentUri: dist/layer.zip
             LicenseInfo: Apache-2.0
     S3UploadCustomResourceLayerPermission:

package-lock.json

@@ -6,6 +6,10 @@ import { S3UploadConfig } from "../s3-upload-config";
 import { S3_UPLOAD_CONFIG_FILE } from "../resources";
 
 export class CreateHandler extends EventHandler {
+    protected requireValidS3UploadConfig(): boolean {
+        return true;
+    }
+
     protected async handleEvent(
         parameters: RequestParameters,
         simpleS3: SimpleS3,

src/handler/handle-create.ts

@@ -4,6 +4,10 @@ import { SimpleFs } from "../simple-fs";
 import { ResponseStatus } from "../cloudformation-types";
 
 export class DeleteHandler extends EventHandler {
+    protected requireValidS3UploadConfig(): boolean {
+        return false;
+    }
+
     protected async handleEvent(
         parameters: RequestParameters,
         simpleS3: SimpleS3,

src/handler/handle-delete.ts

@@ -6,6 +6,10 @@ import { S3UploadConfig } from "../s3-upload-config";
 import { S3_UPLOAD_CONFIG_FILE } from "../resources";
 
 export class UpdateHandler extends EventHandler {
+    protected requireValidS3UploadConfig(): boolean {
+        return true;
+    }
+
     protected async handleEvent(
         parameters: RequestParameters,
         simpleS3: SimpleS3,

src/handler/handle-update.ts

@@ -45,13 +45,15 @@ export abstract class EventHandler {
                 const s3UploadConfigString = simpleFs.readFile(S3_UPLOAD_CONFIG_FILE).toString();
                 s3UploadConfig = new S3UploadConfig(s3UploadConfigString);
             } catch (e) {
-                await callback({
-                    status: ResponseStatus.FAILED,
-                    reason: `Unable to read or parse ${S3_UPLOAD_CONFIG_FILE}: ${(
-                        e as Error
-                    ).toString()}`,
-                });
-                return;
+                if (this.requireValidS3UploadConfig()) {
+                    await callback({
+                        status: ResponseStatus.FAILED,
+                        reason: `Unable to read or parse ${S3_UPLOAD_CONFIG_FILE}: ${(
+                            e as Error
+                        ).toString()}`,
+                    });
+                    return;
+                }
             }
         }
 
@@ -68,6 +70,8 @@ export abstract class EventHandler {
         await callback(result);
     }
 
+    protected abstract requireValidS3UploadConfig(): boolean;
+
     protected abstract handleEvent(
         parameters: RequestParameters,
         simpleS3: SimpleS3,

src/handler/handler.ts

@@ -22,8 +22,8 @@ Resources:
             Layers: [!Ref S3UploadLambdaLayerArn]
             CodeUri: "!!!source-root!!!"
             Handler: s3-upload-custom-resource.handler
-            Runtime: nodejs18.x
-            Timeout: 30
+            Runtime: nodejs20.x
+            Timeout: 300
             Policies:
                 - S3CrudPolicy:
                       BucketName: !Ref BucketName

tst/example-project/bucket-cloudformation.yml

@@ -18,8 +18,8 @@ Resources:
             Layers: [!Ref S3UploadLambdaLayerArn]
             CodeUri: "!!!source-root!!!"
             Handler: s3-upload-custom-resource.handler
-            Runtime: nodejs18.x
-            Timeout: 30
+            Runtime: nodejs20.x
+            Timeout: 300
             Policies:
                 - S3CrudPolicy:
                       BucketName: !Ref RootTestBucket