@digitraffic/common 2024.1.10-1 → 2024.1.23-1

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@digitraffic/common",
-  "version": "2024.1.10-1",
+  "version": "2024.1.23-1",
   "description": "",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/tmfg/digitraffic-common.git"
@@ -12,10 +13,96 @@
   "license": "EUPL-1.2",
   "private": false,
   "files": [
-    "dist/**/*.js",
-    "dist/**/*.d.ts",
-    "src/**/*.ts"
+    "dist/**/*.mjs",
+    "dist/**/*.d.mts",
+    "src/**/*.mts"
   ],
+  "exports": {
+    ".": "./dist/index.mjs",
+    "./dist/database/database": "./dist/database/database.mjs",
+    "./dist/database/cached": "./dist/database/cached.mjs",
+    "./dist/database/models": "./dist/database/models.mjs",
+    "./dist/database/last-updated": "./dist/database/last-updated.mjs",
+    "./dist/types/urn": "./dist/types/urn.mjs",
+    "./dist/types/util-types": "./dist/types/util-types.mjs",
+    "./dist/types/either": "./dist/types/either.mjs",
+    "./dist/types/validator": "./dist/types/validator.mjs",
+    "./dist/types/nullable": "./dist/types/nullable.mjs",
+    "./dist/types/aws-env": "./dist/types/aws-env.mjs",
+    "./dist/types/async-timeout-error": "./dist/types/async-timeout-error.mjs",
+    "./dist/types/input-error": "./dist/types/input-error.mjs",
+    "./dist/types/http-error": "./dist/types/http-error.mjs",
+    "./dist/types/language": "./dist/types/language.mjs",
+    "./dist/types/traffictype": "./dist/types/traffictype.mjs",
+    "./dist/test/testutils": "./dist/test/testutils.mjs",
+    "./dist/test/db-testutils": "./dist/test/db-testutils.mjs",
+    "./dist/test/httpserver": "./dist/test/httpserver.mjs",
+    "./dist/test/secrets-manager": "./dist/test/secrets-manager.mjs",
+    "./dist/test/asserter": "./dist/test/asserter.mjs",
+    "./dist/marine/rtz": "./dist/marine/rtz.mjs",
+    "./dist/marine/id_utils": "./dist/marine/id_utils.mjs",
+    "./dist/index": "./dist/index.mjs",
+    "./dist/utils/api-model": "./dist/utils/api-model.mjs",
+    "./dist/utils/logging": "./dist/utils/logging.mjs",
+    "./dist/utils/base64": "./dist/utils/base64.mjs",
+    "./dist/utils/date-utils": "./dist/utils/date-utils.mjs",
+    "./dist/utils/geojson-types": "./dist/utils/geojson-types.mjs",
+    "./dist/utils/slack": "./dist/utils/slack.mjs",
+    "./dist/utils/utils": "./dist/utils/utils.mjs",
+    "./dist/utils/retry": "./dist/utils/retry.mjs",
+    "./dist/utils/geometry": "./dist/utils/geometry.mjs",
+    "./dist/aws/infra/sqs-integration": "./dist/aws/infra/sqs-integration.mjs",
+    "./dist/aws/infra/stacks/network-stack": "./dist/aws/infra/stacks/network-stack.mjs",
+    "./dist/aws/infra/stacks/db-stack": "./dist/aws/infra/stacks/db-stack.mjs",
+    "./dist/aws/infra/stacks/db-proxy-stack": "./dist/aws/infra/stacks/db-proxy-stack.mjs",
+    "./dist/aws/infra/stacks/intra-stack-configuration": "./dist/aws/infra/stacks/intra-stack-configuration.mjs",
+    "./dist/aws/infra/stacks/db-dns-stack": "./dist/aws/infra/stacks/db-dns-stack.mjs",
+    "./dist/aws/infra/documentation": "./dist/aws/infra/documentation.mjs",
+    "./dist/aws/infra/usage-plans": "./dist/aws/infra/usage-plans.mjs",
+    "./dist/aws/infra/scheduler": "./dist/aws/infra/scheduler.mjs",
+    "./dist/aws/infra/import-util": "./dist/aws/infra/import-util.mjs",
+    "./dist/aws/infra/sqs-queue": "./dist/aws/infra/sqs-queue.mjs",
+    "./dist/aws/infra/api/response": "./dist/aws/infra/api/response.mjs",
+    "./dist/aws/infra/api/static-integration": "./dist/aws/infra/api/static-integration.mjs",
+    "./dist/aws/infra/api/responses": "./dist/aws/infra/api/responses.mjs",
+    "./dist/aws/infra/api/handler-factory": "./dist/aws/infra/api/handler-factory.mjs",
+    "./dist/aws/infra/api/integration": "./dist/aws/infra/api/integration.mjs",
+    "./dist/aws/infra/stack/stack-checking-aspect": "./dist/aws/infra/stack/stack-checking-aspect.mjs",
+    "./dist/aws/infra/stack/rest_apis": "./dist/aws/infra/stack/rest_apis.mjs",
+    "./dist/aws/infra/stack/lambda-configs": "./dist/aws/infra/stack/lambda-configs.mjs",
+    "./dist/aws/infra/stack/monitoredfunction": "./dist/aws/infra/stack/monitoredfunction.mjs",
+    "./dist/aws/infra/stack/subscription": "./dist/aws/infra/stack/subscription.mjs",
+    "./dist/aws/infra/stack/parameters": "./dist/aws/infra/stack/parameters.mjs",
+    "./dist/aws/infra/stack/stack": "./dist/aws/infra/stack/stack.mjs",
+    "./dist/aws/infra/security-rule": "./dist/aws/infra/security-rule.mjs",
+    "./dist/aws/infra/canaries/database-checker": "./dist/aws/infra/canaries/database-checker.mjs",
+    "./dist/aws/infra/canaries/canary": "./dist/aws/infra/canaries/canary.mjs",
+    "./dist/aws/infra/canaries/url-checker": "./dist/aws/infra/canaries/url-checker.mjs",
+    "./dist/aws/infra/canaries/database-canary": "./dist/aws/infra/canaries/database-canary.mjs",
+    "./dist/aws/infra/canaries/canary-alarm": "./dist/aws/infra/canaries/canary-alarm.mjs",
+    "./dist/aws/infra/canaries/canary-role": "./dist/aws/infra/canaries/canary-role.mjs",
+    "./dist/aws/infra/canaries/url-canary": "./dist/aws/infra/canaries/url-canary.mjs",
+    "./dist/aws/infra/canaries/canary-parameters": "./dist/aws/infra/canaries/canary-parameters.mjs",
+    "./dist/aws/infra/canaries/canary-keys": "./dist/aws/infra/canaries/canary-keys.mjs",
+    "./dist/aws/types/proxytypes": "./dist/aws/types/proxytypes.mjs",
+    "./dist/aws/types/tags": "./dist/aws/types/tags.mjs",
+    "./dist/aws/types/mediatypes": "./dist/aws/types/mediatypes.mjs",
+    "./dist/aws/types/model-with-reference": "./dist/aws/types/model-with-reference.mjs",
+    "./dist/aws/types/errors": "./dist/aws/types/errors.mjs",
+    "./dist/aws/types/lambda-response": "./dist/aws/types/lambda-response.mjs",
+    "./dist/aws/runtime/dt-logger-default": "./dist/aws/runtime/dt-logger-default.mjs",
+    "./dist/aws/runtime/secrets/secret": "./dist/aws/runtime/secrets/secret.mjs",
+    "./dist/aws/runtime/secrets/proxy-holder": "./dist/aws/runtime/secrets/proxy-holder.mjs",
+    "./dist/aws/runtime/secrets/dbsecret": "./dist/aws/runtime/secrets/dbsecret.mjs",
+    "./dist/aws/runtime/secrets/rds-holder": "./dist/aws/runtime/secrets/rds-holder.mjs",
+    "./dist/aws/runtime/secrets/secret-holder": "./dist/aws/runtime/secrets/secret-holder.mjs",
+    "./dist/aws/runtime/dt-logger": "./dist/aws/runtime/dt-logger.mjs",
+    "./dist/aws/runtime/s3": "./dist/aws/runtime/s3.mjs",
+    "./dist/aws/runtime/messaging": "./dist/aws/runtime/messaging.mjs",
+    "./dist/aws/runtime/apikey": "./dist/aws/runtime/apikey.mjs",
+    "./dist/aws/runtime/environment": "./dist/aws/runtime/environment.mjs",
+    "./dist/aws/runtime/digitraffic-integration-response": "./dist/aws/runtime/digitraffic-integration-response.mjs"
+  },
   "peerDependencies": {
     "@types/geojson": "^7946.0.12",
     "aws-cdk-lib": "^2.103.0",
@@ -27,20 +114,23 @@
     "date-fns-tz": "~2.0.0",
     "etag": "^1.8.1",
     "geojson-validation": "^1.0.2",
+    "lodash": "~4.17.21",
     "node-ttl": "^0.2.0",
     "pg-native": "^3.0.1",
     "pg-promise": "^11.5.4"
   },
   "devDependencies": {
+    "@jest/globals": "^29.7.0",
     "@types/aws-lambda": "8.10.131",
     "@types/etag": "1.8.3",
     "@types/geojson": "7946.0.13",
+    "@types/geojson-validation": "^1.0.2",
     "@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",
+    "@typescript-eslint/parser": "^6.19.1",
     "aws-cdk-lib": "~2.118.0",
     "aws-sdk": "~2.1531.0",
     "axios": "^1.6.5",
@@ -55,15 +145,13 @@
     "geojson-validation": "^1.0.2",
     "jest": "^29.7.0",
     "jest-junit": "^16.0.0",
-    "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": "^3.1.1",
+    "prettier": "^3.2.4",
     "rimraf": "^5.0.5",
     "sinon": "17.0.1",
-    "ts-jest": "^29.1.1",
+    "ts-jest": "^29.1.2",
     "typescript": "~5.3.3",
     "velocityjs": "2.0.6"
   },
@@ -78,7 +166,8 @@
     "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 --experimental-vm-modules --max-old-space-size=1536 --expose-gc ./node_modules/jest/bin/jest.js --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 → handler-factory.mts}

@@ -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.mjs";
+import { DtLogger } from "../../runtime/dt-logger.mjs";
+import { LambdaResponse } from "../../types/lambda-response.mjs";
 
 export type LoggingHandler = (
     method: () => Promise<LambdaResponse>,

package/src/aws/infra/api/{integration.ts → integration.mts}

@@ -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.mjs";
+import { DigitrafficIntegrationResponse } from "../../runtime/digitraffic-integration-response.mjs";
 
 type ParameterType =
     | "path"

package/src/aws/infra/api/{response.ts → response.mts}

@@ -1,13 +1,13 @@
-import { MediaType } from "../../types/mediatypes";
+import { MediaType } from "../../types/mediatypes.mjs";
 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.mjs";
 
 /**
  * This is velocity-script, that assumes the response to be LambdaResponse(status and body).

package/src/aws/infra/api/{responses.ts → responses.mts}

@@ -3,21 +3,21 @@ import {
     XmlResponseTemplate,
     NotFoundResponseTemplate,
     BadRequestResponseTemplate,
-} from "./response";
+} from "./response.mjs";
 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.mjs";
+import { MediaType } from "../../types/mediatypes.mjs";
 
 /// @deprecated
 export const RESPONSE_200_OK: IntegrationResponse = {

package/src/aws/infra/api/{static-integration.ts → static-integration.mts}

@@ -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.mjs";
+import { RESPONSE_CORS_INTEGRATION } from "./responses.mjs";
 
 const INTEGRATION_RESPONSE_200 = `{
     "statusCode": 200

package/src/aws/infra/canaries/Synthetics.d.mts

@@ -0,0 +1,21 @@
+declare module 'Synthetics' {
+  import {type RequestOptions} from "http";
+
+  interface SyntheticsConfiguration {
+    withIncludeRequestBody: (value: boolean) => SyntheticsConfiguration;
+    withIncludeRequestHeaders: (value: boolean) => SyntheticsConfiguration;
+    withIncludeResponseBody: (value: boolean) => SyntheticsConfiguration;
+    withIncludeResponseHeaders: (value: boolean) => SyntheticsConfiguration;
+    withFailedCanaryMetric: (value: boolean) => SyntheticsConfiguration;
+    disableRequestMetrics: () => SyntheticsConfiguration;
+  }
+
+    export function executeHttpStep<T>(
+      name: string,
+      requestOptions: RequestOptions,
+      callback: JsonCheckerFunction<T>
+    ): Promise<void>;
+    export function getConfiguration(): SyntheticsConfiguration;
+
+    export function executeStep(s: string, f: ()=>void, c: Record<string, boolean>)
+};

package/src/aws/infra/canaries/{canary-alarm.ts → canary-alarm.mts}

@@ -1,5 +1,5 @@
 import { Construct } from "constructs";
-import { CanaryParameters } from "./canary-parameters";
+import { CanaryParameters } from "./canary-parameters.mjs";
 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 → canary.mts}

@@ -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.mjs";
+import { CanaryParameters } from "./canary-parameters.mjs";
 import { Construct } from "constructs";
-import { LambdaEnvironment } from "../stack/lambda-configs";
+import { LambdaEnvironment } from "../stack/lambda-configs.mjs";
 
 export class DigitrafficCanary extends Canary {
     constructor(

package/src/aws/infra/canaries/{database-canary.ts → database-canary.mts}

@@ -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.mjs";
+import { DigitrafficCanary } from "./canary.mjs";
+import { DigitrafficStack } from "../stack/stack.mjs";
 
 export class DatabaseCanary extends DigitrafficCanary {
     constructor(

package/src/aws/infra/canaries/{database-checker.ts → database-checker.mts}

@@ -1,12 +1,11 @@
-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.mjs";
+import { ProxyHolder } from "../../runtime/secrets/proxy-holder.mjs";
+import { RdsHolder } from "../../runtime/secrets/rds-holder.mjs";
+import { getEnvVariable } from "../../../utils/utils.mjs";
+import { Countable } from "../../../database/models.mjs";
+import { logger } from "../../runtime/dt-logger-default.mjs";
 
-// 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");
+const synthetics = await import("Synthetics");
 
 abstract class DatabaseCheck<T> {
     readonly name: string;
@@ -88,7 +87,6 @@ export class DatabaseCountChecker {
 
     private constructor(credentialsFunction: () => Promise<void>) {
         this.credentialsFunction = credentialsFunction;
-
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
         synthetics.getConfiguration().disableRequestMetrics();
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
@@ -152,7 +150,6 @@ export class DatabaseCountChecker {
                     check.check(value);
                 };
 
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
                 synthetics.executeStep(check.name, checkFunction, stepConfig);
             }
         });

package/src/aws/infra/canaries/{url-canary.ts → url-canary.mts}

@@ -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.mjs";
+import { DigitrafficRestApi } from "../stack/rest_apis.mjs";
+import { DigitrafficStack } from "../stack/stack.mjs";
+import { DigitrafficCanary } from "./canary.mjs";
+import { ENV_API_KEY, ENV_HOSTNAME, ENV_SECRET } from "./canary-keys.mjs";
+import { CanaryParameters } from "./canary-parameters.mjs";
 
 export interface UrlCanaryParameters extends CanaryParameters {
     readonly hostname: string;

package/src/aws/infra/canaries/{url-checker.ts → url-checker.mts}

@@ -1,17 +1,17 @@
 import { IncomingMessage, RequestOptions } from "http";
-import { Asserter } from "../../../test/asserter";
+import { Asserter } from "../../../test/asserter.mjs";
 
 // 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");
+const synthetics = await import("Synthetics");
 import zlib = require("zlib");
-import { MediaType } from "../../types/mediatypes";
-import { getApiKeyFromAPIGateway } from "../../runtime/apikey";
+import { MediaType } from "../../types/mediatypes.mjs";
+import { getApiKeyFromAPIGateway } from "../../runtime/apikey.mjs";
 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.mjs";
+import { getEnvVariable } from "../../../utils/utils.mjs";
+import { ENV_API_KEY, ENV_HOSTNAME } from "./canary-keys.mjs";
+import { logger } from "../../runtime/dt-logger-default.mjs";
+import { logException } from "../../../utils/logging.mjs";
 
 export const API_KEY_HEADER = "x-api-key";
 
@@ -28,26 +28,6 @@ type JsonCheckerFunction<T> = (
     message: IncomingMessage
 ) => Promise<void>;
 
-/** Temporary type fix for SyntheticsConfiguration */
-interface SyntheticsConfiguration {
-    withIncludeRequestBody: (value: boolean) => SyntheticsConfiguration;
-    withIncludeRequestHeaders: (value: boolean) => SyntheticsConfiguration;
-    withIncludeResponseBody: (value: boolean) => SyntheticsConfiguration;
-    withIncludeResponseHeaders: (value: boolean) => SyntheticsConfiguration;
-    withFailedCanaryMetric: (value: boolean) => SyntheticsConfiguration;
-    disableRequestMetrics: () => SyntheticsConfiguration;
-}
-
-/** Temporary type fix for Synthetics */
-interface Synthetics {
-    executeHttpStep<T>(
-        name: string,
-        requestOptions: RequestOptions,
-        callback: JsonCheckerFunction<T>
-    ): Promise<void>;
-    getConfiguration(): SyntheticsConfiguration;
-}
-
 export class UrlChecker {
     private readonly requestOptions: RequestOptions;
 

package/src/aws/infra/{sqs-integration.ts → sqs-integration.mts}

@@ -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 → sqs-queue.mts}

@@ -10,8 +10,8 @@ import { SnsAction } from "aws-cdk-lib/aws-cloudwatch-actions";
 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.mjs";
+import { MonitoredFunction } from "./stack/monitoredfunction.mjs";
 
 /**
  * Construct for creating SQS-queues.
@@ -135,15 +135,12 @@ const bucketName = "";
 
 function createHandler(): SQSHandler {
     return async function handler(event: SQSEvent): Promise<void> {
-        // eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment
-        const AWS = require("aws-sdk");
 
         const millis = new Date().getTime();
         await Promise.all(
             event.Records.map((e: SQSRecord, idx: number) =>
                 uploadToS3(
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-                    new AWS.S3(),
+                    new S3(),
                     bucketName,
                     e.body,
                     `dlq-${millis}-${idx}.json`

package/src/aws/infra/stack/{lambda-configs.ts → lambda-configs.mts}

@@ -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.mjs";
+import { MonitoredFunctionAlarmProps } from "./monitoredfunction.mjs";
 
 export type LambdaEnvironment = Record<string, string>;
 

package/src/aws/infra/stack/{monitoredfunction.ts → monitoredfunction.mts}

@@ -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.mjs";
 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.mjs";
+import { DigitrafficLogSubscriptions } from "./subscription.mjs";
+import { TrafficType } from "../../../types/traffictype.mjs";
 
 import _ from "lodash";
 

package/src/aws/infra/stack/{parameters.ts → parameters.mts}

@@ -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;

package/src/aws/infra/stack/{rest_apis.ts → rest_apis.mts}

@@ -19,12 +19,12 @@ import {
     PolicyStatement,
 } from "aws-cdk-lib/aws-iam";
 import { Construct } from "constructs";
-import { getModelReference } from "../../../utils/api-model";
-import { MediaType } from "../../types/mediatypes";
-import { ModelWithReference } from "../../types/model-with-reference";
-import { DocumentationPart, DocumentationProperties } from "../documentation";
-import { createDefaultUsagePlan, createUsagePlan } from "../usage-plans";
-import { DigitrafficStack } from "./stack";
+import { getModelReference } from "../../../utils/api-model.mjs";
+import { MediaType } from "../../types/mediatypes.mjs";
+import { ModelWithReference } from "../../types/model-with-reference.mjs";
+import { DocumentationPart, DocumentationProperties } from "../documentation.mjs";
+import { createDefaultUsagePlan, createUsagePlan } from "../usage-plans.mjs";
+import { DigitrafficStack } from "./stack.mjs";
 
 import _ from "lodash";
 

package/src/aws/infra/stack/{stack-checking-aspect.ts → stack-checking-aspect.mts}

@@ -1,7 +1,7 @@
 import { Annotations, IAspect, Stack } from "aws-cdk-lib";
 import { CfnFunction, Runtime } from "aws-cdk-lib/aws-lambda";
 import { CfnBucket } from "aws-cdk-lib/aws-s3";
-import { DigitrafficStack, SOLUTION_KEY } from "./stack";
+import { DigitrafficStack, SOLUTION_KEY } from "./stack.mjs";
 import { IConstruct } from "constructs";
 import { CfnMethod, CfnResource } from "aws-cdk-lib/aws-apigateway";
 import { CfnQueue } from "aws-cdk-lib/aws-sqs";

package/src/aws/infra/stack/{stack.ts → stack.mts}

@@ -1,15 +1,14 @@
 import { Aspects, Stack, StackProps } from "aws-cdk-lib";
-import { IVpc, SecurityGroup, Vpc } from "aws-cdk-lib/aws-ec2";
-import { ISecurityGroup } from "aws-cdk-lib/aws-ec2/lib/security-group";
+import { type ISecurityGroup, IVpc, SecurityGroup, Vpc } from "aws-cdk-lib/aws-ec2";
 import { ITopic, Topic } from "aws-cdk-lib/aws-sns";
 import { StringParameter } from "aws-cdk-lib/aws-ssm";
 import { ISecret, Secret } from "aws-cdk-lib/aws-secretsmanager";
 import { Function as AWSFunction } from "aws-cdk-lib/aws-lambda";
 
-import { StackCheckingAspect } from "./stack-checking-aspect";
+import { StackCheckingAspect } from "./stack-checking-aspect.mjs";
 import { Construct } from "constructs";
-import { TrafficType } from "../../../types/traffictype";
-import { DBLambdaEnvironment } from "./lambda-configs";
+import { TrafficType } from "../../../types/traffictype.mjs";
+import { DBLambdaEnvironment } from "./lambda-configs.mjs";
 
 const SSM_ROOT = "/digitraffic";
 export const SOLUTION_KEY = "Solution";

package/src/aws/infra/stack/{subscription.ts → subscription.mts}

@@ -1,8 +1,8 @@
 import { CfnSubscriptionFilter } from "aws-cdk-lib/aws-logs";
 import { Function as AWSFunction } from "aws-cdk-lib/aws-lambda";
-import { DigitrafficStack } from "./stack";
+import { DigitrafficStack } from "./stack.mjs";
 import { Construct } from "constructs";
-import { MonitoredFunction } from "./monitoredfunction";
+import { MonitoredFunction } from "./monitoredfunction.mjs";
 
 /**
  * Creates a subscription filter that subscribes to a Lambda Log Group and delivers the logs to another destination.

package/src/aws/infra/stacks/{db-dns-stack.ts → db-dns-stack.mts}

@@ -1,14 +1,14 @@
 import { Duration, RemovalPolicy, Stack } from "aws-cdk-lib";
-import { Construct } from "constructs/lib/construct";
+import { type Construct } from "constructs";
 import {
     PrivateHostedZone,
     RecordSet,
     RecordTarget,
     RecordType,
 } from "aws-cdk-lib/aws-route53";
-import { InfraStackConfiguration } from "./intra-stack-configuration";
-import { importVpc } from "../import-util";
-import { getParameterValue } from "../stack/parameters";
+import { InfraStackConfiguration } from "./intra-stack-configuration.mjs";
+import { importVpc } from "../import-util.mjs";
+import { getParameterValue } from "../stack/parameters.mjs";
 
 const DEFAULT_RECORD_TTL = Duration.seconds(30);
 

package/src/aws/infra/stacks/{db-proxy-stack.ts → db-proxy-stack.mts}

@@ -7,12 +7,12 @@ import {
 } from "aws-cdk-lib/aws-rds";
 import { ISecret, Secret } from "aws-cdk-lib/aws-secretsmanager";
 import { IVpc, SecurityGroup } from "aws-cdk-lib/aws-ec2";
-import { InfraStackConfiguration } from "./intra-stack-configuration";
-import { DbStack } from "./db-stack";
-import { exportValue, importVpc } from "../import-util";
-import { createParameter } from "../stack/parameters";
+import { InfraStackConfiguration } from "./intra-stack-configuration.mjs";
+import { DbStack } from "./db-stack.mjs";
+import { exportValue, importVpc } from "../import-util.mjs";
+import { createParameter } from "../stack/parameters.mjs";
 import { Stack, Duration } from "aws-cdk-lib/core";
-import { Construct } from "constructs/lib/construct";
+import { Construct } from "constructs/lib/construct.js";
 
 export interface ProxyConfiguration {
     readonly secretArn: string;