@digitraffic/common 2023.12.15-1 → 2024.1.19-1

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@digitraffic/common",
-  "version": "2023.12.15-1",
+  "version": "2024.1.19-1",
   "description": "",
+  "type": "module",
   "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,
@@ -16,72 +17,157 @@
     "dist/**/*.d.ts",
     "src/**/*.ts"
   ],
+  "exports": {
+    ".": "./dist/index.js",
+    "./dist/database/database": "./dist/database/database.js",
+    "./dist/database/cached": "./dist/database/cached.js",
+    "./dist/database/models": "./dist/database/models.js",
+    "./dist/database/last-updated": "./dist/database/last-updated.js",
+    "./dist/types/urn": "./dist/types/urn.js",
+    "./dist/types/util-types": "./dist/types/util-types.js",
+    "./dist/types/either": "./dist/types/either.js",
+    "./dist/types/validator": "./dist/types/validator.js",
+    "./dist/types/nullable": "./dist/types/nullable.js",
+    "./dist/types/aws-env": "./dist/types/aws-env.js",
+    "./dist/types/async-timeout-error": "./dist/types/async-timeout-error.js",
+    "./dist/types/input-error": "./dist/types/input-error.js",
+    "./dist/types/http-error": "./dist/types/http-error.js",
+    "./dist/types/language": "./dist/types/language.js",
+    "./dist/types/traffictype": "./dist/types/traffictype.js",
+    "./dist/test/testutils": "./dist/test/testutils.js",
+    "./dist/test/db-testutils": "./dist/test/db-testutils.js",
+    "./dist/test/httpserver": "./dist/test/httpserver.js",
+    "./dist/test/secrets-manager": "./dist/test/secrets-manager.js",
+    "./dist/test/asserter": "./dist/test/asserter.js",
+    "./dist/marine/rtz": "./dist/marine/rtz.js",
+    "./dist/marine/id_utils": "./dist/marine/id_utils.js",
+    "./dist/index": "./dist/index.js",
+    "./dist/utils/api-model": "./dist/utils/api-model.js",
+    "./dist/utils/logging": "./dist/utils/logging.js",
+    "./dist/utils/base64": "./dist/utils/base64.js",
+    "./dist/utils/date-utils": "./dist/utils/date-utils.js",
+    "./dist/utils/geojson-types": "./dist/utils/geojson-types.js",
+    "./dist/utils/slack": "./dist/utils/slack.js",
+    "./dist/utils/utils": "./dist/utils/utils.js",
+    "./dist/utils/retry": "./dist/utils/retry.js",
+    "./dist/utils/geometry": "./dist/utils/geometry.js",
+    "./dist/aws/infra/sqs-integration": "./dist/aws/infra/sqs-integration.js",
+    "./dist/aws/infra/stacks/network-stack": "./dist/aws/infra/stacks/network-stack.js",
+    "./dist/aws/infra/stacks/db-stack": "./dist/aws/infra/stacks/db-stack.js",
+    "./dist/aws/infra/stacks/db-proxy-stack": "./dist/aws/infra/stacks/db-proxy-stack.js",
+    "./dist/aws/infra/stacks/intra-stack-configuration": "./dist/aws/infra/stacks/intra-stack-configuration.js",
+    "./dist/aws/infra/stacks/db-dns-stack": "./dist/aws/infra/stacks/db-dns-stack.js",
+    "./dist/aws/infra/documentation": "./dist/aws/infra/documentation.js",
+    "./dist/aws/infra/usage-plans": "./dist/aws/infra/usage-plans.js",
+    "./dist/aws/infra/scheduler": "./dist/aws/infra/scheduler.js",
+    "./dist/aws/infra/import-util": "./dist/aws/infra/import-util.js",
+    "./dist/aws/infra/sqs-queue": "./dist/aws/infra/sqs-queue.js",
+    "./dist/aws/infra/api/response": "./dist/aws/infra/api/response.js",
+    "./dist/aws/infra/api/static-integration": "./dist/aws/infra/api/static-integration.js",
+    "./dist/aws/infra/api/responses": "./dist/aws/infra/api/responses.js",
+    "./dist/aws/infra/api/handler-factory": "./dist/aws/infra/api/handler-factory.js",
+    "./dist/aws/infra/api/integration": "./dist/aws/infra/api/integration.js",
+    "./dist/aws/infra/stack/stack-checking-aspect": "./dist/aws/infra/stack/stack-checking-aspect.js",
+    "./dist/aws/infra/stack/rest_apis": "./dist/aws/infra/stack/rest_apis.js",
+    "./dist/aws/infra/stack/lambda-configs": "./dist/aws/infra/stack/lambda-configs.js",
+    "./dist/aws/infra/stack/monitoredfunction": "./dist/aws/infra/stack/monitoredfunction.js",
+    "./dist/aws/infra/stack/subscription": "./dist/aws/infra/stack/subscription.js",
+    "./dist/aws/infra/stack/parameters": "./dist/aws/infra/stack/parameters.js",
+    "./dist/aws/infra/stack/stack": "./dist/aws/infra/stack/stack.js",
+    "./dist/aws/infra/security-rule": "./dist/aws/infra/security-rule.js",
+    "./dist/aws/infra/canaries/database-checker": "./dist/aws/infra/canaries/database-checker.js",
+    "./dist/aws/infra/canaries/canary": "./dist/aws/infra/canaries/canary.js",
+    "./dist/aws/infra/canaries/url-checker": "./dist/aws/infra/canaries/url-checker.js",
+    "./dist/aws/infra/canaries/database-canary": "./dist/aws/infra/canaries/database-canary.js",
+    "./dist/aws/infra/canaries/canary-alarm": "./dist/aws/infra/canaries/canary-alarm.js",
+    "./dist/aws/infra/canaries/canary-role": "./dist/aws/infra/canaries/canary-role.js",
+    "./dist/aws/infra/canaries/url-canary": "./dist/aws/infra/canaries/url-canary.js",
+    "./dist/aws/infra/canaries/canary-parameters": "./dist/aws/infra/canaries/canary-parameters.js",
+    "./dist/aws/infra/canaries/canary-keys": "./dist/aws/infra/canaries/canary-keys.js",
+    "./dist/aws/types/proxytypes": "./dist/aws/types/proxytypes.js",
+    "./dist/aws/types/tags": "./dist/aws/types/tags.js",
+    "./dist/aws/types/mediatypes": "./dist/aws/types/mediatypes.js",
+    "./dist/aws/types/model-with-reference": "./dist/aws/types/model-with-reference.js",
+    "./dist/aws/types/errors": "./dist/aws/types/errors.js",
+    "./dist/aws/types/lambda-response": "./dist/aws/types/lambda-response.js",
+    "./dist/aws/runtime/dt-logger-default": "./dist/aws/runtime/dt-logger-default.js",
+    "./dist/aws/runtime/secrets/secret": "./dist/aws/runtime/secrets/secret.js",
+    "./dist/aws/runtime/secrets/proxy-holder": "./dist/aws/runtime/secrets/proxy-holder.js",
+    "./dist/aws/runtime/secrets/dbsecret": "./dist/aws/runtime/secrets/dbsecret.js",
+    "./dist/aws/runtime/secrets/rds-holder": "./dist/aws/runtime/secrets/rds-holder.js",
+    "./dist/aws/runtime/secrets/secret-holder": "./dist/aws/runtime/secrets/secret-holder.js",
+    "./dist/aws/runtime/dt-logger": "./dist/aws/runtime/dt-logger.js",
+    "./dist/aws/runtime/s3": "./dist/aws/runtime/s3.js",
+    "./dist/aws/runtime/messaging": "./dist/aws/runtime/messaging.js",
+    "./dist/aws/runtime/apikey": "./dist/aws/runtime/apikey.js",
+    "./dist/aws/runtime/environment": "./dist/aws/runtime/environment.js",
+    "./dist/aws/runtime/digitraffic-integration-response": "./dist/aws/runtime/digitraffic-integration-response.js"
+  },
   "peerDependencies": {
     "@types/geojson": "^7946.0.12",
     "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",
     "pg-native": "^3.0.1",
-    "pg-promise": "^11.5.4"
+    "pg-promise": "^11.5.4",
+    "lodash": "~4.17.21"
   },
   "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",
+    "@jest/globals": "^29.7.0",
+    "@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.19.0",
+    "@types/geojson-validation": "^1.0.2",
+    "eslint": "~8.56.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-deprecation": "~2.0.0",
+    "jest": "^29.7.0",
+    "jest-junit": "^16.0.0",
+    "prettier": "^3.2.4",
+    "rimraf": "^5.0.5",
+    "sinon": "17.0.1",
+    "ts-jest": "^29.1.1",
+    "typescript": "~5.3.3",
+    "velocityjs": "2.0.6",
+    "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",
-    "eslint-plugin-deprecation": "~2.0.0",
+    "date-fns-tz": "~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",
     "lodash": "~4.17.21",
     "node-ttl": "^0.2.0",
-    "pg-native": "^3.0.1",
-    "pg-promise": "^11.5.4",
-    "prettier": "^2.8.8",
-    "rimraf": "^5.0.5",
-    "sinon": "17.0.0",
-    "ts-jest": "^29.1.1",
-    "typescript": "~4.9.5",
-    "velocityjs": "2.0.6"
+    "pg-promise": "^11.5.4"
   },
-  "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",
     "clean": "rimraf dist output",
-    "test": "jest --detectOpenHandles --forceExit --coverage --coverageDirectory=output/coverage/jest",
+    "test": "node --max-old-space-size=1536 --expose-gc ./node_modules/jest/bin/jest.js --no-cache --detectOpenHandles --forceExit --coverage --coverageDirectory=output/coverage/jest --logHeapUsage --runInBand",
+    "test:inspect": "node --inspect-brk --expose-gc ./node_modules/jest/bin/jest.js --detectOpenHandles --forceExit --coverage --coverageDirectory=output/coverage/jest --logHeapUsage --runInBand",
     "test:watch": "jest --detectOpenHandles --forceExit --coverage --coverageDirectory=output/coverage/jest --watch"
   }
 }

package/src/aws/infra/api/handler-factory.ts

@@ -1,6 +1,6 @@
-import { getEnvVariableOrElse } from "../../../utils/utils";
-import { DtLogger } from "../../runtime/dt-logger";
-import { LambdaResponse } from "../../types/lambda-response";
+import { getEnvVariableOrElse } from "../../../utils/utils.js";
+import { DtLogger } from "../../runtime/dt-logger.js";
+import { LambdaResponse } from "../../types/lambda-response.js";
 
 export type LoggingHandler = (
     method: () => Promise<LambdaResponse>,

package/src/aws/infra/api/integration.ts

@@ -4,8 +4,8 @@ import {
     PassthroughBehavior,
 } from "aws-cdk-lib/aws-apigateway";
 import { IFunction } from "aws-cdk-lib/aws-lambda";
-import { MediaType } from "../../types/mediatypes";
-import { DigitrafficIntegrationResponse } from "../../runtime/digitraffic-integration-response";
+import { MediaType } from "../../types/mediatypes.js";
+import { DigitrafficIntegrationResponse } from "../../runtime/digitraffic-integration-response.js";
 
 type ParameterType =
     | "path"

package/src/aws/infra/api/response.ts

@@ -1,13 +1,13 @@
-import { MediaType } from "../../types/mediatypes";
+import { MediaType } from "../../types/mediatypes.js";
 import {
     JsonSchema,
     JsonSchemaType,
     JsonSchemaVersion,
     MethodResponse,
     Model,
+  type IModel
 } from "aws-cdk-lib/aws-apigateway";
-import { IModel } from "aws-cdk-lib/aws-apigateway/lib/model";
-import { dateFromIsoString } from "../../../utils/date-utils";
+import { dateFromIsoString } from "../../../utils/date-utils.js";
 
 /**
  * This is velocity-script, that assumes the response to be LambdaResponse(status and body).

package/src/aws/infra/api/responses.ts

@@ -3,21 +3,21 @@ import {
     XmlResponseTemplate,
     NotFoundResponseTemplate,
     BadRequestResponseTemplate,
-} from "./response";
+} from "./response.js";
 import {
     LambdaIntegration,
     MethodResponse,
     IntegrationResponse,
     PassthroughBehavior,
+  type IModel
 } from "aws-cdk-lib/aws-apigateway";
 import { Function as AWSFunction } from "aws-cdk-lib/aws-lambda";
-import { IModel } from "aws-cdk-lib/aws-apigateway/lib/model";
 import {
     BAD_REQUEST_MESSAGE,
     ERROR_MESSAGE,
     NOT_FOUND_MESSAGE,
-} from "../../types/errors";
-import { MediaType } from "../../types/mediatypes";
+} from "../../types/errors.js";
+import { MediaType } from "../../types/mediatypes.js";
 
 /// @deprecated
 export const RESPONSE_200_OK: IntegrationResponse = {

package/src/aws/infra/api/static-integration.ts

@@ -4,8 +4,8 @@ import {
     PassthroughBehavior,
     Resource,
 } from "aws-cdk-lib/aws-apigateway";
-import { MediaType } from "../../types/mediatypes";
-import { RESPONSE_CORS_INTEGRATION } from "./responses";
+import { MediaType } from "../../types/mediatypes.js";
+import { RESPONSE_CORS_INTEGRATION } from "./responses.js";
 
 const INTEGRATION_RESPONSE_200 = `{
     "statusCode": 200

package/src/aws/infra/canaries/canary-alarm.ts

@@ -1,5 +1,5 @@
 import { Construct } from "constructs";
-import { CanaryParameters } from "./canary-parameters";
+import { CanaryParameters } from "./canary-parameters.js";
 import { Alarm, ComparisonOperator } from "aws-cdk-lib/aws-cloudwatch";
 import { Canary } from "aws-cdk-lib/aws-synthetics";
 import { SnsAction } from "aws-cdk-lib/aws-cloudwatch-actions";

package/src/aws/infra/canaries/canary.ts

@@ -7,10 +7,10 @@ import {
     Test,
 } from "aws-cdk-lib/aws-synthetics";
 import { Role } from "aws-cdk-lib/aws-iam";
-import { CanaryAlarm } from "./canary-alarm";
-import { CanaryParameters } from "./canary-parameters";
+import { CanaryAlarm } from "./canary-alarm.js";
+import { CanaryParameters } from "./canary-parameters.js";
 import { Construct } from "constructs";
-import { LambdaEnvironment } from "../stack/lambda-configs";
+import { LambdaEnvironment } from "../stack/lambda-configs.js";
 
 export class DigitrafficCanary extends Canary {
     constructor(

package/src/aws/infra/canaries/database-canary.ts

@@ -4,9 +4,9 @@ import { CfnCanary } from "aws-cdk-lib/aws-synthetics";
 import { Schedule } from "aws-cdk-lib/aws-events";
 import { Duration } from "aws-cdk-lib";
 
-import { CanaryParameters } from "./canary-parameters";
-import { DigitrafficCanary } from "./canary";
-import { DigitrafficStack } from "../stack/stack";
+import { CanaryParameters } from "./canary-parameters.js";
+import { DigitrafficCanary } from "./canary.js";
+import { DigitrafficStack } from "../stack/stack.js";
 
 export class DatabaseCanary extends DigitrafficCanary {
     constructor(

package/src/aws/infra/canaries/database-checker.ts

@@ -1,9 +1,9 @@
-import { DTDatabase, inDatabaseReadonly } from "../../../database/database";
-import { ProxyHolder } from "../../runtime/secrets/proxy-holder";
-import { RdsHolder } from "../../runtime/secrets/rds-holder";
-import { getEnvVariable } from "../../../utils/utils";
-import { Countable } from "../../../database/models";
-import { logger } from "../../runtime/dt-logger-default";
+import { DTDatabase, inDatabaseReadonly } from "../../../database/database.js";
+import { ProxyHolder } from "../../runtime/secrets/proxy-holder.js";
+import { RdsHolder } from "../../runtime/secrets/rds-holder.js";
+import { getEnvVariable } from "../../../utils/utils.js";
+import { Countable } from "../../../database/models.js";
+import { logger } from "../../runtime/dt-logger-default.js";
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires
 const synthetics = require("Synthetics");

package/src/aws/infra/canaries/url-canary.ts

@@ -1,12 +1,12 @@
 import { Role } from "aws-cdk-lib/aws-iam";
 import { ISecret } from "aws-cdk-lib/aws-secretsmanager";
 import { CfnCanary } from "aws-cdk-lib/aws-synthetics";
-import { LambdaEnvironment } from "../stack/lambda-configs";
-import { DigitrafficRestApi } from "../stack/rest_apis";
-import { DigitrafficStack } from "../stack/stack";
-import { DigitrafficCanary } from "./canary";
-import { ENV_API_KEY, ENV_HOSTNAME, ENV_SECRET } from "./canary-keys";
-import { CanaryParameters } from "./canary-parameters";
+import { LambdaEnvironment } from "../stack/lambda-configs.js";
+import { DigitrafficRestApi } from "../stack/rest_apis.js";
+import { DigitrafficStack } from "../stack/stack.js";
+import { DigitrafficCanary } from "./canary.js";
+import { ENV_API_KEY, ENV_HOSTNAME, ENV_SECRET } from "./canary-keys.js";
+import { CanaryParameters } from "./canary-parameters.js";
 
 export interface UrlCanaryParameters extends CanaryParameters {
     readonly hostname: string;

package/src/aws/infra/canaries/url-checker.ts

@@ -1,17 +1,17 @@
 import { IncomingMessage, RequestOptions } from "http";
-import { Asserter } from "../../../test/asserter";
+import { Asserter } from "../../../test/asserter.js";
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires
 const synthetics: Synthetics = require("Synthetics");
 import zlib = require("zlib");
-import { MediaType } from "../../types/mediatypes";
-import { getApiKeyFromAPIGateway } from "../../runtime/apikey";
+import { MediaType } from "../../types/mediatypes.js";
+import { getApiKeyFromAPIGateway } from "../../runtime/apikey.js";
 import { FeatureCollection } from "geojson";
-import { isValidGeoJson } from "../../../utils/geometry";
-import { getEnvVariable } from "../../../utils/utils";
-import { ENV_API_KEY, ENV_HOSTNAME } from "./canary-keys";
-import { logger } from "../../runtime/dt-logger-default";
-import { logException } from "../../../utils/logging";
+import { isValidGeoJson } from "../../../utils/geometry.js";
+import { getEnvVariable } from "../../../utils/utils.js";
+import { ENV_API_KEY, ENV_HOSTNAME } from "./canary-keys.js";
+import { logger } from "../../runtime/dt-logger-default.js";
+import { logException } from "../../../utils/logging.js";
 
 export const API_KEY_HEADER = "x-api-key";
 

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

@@ -4,10 +4,10 @@ import {
     PassthroughBehavior,
     RequestValidator,
     Resource,
+  IModel
 } from "aws-cdk-lib/aws-apigateway";
 import { Queue } from "aws-cdk-lib/aws-sqs";
 import { PolicyStatement, Role, ServicePrincipal } from "aws-cdk-lib/aws-iam";
-import { IModel } from "aws-cdk-lib/aws-apigateway/lib/model";
 import { Construct } from "constructs";
 
 export function attachQueueToApiGatewayResource(

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

@@ -5,16 +5,13 @@ 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";
+import { DigitrafficStack } from "./stack/stack.js";
+import { MonitoredFunction } from "./stack/monitoredfunction.js";
 
 /**
  * Construct for creating SQS-queues.
@@ -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

@@ -9,8 +9,8 @@ import { Duration } from "aws-cdk-lib";
 import { IVpc, SubnetSelection } from "aws-cdk-lib/aws-ec2";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { Role } from "aws-cdk-lib/aws-iam";
-import { DigitrafficStack } from "./stack";
-import { MonitoredFunctionAlarmProps } from "./monitoredfunction";
+import { DigitrafficStack } from "./stack.js";
+import { MonitoredFunctionAlarmProps } from "./monitoredfunction.js";
 
 export type LambdaEnvironment = Record<string, string>;
 
@@ -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/monitoredfunction.ts

@@ -2,15 +2,15 @@ import { Function, FunctionProps } from "aws-cdk-lib/aws-lambda";
 import { Stack } from "aws-cdk-lib";
 import { SnsAction } from "aws-cdk-lib/aws-cloudwatch-actions";
 import { ComparisonOperator, Metric } from "aws-cdk-lib/aws-cloudwatch";
-import { DigitrafficStack } from "../stack/stack";
+import { DigitrafficStack } from "./stack.js";
 import { ITopic } from "aws-cdk-lib/aws-sns";
 import {
     databaseFunctionProps,
     LambdaEnvironment,
     MonitoredFunctionParameters,
-} from "../stack/lambda-configs";
-import { DigitrafficLogSubscriptions } from "../stack/subscription";
-import { TrafficType } from "../../../types/traffictype";
+} from "./lambda-configs.js";
+import { DigitrafficLogSubscriptions } from "./subscription.js";
+import { TrafficType } from "../../../types/traffictype.js";
 
 import _ from "lodash";
 

package/src/aws/infra/stack/parameters.ts

@@ -1,5 +1,5 @@
 import { StringParameter } from "aws-cdk-lib/aws-ssm";
-import { Construct } from "constructs/lib/construct";
+import { type Construct } from "constructs";
 
 const SSM_ROOT = "/digitraffic" as const;
 const MONITORING_ROOT = "/monitoring" as const;