@digitraffic/common 2023.12.15-1 → 2024.1.10-1

package/dist/aws/infra/sqs-queue.js

@@ -10,6 +10,7 @@ const aws_logs_1 = require("aws-cdk-lib/aws-logs");
 const aws_lambda_event_sources_1 = require("aws-cdk-lib/aws-lambda-event-sources");
 const aws_cloudwatch_1 = require("aws-cdk-lib/aws-cloudwatch");
 const aws_cloudwatch_actions_1 = require("aws-cdk-lib/aws-cloudwatch-actions");
+const lib_storage_1 = require("@aws-sdk/lib-storage");
 const monitoredfunction_1 = require("./stack/monitoredfunction");
 /**
  * Construct for creating SQS-queues.
@@ -48,7 +49,7 @@ class DigitrafficDLQueue {
         });
         const dlqFunctionName = `${dlqName}-Function`;
         const lambda = monitoredfunction_1.MonitoredFunction.create(stack, dlqFunctionName, {
-            runtime: aws_lambda_1.Runtime.NODEJS_16_X,
+            runtime: aws_lambda_1.Runtime.NODEJS_20_X,
             logRetention: aws_logs_1.RetentionDays.ONE_YEAR,
             functionName: dlqFunctionName,
             code: getDlqCode(dlqBucket.bucketName),
@@ -82,37 +83,40 @@ function addDLQAlarm(stack, dlqName, dlq) {
     })
         .addAlarmAction(new aws_cloudwatch_actions_1.SnsAction(stack.warningTopic));
 }
-function getDlqCode(bName) {
-    const functionBody = DLQ_LAMBDA_CODE.replace("__bucketName__", bName)
+function getDlqCode(Bucket) {
+    const functionBody = DLQ_LAMBDA_CODE.replace("__bucketName__", Bucket)
         .replace("__upload__", uploadToS3.toString())
         .replace("__doUpload__", doUpload.toString())
         .replace("__handler__", createHandler().toString().substring(23)); // remove function handler() from signature
     return new aws_lambda_1.InlineCode(functionBody);
 }
-async function uploadToS3(s3, bName, body, objectName) {
+async function uploadToS3(s3, Bucket, Body, Key) {
     try {
-        console.info("writing %s to %s", objectName, bName);
-        await doUpload(s3, bName, body, objectName);
+        console.info("writing %s to %s", Key, Bucket);
+        await doUpload(s3, Bucket, Body, Key);
     }
     catch (error) {
         console.warn(error);
-        console.warn("method=uploadToS3 retrying upload to bucket %s", bName);
+        console.warn("method=uploadToS3 retrying upload to bucket %s", Bucket);
         try {
-            await doUpload(s3, bName, body, objectName);
+            await doUpload(s3, Bucket, Body, Key);
         }
         catch (e2) {
-            console.error("method=uploadToS3 failed retrying upload to bucket %s", bName);
+            console.error("method=uploadToS3 failed retrying upload to bucket %s", Bucket);
         }
     }
 }
-function doUpload(s3, bName, Body, Key) {
-    return s3
-        .upload({
-        Bucket: bName,
-        Body,
-        Key,
-    })
-        .promise();
+async function doUpload(s3, Bucket, Body, Key) {
+    try {
+        const upload = new lib_storage_1.Upload({
+            client: s3,
+            params: { Bucket, Key, Body },
+        });
+        await upload.done();
+    }
+    catch (error) {
+        console.error(error);
+    }
 }
 // bucketName is unused, will be overridden in the actual lambda code below
 const bucketName = "";
@@ -126,7 +130,9 @@ function createHandler() {
         new AWS.S3(), bucketName, e.body, `dlq-${millis}-${idx}.json`)));
     };
 }
-const DLQ_LAMBDA_CODE = `const AWS = require('aws-sdk');
+const DLQ_LAMBDA_CODE = `
+import { S3, S3Client } from "@aws-sdk/client-s3";
+import { Upload } from "@aws-sdk/lib-storage";
 const bucketName = "__bucketName__";
 
 __upload__

package/dist/aws/infra/stack/lambda-configs.js

@@ -22,7 +22,7 @@ function databaseFunctionProps(stack, environment, lambdaName, simpleLambdaName,
 exports.databaseFunctionProps = databaseFunctionProps;
 function lambdaFunctionProps(stack, environment, lambdaName, simpleLambdaName, config) {
     return {
-        runtime: config?.runtime ?? aws_lambda_1.Runtime.NODEJS_16_X,
+        runtime: config?.runtime ?? aws_lambda_1.Runtime.NODEJS_20_X,
         architecture: config?.architecture ?? aws_lambda_1.Architecture.ARM_64,
         memorySize: config?.memorySize ?? 128,
         functionName: lambdaName,
@@ -44,7 +44,7 @@ function getAssetCode(simpleLambdaName, isSingleLambda) {
 }
 function defaultLambdaConfiguration(config) {
     const props = {
-        runtime: aws_lambda_1.Runtime.NODEJS_16_X,
+        runtime: aws_lambda_1.Runtime.NODEJS_20_X,
         memorySize: config.memorySize ?? 128,
         functionName: config.functionName,
         handler: config.handler,

package/dist/aws/infra/stack/stack-checking-aspect.js

@@ -14,7 +14,7 @@ const aws_logs_1 = require("aws-cdk-lib/aws-logs");
 const change_case_1 = require("change-case");
 const lodash_1 = __importDefault(require("lodash"));
 const MAX_CONCURRENCY_LIMIT = 100;
-const NODE_RUNTIMES = [aws_lambda_1.Runtime.NODEJS_16_X.name, aws_lambda_1.Runtime.NODEJS_18_X.name];
+const NODE_RUNTIMES = [aws_lambda_1.Runtime.NODEJS_20_X.name, aws_lambda_1.Runtime.NODEJS_18_X.name];
 var ResourceType;
 (function (ResourceType) {
     ResourceType["stackName"] = "STACK_NAME";
@@ -67,13 +67,11 @@ class StackCheckingAspect {
     }
     checkStack(node) {
         if (node instanceof stack_1.DigitrafficStack) {
-            if ((node.stackName.includes("Test") ||
-                node.stackName.includes("Tst")) &&
+            if ((node.stackName.includes("Test") || node.stackName.includes("Tst")) &&
                 node.configuration.production) {
                 this.addAnnotation(node, ResourceType.stackName, "Production is set for Test-stack");
             }
-            if ((node.stackName.includes("Prod") ||
-                node.stackName.includes("Prd")) &&
+            if ((node.stackName.includes("Prod") || node.stackName.includes("Prd")) &&
                 !node.configuration.production) {
                 this.addAnnotation(node, ResourceType.stackName, "Production is not set for Production-stack");
             }
@@ -93,8 +91,7 @@ class StackCheckingAspect {
             if (!node.memorySize) {
                 this.addAnnotation(node, ResourceType.functionMemorySize, "Function must have memorySize");
             }
-            if (node.runtime !== undefined &&
-                !NODE_RUNTIMES.includes(node.runtime)) {
+            if (node.runtime !== undefined && !NODE_RUNTIMES.includes(node.runtime)) {
                 this.addAnnotation(node, ResourceType.functionRuntime, `Function has wrong runtime ${node.runtime}!`);
             }
             if (this.stackShortName &&
@@ -131,7 +128,7 @@ class StackCheckingAspect {
         if (path.includes("{")) {
             return this.isValidPath(path.split("{")[0]);
         }
-        return (0, change_case_1.paramCase)(path) === path;
+        return (0, change_case_1.kebabCase)(path) === path;
     }
     static isValidQueryString(name) {
         return lodash_1.default.snakeCase(name) === name;
@@ -149,8 +146,7 @@ class StackCheckingAspect {
                     const split = key.split(".");
                     const type = split[2];
                     const name = split[3];
-                    if (type === "querystring" &&
-                        !StackCheckingAspect.isValidQueryString(name)) {
+                    if (type === "querystring" && !StackCheckingAspect.isValidQueryString(name)) {
                         this.addAnnotation(node, name, "Querystring should be in snake_case");
                     }
                 });

package/dist/aws/infra/stack/stack.d.ts

@@ -8,8 +8,8 @@ import { Construct } from "constructs";
 import { TrafficType } from "../../../types/traffictype";
 import { DBLambdaEnvironment } from "./lambda-configs";
 export declare const SOLUTION_KEY = "Solution";
-export declare const SSM_KEY_WARNING_TOPIC: string;
-export declare const SSM_KEY_ALARM_TOPIC: string;
+export declare const SSM_KEY_WARNING_TOPIC = "/digitraffic/monitoring/warning-topic";
+export declare const SSM_KEY_ALARM_TOPIC = "/digitraffic/monitoring/alarm-topic";
 export interface StackConfiguration {
     readonly shortName: string;
     readonly secretId?: string;

package/dist/aws/infra/stacks/network-stack.js

@@ -21,7 +21,7 @@ class NetworkStack extends core_1.Stack {
             vpcName: configuration.vpcName,
             availabilityZones: core_1.Stack.of(this)
                 .availabilityZones.sort()
-                .slice(0, 2),
+                .slice(0, 2), // take two first azs
             enableDnsHostnames: true,
             enableDnsSupport: true,
             ipAddresses: aws_ec2_1.IpAddresses.cidr(configuration.cidr),

package/dist/aws/runtime/environment.js

@@ -6,7 +6,7 @@ var EnvKeys;
     EnvKeys["AWS_REGION"] = "AWS_REGION";
     EnvKeys["SECRET_ID"] = "SECRET_ID";
     EnvKeys["SECRET_OVERRIDE_AWS_REGION"] = "SECRET_OVERRIDE_AWS_REGION";
-})(EnvKeys = exports.EnvKeys || (exports.EnvKeys = {}));
+})(EnvKeys || (exports.EnvKeys = EnvKeys = {}));
 /**
  * @deprecated Use digitraffic/common/utils/utils#getEnvVariable
  */

package/dist/aws/runtime/secrets/dbsecret.js

@@ -7,14 +7,14 @@ var RdsProxySecretKey;
     RdsProxySecretKey["password"] = "password";
     RdsProxySecretKey["proxy_host"] = "proxy_host";
     RdsProxySecretKey["proxy_ro_host"] = "proxy_ro_host";
-})(RdsProxySecretKey = exports.RdsProxySecretKey || (exports.RdsProxySecretKey = {}));
+})(RdsProxySecretKey || (exports.RdsProxySecretKey = RdsProxySecretKey = {}));
 var RdsSecretKey;
 (function (RdsSecretKey) {
     RdsSecretKey["username"] = "username";
     RdsSecretKey["password"] = "password";
     RdsSecretKey["host"] = "host";
     RdsSecretKey["ro_host"] = "ro_host";
-})(RdsSecretKey = exports.RdsSecretKey || (exports.RdsSecretKey = {}));
+})(RdsSecretKey || (exports.RdsSecretKey = RdsSecretKey = {}));
 function checkExpectedSecretKeys(keys, secret) {
     const missingKeys = keys.filter((key) => !(key in secret));
     if (missingKeys.length) {

package/dist/aws/types/mediatypes.js

@@ -13,5 +13,5 @@ var MediaType;
     MediaType["TEXT_HTML"] = "text/html";
     MediaType["TEXT_CSV"] = "text/csv";
     MediaType["APPLICATION_JSON_UTF8"] = "application/json;charset=UTF-8";
-})(MediaType = exports.MediaType || (exports.MediaType = {}));
+})(MediaType || (exports.MediaType = MediaType = {}));
 //# sourceMappingURL=mediatypes.js.map

package/dist/database/cached.js

@@ -17,7 +17,7 @@ var JSON_CACHE_KEY;
 (function (JSON_CACHE_KEY) {
     JSON_CACHE_KEY["NAUTICAL_WARNINGS_ACTIVE"] = "nautical-warnings-active";
     JSON_CACHE_KEY["NAUTICAL_WARNINGS_ARCHIVED"] = "nautical-warnings-archived";
-})(JSON_CACHE_KEY = exports.JSON_CACHE_KEY || (exports.JSON_CACHE_KEY = {}));
+})(JSON_CACHE_KEY || (exports.JSON_CACHE_KEY = JSON_CACHE_KEY = {}));
 /**
  *
  * @param db

package/dist/database/database.js

@@ -11,7 +11,7 @@ var DatabaseEnvironmentKeys;
     DatabaseEnvironmentKeys["DB_URI"] = "DB_URI";
     DatabaseEnvironmentKeys["DB_RO_URI"] = "DB_RO_URI";
     DatabaseEnvironmentKeys["DB_APPLICATION"] = "DB_APPLICATION";
-})(DatabaseEnvironmentKeys = exports.DatabaseEnvironmentKeys || (exports.DatabaseEnvironmentKeys = {}));
+})(DatabaseEnvironmentKeys || (exports.DatabaseEnvironmentKeys = DatabaseEnvironmentKeys = {}));
 // eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
 const pgp = require("pg-promise")();
 // convert numeric types to number instead of string

package/dist/database/last-updated.js

@@ -10,7 +10,7 @@ var DataType;
     DataType["MAINTENANCE_TRACKING_DATA_CHECKED"] = "MAINTENANCE_TRACKING_DATA_CHECKED";
     DataType["PERMIT_DATA"] = "PERMIT_DATA";
     DataType["PERMIT_DATA_CHECK"] = "PERMIT_DATA_CHECK";
-})(DataType = exports.DataType || (exports.DataType = {}));
+})(DataType || (exports.DataType = DataType = {}));
 const UNSET_SUBTYPE = "-";
 function getLastUpdated(db, datatype) {
     return db.oneOrNone("select updated from data_updated where data_type=$(datatype) and subtype=$(subtype)", {

package/dist/test/httpserver.d.ts

@@ -11,7 +11,7 @@ export declare class TestHttpServer {
     getCallCount(): number;
     getRequestBody(callNumber: number): string;
     listen(port: number, props: ListenProperties, debug?: boolean, statusCode?: number): void;
-    close(): void;
+    close(): Promise<boolean>;
     private debuglog;
 }
 export type ListenProperties = Record<string, (url?: string, data?: string) => string>;

package/dist/test/httpserver.js

@@ -65,10 +65,15 @@ class TestHttpServer {
         this.server.listen(port);
     }
     close() {
-        this.debuglog("Closing test server");
-        if (this.server !== undefined) {
-            this.server.close();
-        }
+        return new Promise((resolve, reject) => {
+            this.debuglog("Closing test server");
+            if (this.server !== undefined) {
+                this.server.close((error) => error != null ? reject(false) : resolve(true));
+            }
+            else {
+                resolve(true);
+            }
+        });
     }
     debuglog(str) {
         if (this.debug) {

package/dist/types/language.js

@@ -6,5 +6,5 @@ var Language;
     Language["FI"] = "fi";
     Language["EN"] = "en";
     Language["SV"] = "sv";
-})(Language = exports.Language || (exports.Language = {}));
+})(Language || (exports.Language = Language = {}));
 //# sourceMappingURL=language.js.map

package/dist/types/traffictype.js

@@ -9,5 +9,5 @@ var TrafficType;
     TrafficType["AVIATION"] = "Aviation";
     TrafficType["MCP"] = "MCP";
     TrafficType["OTHER"] = "Other";
-})(TrafficType = exports.TrafficType || (exports.TrafficType = {}));
+})(TrafficType || (exports.TrafficType = TrafficType = {}));
 //# sourceMappingURL=traffictype.js.map

package/dist/utils/retry.js

@@ -9,7 +9,7 @@ var RetryLogError;
     RetryLogError[RetryLogError["LOG_ALL_AS_ERRORS"] = 0] = "LOG_ALL_AS_ERRORS";
     RetryLogError[RetryLogError["LOG_LAST_RETRY_AS_ERROR_OTHERS_AS_WARNS"] = 1] = "LOG_LAST_RETRY_AS_ERROR_OTHERS_AS_WARNS";
     RetryLogError[RetryLogError["NO_LOGGING"] = 2] = "NO_LOGGING";
-})(RetryLogError = exports.RetryLogError || (exports.RetryLogError = {}));
+})(RetryLogError || (exports.RetryLogError = RetryLogError = {}));
 /**
  * Utility timeout functions for "retry" function.
  */

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@digitraffic/common",
-  "version": "2023.12.15-1",
+  "version": "2024.1.10-1",
   "description": "",
   "repository": {
     "type": "git",
     "url": "https://github.com/tmfg/digitraffic-common.git"
   },
   "engines": {
-    "node": ">=14 <17 || >=18 <19"
+    "node": ">=20 <21"
   },
   "license": "EUPL-1.2",
   "private": false,
@@ -21,10 +21,10 @@
     "aws-cdk-lib": "^2.103.0",
     "aws-sdk": "^2.1481.0",
     "axios": "^1.6.2",
-    "change-case": "4.1.2",
+    "change-case": "5.0.0",
     "constructs": "^10.3.0",
-    "date-fns-tz": "~2.0.0",
     "date-fns": "~2.30.0",
+    "date-fns-tz": "~2.0.0",
     "etag": "^1.8.1",
     "geojson-validation": "^1.0.2",
     "node-ttl": "^0.2.0",
@@ -32,51 +32,48 @@
     "pg-promise": "^11.5.4"
   },
   "devDependencies": {
-    "@types/aws-lambda": "8.10.125",
-    "@types/geojson": "7946.0.12",
-    "@types/etag": "1.8.2",
-    "@types/jest": "29.5.6",
-    "@types/lodash": "4.14.200",
-    "@types/node": "20.8.9",
-    "@types/sinon": "10.0.20",
-    "@typescript-eslint/eslint-plugin": "~6.9.0",
-    "@typescript-eslint/parser": "^6.9.0",
-    "aws-cdk-lib": "~2.103.1",
-    "aws-sdk": "~2.1482.0",
-    "axios": "^1.6.0",
-    "change-case": "4.1.2",
+    "@types/aws-lambda": "8.10.131",
+    "@types/etag": "1.8.3",
+    "@types/geojson": "7946.0.13",
+    "@types/jest": "29.5.11",
+    "@types/lodash": "4.14.202",
+    "@types/node": "20.10.7",
+    "@types/sinon": "17.0.2",
+    "@typescript-eslint/eslint-plugin": "~6.18.1",
+    "@typescript-eslint/parser": "^6.18.1",
+    "aws-cdk-lib": "~2.118.0",
+    "aws-sdk": "~2.1531.0",
+    "axios": "^1.6.5",
+    "change-case": "5.3.0",
     "constructs": "10.3.0",
-    "date-fns-tz": "~2.0.0",
     "date-fns": "~2.30.0",
-    "eslint": "~8.52.0",
-    "eslint-config-prettier": "^9.0.0",
+    "date-fns-tz": "~2.0.0",
+    "eslint": "~8.56.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-deprecation": "~2.0.0",
     "etag": "^1.8.1",
     "geojson-validation": "^1.0.2",
-    "husky": "^8.0.3",
     "jest": "^29.7.0",
     "jest-junit": "^16.0.0",
-    "lint-staged": "^15.0.2",
+    "lint-staged": "^15.2.0",
     "lodash": "~4.17.21",
     "node-ttl": "^0.2.0",
     "pg-native": "^3.0.1",
     "pg-promise": "^11.5.4",
-    "prettier": "^2.8.8",
+    "prettier": "^3.1.1",
     "rimraf": "^5.0.5",
-    "sinon": "17.0.0",
+    "sinon": "17.0.1",
     "ts-jest": "^29.1.1",
-    "typescript": "~4.9.5",
+    "typescript": "~5.3.3",
     "velocityjs": "2.0.6"
   },
-  "externals": [
-    "aws-sdk",
-    "Synthetics"
-  ],
-  "lint-staged": {
-    "*.{js,ts,css,md,yml,yaml,json}": "prettier --write"
+  "dependencies": {
+    "@aws-sdk/client-s3": "~3.472.0",
+    "@aws-sdk/lib-storage": "~3.472.0"
   },
   "scripts": {
     "build": "tsc",
+    "build:watch": "tsc --watch",
     "lint": "eslint --cache .",
     "eslint-report": "eslint . --format html",
     "ci:eslint-report": "eslint . --format html -o report.html || true",

package/src/aws/infra/sqs-queue.ts

@@ -5,13 +5,10 @@ import { PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { InlineCode, Runtime } from "aws-cdk-lib/aws-lambda";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
-import {
-    ComparisonOperator,
-    TreatMissingData,
-} from "aws-cdk-lib/aws-cloudwatch";
+import { ComparisonOperator, TreatMissingData } from "aws-cdk-lib/aws-cloudwatch";
 import { SnsAction } from "aws-cdk-lib/aws-cloudwatch-actions";
-import { ManagedUpload } from "aws-sdk/clients/s3";
-import { S3 } from "aws-sdk";
+import { S3, S3Client } from "@aws-sdk/client-s3";
+import { Upload } from "@aws-sdk/lib-storage";
 import { SQSEvent, SQSHandler, SQSRecord } from "aws-lambda";
 import { DigitrafficStack } from "./stack/stack";
 import { MonitoredFunction } from "./stack/monitoredfunction";
@@ -23,11 +20,7 @@ import { MonitoredFunction } from "./stack/monitoredfunction";
  * and an alarm for the queue.  Anything that goes to the dlq will be written into the bucket and the alarm is activated.
  */
 export class DigitrafficSqsQueue extends Queue {
-    static create(
-        stack: DigitrafficStack,
-        name: string,
-        props: QueueProps
-    ): DigitrafficSqsQueue {
+    static create(stack: DigitrafficStack, name: string, props: QueueProps): DigitrafficSqsQueue {
         const queueName = `${stack.configuration.shortName}-${name}-Queue`;
         const queueProps = {
             ...props,
@@ -61,7 +54,7 @@ export class DigitrafficDLQueue {
 
         const dlqFunctionName = `${dlqName}-Function`;
         const lambda = MonitoredFunction.create(stack, dlqFunctionName, {
-            runtime: Runtime.NODEJS_16_X,
+            runtime: Runtime.NODEJS_20_X,
             logRetention: RetentionDays.ONE_YEAR,
             functionName: dlqFunctionName,
             code: getDlqCode(dlqBucket.bucketName),
@@ -100,8 +93,8 @@ function addDLQAlarm(stack: DigitrafficStack, dlqName: string, dlq: Queue) {
         .addAlarmAction(new SnsAction(stack.warningTopic));
 }
 
-function getDlqCode(bName: string): InlineCode {
-    const functionBody = DLQ_LAMBDA_CODE.replace("__bucketName__", bName)
+function getDlqCode(Bucket: string): InlineCode {
+    const functionBody = DLQ_LAMBDA_CODE.replace("__bucketName__", Bucket)
         .replace("__upload__", uploadToS3.toString())
         .replace("__doUpload__", doUpload.toString())
         .replace("__handler__", createHandler().toString().substring(23)); // remove function handler() from signature
@@ -109,42 +102,32 @@ function getDlqCode(bName: string): InlineCode {
     return new InlineCode(functionBody);
 }
 
-async function uploadToS3(
-    s3: S3,
-    bName: string,
-    body: string,
-    objectName: string
-): Promise<void> {
+async function uploadToS3(s3: S3 | S3Client, Bucket: string, Body: string, Key: string): Promise<void> {
     try {
-        console.info("writing %s to %s", objectName, bName);
-        await doUpload(s3, bName, body, objectName);
+        console.info("writing %s to %s", Key, Bucket);
+        await doUpload(s3, Bucket, Body, Key);
     } catch (error) {
         console.warn(error);
-        console.warn("method=uploadToS3 retrying upload to bucket %s", bName);
+        console.warn("method=uploadToS3 retrying upload to bucket %s", Bucket);
         try {
-            await doUpload(s3, bName, body, objectName);
+            await doUpload(s3, Bucket, Body, Key);
         } catch (e2) {
-            console.error(
-                "method=uploadToS3 failed retrying upload to bucket %s",
-                bName
-            );
+            console.error("method=uploadToS3 failed retrying upload to bucket %s", Bucket);
         }
     }
 }
 
-function doUpload(
-    s3: S3,
-    bName: string,
-    Body: string,
-    Key: string
-): Promise<ManagedUpload.SendData> {
-    return s3
-        .upload({
-            Bucket: bName,
-            Body,
-            Key,
-        })
-        .promise();
+async function doUpload(s3: S3 | S3Client, Bucket: string, Body: string, Key: string) {
+    try {
+        const upload = new Upload({
+            client: s3,
+            params: { Bucket, Key, Body },
+        });
+
+        await upload.done();
+    } catch (error) {
+        console.error(error);
+    }
 }
 
 // bucketName is unused, will be overridden in the actual lambda code below
@@ -170,7 +153,9 @@ function createHandler(): SQSHandler {
     };
 }
 
-const DLQ_LAMBDA_CODE = `const AWS = require('aws-sdk');
+const DLQ_LAMBDA_CODE = `
+import { S3, S3Client } from "@aws-sdk/client-s3";
+import { Upload } from "@aws-sdk/lib-storage";
 const bucketName = "__bucketName__";
 
 __upload__

package/src/aws/infra/stack/lambda-configs.ts

@@ -24,7 +24,7 @@ export function databaseFunctionProps(
     environment: LambdaEnvironment,
     lambdaName: string,
     simpleLambdaName: string,
-    config?: Partial<FunctionParameters>
+    config?: Partial<FunctionParameters>,
 ): FunctionProps {
     const vpcSubnets = stack.vpc
         ? {
@@ -38,7 +38,7 @@ export function databaseFunctionProps(
             environment,
             lambdaName,
             simpleLambdaName,
-            config
+            config,
         ),
         ...{
             vpc: stack.vpc ?? undefined,
@@ -53,10 +53,10 @@ export function lambdaFunctionProps(
     environment: LambdaEnvironment,
     lambdaName: string,
     simpleLambdaName: string,
-    config?: Partial<FunctionParameters>
+    config?: Partial<FunctionParameters>,
 ): FunctionProps {
     return {
-        runtime: config?.runtime ?? Runtime.NODEJS_16_X,
+        runtime: config?.runtime ?? Runtime.NODEJS_20_X,
         architecture: config?.architecture ?? Architecture.ARM_64,
         memorySize: config?.memorySize ?? 128,
         functionName: lambdaName,
@@ -72,7 +72,7 @@ export function lambdaFunctionProps(
 
 function getAssetCode(
     simpleLambdaName: string,
-    isSingleLambda: boolean
+    isSingleLambda: boolean,
 ): AssetCode {
     const lambdaPath = isSingleLambda
         ? `dist/lambda/`
@@ -82,10 +82,10 @@ function getAssetCode(
 }
 
 export function defaultLambdaConfiguration(
-    config: FunctionParameters
+    config: FunctionParameters,
 ): FunctionProps {
     const props: FunctionProps = {
-        runtime: Runtime.NODEJS_16_X,
+        runtime: Runtime.NODEJS_20_X,
         memorySize: config.memorySize ?? 128,
         functionName: config.functionName,
         handler: config.handler,

package/src/aws/infra/stack/stack-checking-aspect.ts

@@ -6,12 +6,12 @@ import { IConstruct } from "constructs";
 import { CfnMethod, CfnResource } from "aws-cdk-lib/aws-apigateway";
 import { CfnQueue } from "aws-cdk-lib/aws-sqs";
 import { LogRetention } from "aws-cdk-lib/aws-logs";
-import { paramCase } from "change-case";
+import { kebabCase } from "change-case";
 import _ from "lodash";
 import IntegrationProperty = CfnMethod.IntegrationProperty;
 
 const MAX_CONCURRENCY_LIMIT = 100;
-const NODE_RUNTIMES = [Runtime.NODEJS_16_X.name, Runtime.NODEJS_18_X.name];
+const NODE_RUNTIMES = [Runtime.NODEJS_20_X.name, Runtime.NODEJS_18_X.name];
 
 enum ResourceType {
     stackName = "STACK_NAME",
@@ -61,12 +61,7 @@ export class StackCheckingAspect implements IAspect {
         });
     }
 
-    private addAnnotation(
-        node: IConstruct,
-        key: ResourceType | string,
-        message: string,
-        isError = true
-    ) {
+    private addAnnotation(node: IConstruct, key: ResourceType | string, message: string, isError = true) {
         const resourceKey = `${node.node.path}/${key}`;
         const isWhiteListed = this.isWhitelisted(resourceKey);
         const annotationMessage = `${resourceKey}:${message}`;
@@ -83,20 +78,14 @@ export class StackCheckingAspect implements IAspect {
     private checkStack(node: IConstruct) {
         if (node instanceof DigitrafficStack) {
             if (
-                (node.stackName.includes("Test") ||
-                    node.stackName.includes("Tst")) &&
+                (node.stackName.includes("Test") || node.stackName.includes("Tst")) &&
                 node.configuration.production
             ) {
-                this.addAnnotation(
-                    node,
-                    ResourceType.stackName,
-                    "Production is set for Test-stack"
-                );
+                this.addAnnotation(node, ResourceType.stackName, "Production is set for Test-stack");
             }
 
             if (
-                (node.stackName.includes("Prod") ||
-                    node.stackName.includes("Prd")) &&
+                (node.stackName.includes("Prod") || node.stackName.includes("Prd")) &&
                 !node.configuration.production
             ) {
                 this.addAnnotation(
@@ -116,9 +105,7 @@ export class StackCheckingAspect implements IAspect {
                     ResourceType.reservedConcurrentConcurrency,
                     "Function must have reservedConcurrentConcurrency"
                 );
-            } else if (
-                node.reservedConcurrentExecutions > MAX_CONCURRENCY_LIMIT
-            ) {
+            } else if (node.reservedConcurrentExecutions > MAX_CONCURRENCY_LIMIT) {
                 this.addAnnotation(
                     node,
                     ResourceType.reservedConcurrentConcurrency,
@@ -127,25 +114,14 @@ export class StackCheckingAspect implements IAspect {
             }
 
             if (!node.timeout) {
-                this.addAnnotation(
-                    node,
-                    ResourceType.functionTimeout,
-                    "Function must have timeout"
-                );
+                this.addAnnotation(node, ResourceType.functionTimeout, "Function must have timeout");
             }
 
             if (!node.memorySize) {
-                this.addAnnotation(
-                    node,
-                    ResourceType.functionMemorySize,
-                    "Function must have memorySize"
-                );
+                this.addAnnotation(node, ResourceType.functionMemorySize, "Function must have memorySize");
             }
 
-            if (
-                node.runtime !== undefined &&
-                !NODE_RUNTIMES.includes(node.runtime)
-            ) {
+            if (node.runtime !== undefined && !NODE_RUNTIMES.includes(node.runtime)) {
                 this.addAnnotation(
                     node,
                     ResourceType.functionRuntime,
@@ -170,11 +146,7 @@ export class StackCheckingAspect implements IAspect {
     private checkTags(node: IConstruct) {
         if (node instanceof Stack) {
             if (!node.tags.tagValues()[SOLUTION_KEY]) {
-                this.addAnnotation(
-                    node,
-                    ResourceType.tagSolution,
-                    "Solution tag is missing"
-                );
+                this.addAnnotation(node, ResourceType.tagSolution, "Solution tag is missing");
             }
         }
     }
@@ -192,11 +164,7 @@ export class StackCheckingAspect implements IAspect {
                     !c.ignorePublicAcls ||
                     !c.restrictPublicBuckets)
             ) {
-                this.addAnnotation(
-                    node,
-                    ResourceType.bucketPublicity,
-                    "Check bucket publicity"
-                );
+                this.addAnnotation(node, ResourceType.bucketPublicity, "Check bucket publicity");
             }
         }
     }
@@ -211,7 +179,7 @@ export class StackCheckingAspect implements IAspect {
             return this.isValidPath(path.split("{")[0]);
         }
 
-        return paramCase(path) === path;
+        return kebabCase(path) === path;
     }
 
     private static isValidQueryString(name: string) {
@@ -221,16 +189,10 @@ export class StackCheckingAspect implements IAspect {
     private checkResourceCasing(node: IConstruct) {
         if (node instanceof CfnResource) {
             if (!StackCheckingAspect.isValidPath(node.pathPart)) {
-                this.addAnnotation(
-                    node,
-                    ResourceType.resourcePath,
-                    "Path part should be in kebab-case"
-                );
+                this.addAnnotation(node, ResourceType.resourcePath, "Path part should be in kebab-case");
             }
         } else if (node instanceof CfnMethod) {
-            const integration = node.integration as
-                | IntegrationProperty
-                | undefined;
+            const integration = node.integration as IntegrationProperty | undefined;
 
             if (integration?.requestParameters) {
                 Object.keys(integration.requestParameters).forEach((key) => {
@@ -238,15 +200,8 @@ export class StackCheckingAspect implements IAspect {
                     const type = split[2];
                     const name = split[3];
 
-                    if (
-                        type === "querystring" &&
-                        !StackCheckingAspect.isValidQueryString(name)
-                    ) {
-                        this.addAnnotation(
-                            node,
-                            name,
-                            "Querystring should be in snake_case"
-                        );
+                    if (type === "querystring" && !StackCheckingAspect.isValidQueryString(name)) {
+                        this.addAnnotation(node, name, "Querystring should be in snake_case");
                     }
                 });
             }
@@ -256,21 +211,14 @@ export class StackCheckingAspect implements IAspect {
     private checkQueueEncryption(node: IConstruct) {
         if (node instanceof CfnQueue) {
             if (!node.kmsMasterKeyId) {
-                this.addAnnotation(
-                    node,
-                    ResourceType.queueEncryption,
-                    "Queue must have encryption enabled"
-                );
+                this.addAnnotation(node, ResourceType.queueEncryption, "Queue must have encryption enabled");
             }
         }
     }
 
     private checkLogGroupRetention(node: IConstruct) {
         if (node instanceof LogRetention) {
-            const child = node.node.defaultChild as unknown as Record<
-                string,
-                Record<string, string>
-            >;
+            const child = node.node.defaultChild as unknown as Record<string, Record<string, string>>;
             const retention = child._cfnProperties.RetentionInDays;
 
             if (!retention) {

package/src/test/httpserver.ts

@@ -30,7 +30,7 @@ export class TestHttpServer {
         port: number,
         props: ListenProperties,
         debug = false,
-        statusCode = 200
+        statusCode = 200,
     ) {
         this.debug = debug;
         this.messageStack = [];
@@ -62,7 +62,7 @@ export class TestHttpServer {
                 res.setHeader("Access-Control-Allow-Origin", "*");
                 res.setHeader(
                     "Access-Control-Allow-Headers",
-                    "Authorization,X-User-Id,X-Auth-Token"
+                    "Authorization,X-User-Id,X-Auth-Token",
                 );
                 res.writeHead(statusCode);
 
@@ -85,11 +85,17 @@ export class TestHttpServer {
         this.server.listen(port);
     }
 
-    close() {
-        this.debuglog("Closing test server");
-        if (this.server !== undefined) {
-            this.server.close();
-        }
+    close(): Promise<boolean> {
+        return new Promise((resolve, reject) => {
+            this.debuglog("Closing test server");
+            if (this.server !== undefined) {
+                this.server.close((error) =>
+                    error != null ? reject(false) : resolve(true),
+                );
+            } else {
+                resolve(true);
+            }
+        });
     }
 
     private debuglog(str: string) {