@digitraffic/common 2023.1.18-1 → 2023.1.23-1

package/dist/aws/infra/canaries/canary-alarm.js

@@ -6,19 +6,17 @@ const aws_cloudwatch_actions_1 = require("aws-cdk-lib/aws-cloudwatch-actions");
 const aws_sns_1 = require("aws-cdk-lib/aws-sns");
 class CanaryAlarm {
     constructor(stack, canary, params) {
-        if (params.alarm ?? true) {
-            const alarmName = params.alarm?.alarmName ?? `${params.name}-alarm`;
-            const alarm = new aws_cloudwatch_1.Alarm(stack, alarmName, {
-                alarmName,
-                alarmDescription: params.alarm?.description ?? '',
-                metric: canary.metricSuccessPercent(),
-                evaluationPeriods: params.alarm?.evalutionPeriods ?? 1,
-                threshold: params.alarm?.threshold ?? 100,
-                comparisonOperator: aws_cloudwatch_1.ComparisonOperator.LESS_THAN_THRESHOLD,
-            });
-            if (params.alarm?.topicArn) {
-                alarm.addAlarmAction(new aws_cloudwatch_actions_1.SnsAction(aws_sns_1.Topic.fromTopicArn(stack, `${alarmName}-action`, params.alarm.topicArn)));
-            }
+        const alarmName = params.alarm?.alarmName ?? `${params.name}-alarm`;
+        const alarm = new aws_cloudwatch_1.Alarm(stack, alarmName, {
+            alarmName,
+            alarmDescription: params.alarm?.description ?? "",
+            metric: canary.metricSuccessPercent(),
+            evaluationPeriods: params.alarm?.evalutionPeriods ?? 1,
+            threshold: params.alarm?.threshold ?? 100,
+            comparisonOperator: aws_cloudwatch_1.ComparisonOperator.LESS_THAN_THRESHOLD,
+        });
+        if (params.alarm?.topicArn) {
+            alarm.addAlarmAction(new aws_cloudwatch_actions_1.SnsAction(aws_sns_1.Topic.fromTopicArn(stack, `${alarmName}-action`, params.alarm.topicArn)));
         }
     }
 }

package/dist/aws/infra/canaries/canary.js

@@ -17,15 +17,13 @@ class DigitrafficCanary extends aws_synthetics_alpha_1.Canary {
             }),
             environmentVariables: {
                 ...environmentVariables,
-                ...params?.canaryEnv,
+                ...params.canaryEnv,
             },
             canaryName,
             schedule: params.schedule ?? aws_synthetics_alpha_1.Schedule.rate(aws_cdk_lib_1.Duration.minutes(15)),
         });
         this.artifactsBucket.grantWrite(role);
-        if (params.alarm ?? true) {
-            new canary_alarm_1.CanaryAlarm(scope, this, params);
-        }
+        new canary_alarm_1.CanaryAlarm(scope, this, params);
     }
 }
 exports.DigitrafficCanary = DigitrafficCanary;

package/dist/aws/infra/canaries/database-checker.js

@@ -5,7 +5,7 @@ const database_1 = require("../../../database/database");
 const proxy_holder_1 = require("../../runtime/secrets/proxy-holder");
 const rds_holder_1 = require("../../runtime/secrets/rds-holder");
 const utils_1 = require("../../../utils/utils");
-// eslint-disable-next-line @typescript-eslint/no-var-requires
+// 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");
 class DatabaseCheck {
     constructor(name, sql) {
@@ -58,7 +58,9 @@ class DatabaseCountChecker {
     constructor(credentialsFunction) {
         this.checks = [];
         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
         synthetics.getConfiguration().withFailedCanaryMetric(true);
     }
     static createForProxy() {
@@ -100,6 +102,7 @@ class DatabaseCountChecker {
                 const checkFunction = () => {
                     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/dist/aws/infra/canaries/url-canary.js

@@ -23,6 +23,7 @@ class UrlCanary extends canary_1.DigitrafficCanary {
     static create(stack, role, publicApi, params) {
         return new UrlCanary(stack, role, {
             ...{
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 handler: `${params.name}.handler`,
                 hostname: publicApi.hostname(),
                 apiKeyId: this.getApiKey(publicApi),

package/dist/aws/infra/canaries/url-checker.d.ts

@@ -3,8 +3,8 @@ import { IncomingMessage } from "http";
 import { MediaType } from "../../types/mediatypes";
 import { FeatureCollection } from "geojson";
 export declare const API_KEY_HEADER = "x-api-key";
-type CheckerFunction = (Res: IncomingMessage) => void;
-type JsonCheckerFunction<T> = (json: T, body: string, message: IncomingMessage) => void;
+type CheckerFunction = (Res: IncomingMessage) => Promise<void>;
+type JsonCheckerFunction<T> = (json: T, body: string, message: IncomingMessage) => Promise<void>;
 export declare class UrlChecker {
     private readonly requestOptions;
     constructor(hostname: string, apiKey?: string);

package/dist/aws/infra/canaries/url-checker.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HeaderChecker = exports.GeoJsonChecker = exports.ContentTypeChecker = exports.ContentChecker = exports.ResponseChecker = exports.UrlChecker = exports.API_KEY_HEADER = void 0;
 const asserter_1 = require("../../../test/asserter");
-// eslint-disable-next-line @typescript-eslint/no-var-requires
+// 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 zlib = require("zlib");
 const mediatypes_1 = require("../../types/mediatypes");
@@ -28,7 +28,9 @@ class UrlChecker {
             protocol: "https:",
             headers,
         };
+        // 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
         synthetics
             .getConfiguration()
             .withIncludeRequestBody(false)
@@ -52,6 +54,7 @@ class UrlChecker {
                 path: url,
             },
         };
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return
         return synthetics.executeHttpStep(`Verify ${statusCode} for ${url.replace(/auth=.*/, "")}`, requestOptions, callback);
     }
     expect200(url, ...callbacks) {
@@ -67,6 +70,7 @@ class UrlChecker {
                 path: url,
             },
         };
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return
         return synthetics.executeHttpStep(`Verify 404 for ${url}`, requestOptions, validateStatusCodeAndContentType(404, mediatypes_1.MediaType.TEXT_PLAIN));
     }
     expect400(url) {
@@ -76,10 +80,13 @@ class UrlChecker {
                 path: url,
             },
         };
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return
         return synthetics.executeHttpStep(`Verify 400 for ${url}`, requestOptions, validateStatusCodeAndContentType(400, mediatypes_1.MediaType.TEXT_PLAIN));
     }
     expect403WithoutApiKey(url, mediaType) {
-        if (!this.requestOptions.headers ||
+        if (
+        // eslint-disable-next-line @typescript-eslint/prefer-optional-chain
+        !this.requestOptions.headers ||
             !this.requestOptions.headers[exports.API_KEY_HEADER]) {
             console.error("No api key defined");
         }
@@ -90,6 +97,7 @@ class UrlChecker {
                 headers: baseHeaders,
             },
         };
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return
         return synthetics.executeHttpStep(`Verify 403 for ${url}`, requestOptions, validateStatusCodeAndContentType(403, mediaType ?? mediatypes_1.MediaType.APPLICATION_JSON));
     }
     done() {
@@ -129,10 +137,13 @@ function validateStatusCodeAndContentType(statusCode, contentType) {
     return (res) => {
         return new Promise((resolve) => {
             if (res.statusCode !== statusCode) {
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 throw new Error(`${res.statusCode} ${res.statusMessage}`);
             }
             if (res.headers["content-type"] !== contentType) {
-                throw new Error("Wrong content-type " + res.headers["content-type"]);
+                throw new Error(
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                `Wrong content-type ${res.headers["content-type"]}`);
             }
             resolve();
         });
@@ -172,13 +183,16 @@ class ResponseChecker {
                 throw new Error("statusCode missing");
             }
             if (res.statusCode < 200 || res.statusCode > 299) {
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 throw new Error(`${res.statusCode} ${res.statusMessage}`);
             }
             if (this.checkCors && !res.headers["access-control-allow-origin"]) {
                 throw new Error("CORS missing");
             }
             if (res.headers["content-type"] !== this.contentType) {
-                throw new Error("Wrong content-type " + res.headers["content-type"]);
+                throw new Error(
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                `Wrong content-type ${res.headers["content-type"]}`);
             }
             const body = await getResponseBody(res);
             fn(body, res);
@@ -208,13 +222,16 @@ class ContentTypeChecker {
                 throw new Error("statusCode missing");
             }
             if (res.statusCode < 200 || res.statusCode > 299) {
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 throw new Error(`${res.statusCode} ${res.statusMessage}`);
             }
             if (!res.headers["access-control-allow-origin"]) {
                 throw new Error("CORS missing");
             }
             if (res.headers["content-type"] !== contentType) {
-                throw new Error("Wrong content-type " + res.headers["content-type"]);
+                throw new Error(
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                `Wrong content-type ${res.headers["content-type"]}`);
             }
         };
     }
@@ -238,6 +255,7 @@ class HeaderChecker {
             if (!res.headers[headerName]) {
                 throw new Error("Missing header: " + headerName);
             }
+            return Promise.resolve();
         };
     }
     static checkHeaderMissing(headerName) {
@@ -245,6 +263,7 @@ class HeaderChecker {
             if (res.headers[headerName]) {
                 throw new Error("Header should not exist: " + headerName);
             }
+            return Promise.resolve();
         };
     }
 }

package/dist/aws/infra/sqs-integration.d.ts

@@ -2,6 +2,4 @@ import { RequestValidator, Resource } from "aws-cdk-lib/aws-apigateway";
 import { Queue } from "aws-cdk-lib/aws-sqs";
 import { IModel } from "aws-cdk-lib/aws-apigateway/lib/model";
 import { Construct } from "constructs";
-export declare function attachQueueToApiGatewayResource(stack: Construct, queue: Queue, resource: Resource, requestValidator: RequestValidator, resourceName: string, apiKeyRequired: boolean, requestModels?: {
-    [param: string]: IModel;
-}): void;
+export declare function attachQueueToApiGatewayResource(stack: Construct, queue: Queue, resource: Resource, requestValidator: RequestValidator, resourceName: string, apiKeyRequired: boolean, requestModels?: Record<string, IModel>): void;

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

@@ -7,83 +7,79 @@ const aws_iam_1 = require("aws-cdk-lib/aws-iam");
 function attachQueueToApiGatewayResource(stack, queue, resource, requestValidator, resourceName, apiKeyRequired, requestModels) {
     // role for API Gateway
     const apiGwRole = new aws_iam_1.Role(stack, `${resourceName}APIGatewayToSQSRole`, {
-        assumedBy: new aws_iam_1.ServicePrincipal('apigateway.amazonaws.com'),
+        assumedBy: new aws_iam_1.ServicePrincipal("apigateway.amazonaws.com"),
     });
     // grants API Gateway the right to send SQS messages
     apiGwRole.addToPolicy(new aws_iam_1.PolicyStatement({
-        resources: [
-            queue.queueArn,
-        ],
-        actions: [
-            'sqs:SendMessage',
-        ],
+        resources: [queue.queueArn],
+        actions: ["sqs:SendMessage"],
     }));
     // grants API Gateway the right write CloudWatch Logs
     apiGwRole.addToPolicy(new aws_iam_1.PolicyStatement({
-        resources: [
-            '*',
-        ],
+        resources: ["*"],
         actions: [
-            'logs:CreateLogGroup',
-            'logs:CreateLogStream',
-            'logs:DescribeLogGroups',
-            'logs:DescribeLogStreams',
-            'logs:PutLogEvents',
-            'logs:GetLogEvents',
-            'logs:FilterLogEvents',
+            "logs:CreateLogGroup",
+            "logs:CreateLogStream",
+            "logs:DescribeLogGroups",
+            "logs:DescribeLogStreams",
+            "logs:PutLogEvents",
+            "logs:GetLogEvents",
+            "logs:FilterLogEvents",
         ],
     }));
     // create an integration between API Gateway and an SQS queue
-    const fifoMessageGroupId = queue.fifo ? '&MessageGroupId=AlwaysSameFifoGroup' : '';
+    const fifoMessageGroupId = queue.fifo
+        ? "&MessageGroupId=AlwaysSameFifoGroup"
+        : "";
     const sqsIntegration = new aws_apigateway_1.AwsIntegration({
-        service: 'sqs',
-        integrationHttpMethod: 'POST',
+        service: "sqs",
+        integrationHttpMethod: "POST",
         options: {
             passthroughBehavior: aws_apigateway_1.PassthroughBehavior.NEVER,
             credentialsRole: apiGwRole,
             requestParameters: {
                 // SQS requires the Content-Type of the HTTP request to be application/x-www-form-urlencoded
-                'integration.request.header.Content-Type': "'application/x-www-form-urlencoded'",
+                "integration.request.header.Content-Type": "'application/x-www-form-urlencoded'",
             },
             requestTemplates: {
                 // map the JSON request to a form parameter, FIFO needs also MessageGroupId
                 // https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_SendMessage.html
-                'application/json': `Action=SendMessage${fifoMessageGroupId}&MessageBody=$util.urlEncode($input.body)`,
+                "application/json": `Action=SendMessage${fifoMessageGroupId}&MessageBody=$util.urlEncode($input.body)`,
             },
             // these are required by SQS
             integrationResponses: [
                 {
-                    statusCode: '200',
+                    statusCode: "200",
                     responseTemplates: {
-                        'text/html': 'Success',
+                        "text/html": "Success",
                     },
                 },
                 {
-                    statusCode: '500',
+                    statusCode: "500",
                     responseTemplates: {
-                        'text/html': 'Error',
+                        "text/html": "Error",
                     },
-                    selectionPattern: '500',
+                    selectionPattern: "500",
                 },
             ],
         },
         path: `${aws_cdk_lib_1.Aws.ACCOUNT_ID}/${queue.queueName}`,
     });
-    resource.addMethod('POST', sqsIntegration, {
+    resource.addMethod("POST", sqsIntegration, {
         requestValidator,
         apiKeyRequired,
         requestModels: requestModels ?? {},
         methodResponses: [
             {
-                statusCode: '200',
+                statusCode: "200",
                 responseParameters: {
-                    'method.response.header.Content-Type': true,
+                    "method.response.header.Content-Type": true,
                 },
             },
             {
-                statusCode: '500',
+                statusCode: "500",
                 responseParameters: {
-                    'method.response.header.Content-Type': true,
+                    "method.response.header.Content-Type": true,
                 },
             },
         ],

package/dist/aws/infra/sqs-queue.d.ts

@@ -1,5 +1,4 @@
 import { Queue, QueueProps } from "aws-cdk-lib/aws-sqs";
-import { Construct } from "constructs";
 import { DigitrafficStack } from "./stack/stack";
 /**
  * Construct for creating SQS-queues.
@@ -8,7 +7,6 @@ import { DigitrafficStack } from "./stack/stack";
  * and an alarm for the queue.  Anything that goes to the dlq will be written into the bucket and the alarm is activated.
  */
 export declare class DigitrafficSqsQueue extends Queue {
-    constructor(scope: Construct, name: string, props: QueueProps);
     static create(stack: DigitrafficStack, name: string, props: QueueProps): DigitrafficSqsQueue;
 }
 export declare class DigitrafficDLQueue {

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

@@ -18,19 +18,19 @@ const monitoredfunction_1 = require("./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.
  */
 class DigitrafficSqsQueue extends aws_sqs_1.Queue {
-    constructor(scope, name, props) {
-        super(scope, name, props);
-    }
     static create(stack, name, props) {
         const queueName = `${stack.configuration.shortName}-${name}-Queue`;
-        const queueProps = { ...props, ...{
+        const queueProps = {
+            ...props,
+            ...{
                 encryption: aws_sqs_1.QueueEncryption.KMS_MANAGED,
                 queueName,
-                deadLetterQueue: props.deadLetterQueue || {
+                deadLetterQueue: props.deadLetterQueue ?? {
                     maxReceiveCount: 2,
                     queue: DigitrafficDLQueue.create(stack, name),
                 },
-            } };
+            },
+        };
         return new DigitrafficSqsQueue(stack, queueName, queueProps);
     }
 }
@@ -53,14 +53,14 @@ class DigitrafficDLQueue {
             functionName: dlqFunctionName,
             code: getDlqCode(dlqBucket.bucketName),
             timeout: aws_cdk_lib_1.Duration.seconds(10),
-            handler: 'index.handler',
+            handler: "index.handler",
             memorySize: 128,
             reservedConcurrentExecutions: 1,
         });
         const statement = new aws_iam_1.PolicyStatement();
-        statement.addActions('s3:PutObject');
-        statement.addActions('s3:PutObjectAcl');
-        statement.addResources(dlqBucket.bucketArn + '/*');
+        statement.addActions("s3:PutObject");
+        statement.addActions("s3:PutObjectAcl");
+        statement.addResources(dlqBucket.bucketArn + "/*");
         lambda.addToRolePolicy(statement);
         lambda.addEventSource(new aws_lambda_event_sources_1.SqsEventSource(dlq));
         addDLQAlarm(stack, dlqName, dlq);
@@ -72,17 +72,18 @@ function addDLQAlarm(stack, dlqName, dlq) {
     const alarmName = `${dlqName}-Alarm`;
     dlq.metricNumberOfMessagesReceived({
         period: aws_cdk_lib_1.Duration.minutes(5),
-    }).createAlarm(stack, alarmName, {
+    })
+        .createAlarm(stack, alarmName, {
         alarmName,
         threshold: 0,
         evaluationPeriods: 1,
         treatMissingData: aws_cloudwatch_1.TreatMissingData.NOT_BREACHING,
         comparisonOperator: aws_cloudwatch_1.ComparisonOperator.GREATER_THAN_THRESHOLD,
-    }).addAlarmAction(new aws_cloudwatch_actions_1.SnsAction(stack.warningTopic));
+    })
+        .addAlarmAction(new aws_cloudwatch_actions_1.SnsAction(stack.warningTopic));
 }
 function getDlqCode(bName) {
-    const functionBody = DLQ_LAMBDA_CODE
-        .replace("__bucketName__", bName)
+    const functionBody = DLQ_LAMBDA_CODE.replace("__bucketName__", bName)
         .replace("__upload__", uploadToS3.toString())
         .replace("__doUpload__", doUpload.toString())
         .replace("__handler__", createHandler().toString().substring(23)); // remove function handler() from signature
@@ -90,33 +91,39 @@ function getDlqCode(bName) {
 }
 async function uploadToS3(s3, bName, body, objectName) {
     try {
-        console.info('writing %s to %s', objectName, bName);
+        console.info("writing %s to %s", objectName, bName);
         await doUpload(s3, bName, body, objectName);
     }
     catch (error) {
         console.warn(error);
-        console.warn('method=uploadToS3 retrying upload to bucket %s', bName);
+        console.warn("method=uploadToS3 retrying upload to bucket %s", bName);
         try {
             await doUpload(s3, bName, body, objectName);
         }
         catch (e2) {
-            console.error('method=uploadToS3 failed retrying upload to bucket %s', bName);
+            console.error("method=uploadToS3 failed retrying upload to bucket %s", bName);
         }
     }
 }
 function doUpload(s3, bName, Body, Key) {
-    return s3.upload({
-        Bucket: bName, Body, Key,
-    }).promise();
+    return s3
+        .upload({
+        Bucket: bName,
+        Body,
+        Key,
+    })
+        .promise();
 }
 // bucketName is unused, will be overridden in the actual lambda code below
-const bucketName = '';
+const bucketName = "";
 function createHandler() {
     return async function handler(event) {
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const AWS = require('aws-sdk');
+        // 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, idx) => uploadToS3(new AWS.S3(), bucketName, e.body, `dlq-${millis}-${idx}.json`)));
+        await Promise.all(event.Records.map((e, idx) => uploadToS3(
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+        new AWS.S3(), bucketName, e.body, `dlq-${millis}-${idx}.json`)));
     };
 }
 const DLQ_LAMBDA_CODE = `const AWS = require('aws-sdk');

package/dist/aws/infra/stack/lambda-configs.d.ts

@@ -1,5 +1,5 @@
 import { Architecture, Code, FunctionProps, Runtime } from "aws-cdk-lib/aws-lambda";
-import { ISecurityGroup, IVpc, SubnetSelection } from "aws-cdk-lib/aws-ec2";
+import { IVpc, SubnetSelection } from "aws-cdk-lib/aws-ec2";
 import { Role } from "aws-cdk-lib/aws-iam";
 import { DigitrafficStack } from "./stack";
 import { MonitoredFunctionAlarmProps } from "./monitoredfunction";
@@ -8,34 +8,8 @@ export type DBLambdaEnvironment = LambdaEnvironment & {
     SECRET_ID?: string;
     DB_APPLICATION: string;
 };
-export interface LambdaConfiguration {
-    vpcId: string;
-    allowFromIpAddresses?: string[];
-    privateSubnetIds: string[];
-    availabilityZones: string[];
-    lambdaDbSgId: string;
-    dbProps?: DbProps;
-    defaultLambdaDurationSeconds?: number;
-    logsDestinationArn: string;
-    memorySize?: number;
-    runtime?: Runtime;
-}
-declare interface DbProps {
-    username: string;
-    password: string;
-    uri?: string;
-    ro_uri?: string;
-}
 export declare function databaseFunctionProps(stack: DigitrafficStack, environment: LambdaEnvironment, lambdaName: string, simpleLambdaName: string, config?: Partial<FunctionParameters>): FunctionProps;
 export declare function lambdaFunctionProps(stack: DigitrafficStack, environment: LambdaEnvironment, lambdaName: string, simpleLambdaName: string, config?: Partial<FunctionParameters>): FunctionProps;
-/**
- * Creates a base configuration for a Lambda that uses an RDS database
- * @param vpc "Private" Lambdas are associated with a VPC
- * @param lambdaDbSg Security Group shared by Lambda and RDS
- * @param props Database connection properties for the Lambda
- * @param config Lambda configuration
- */
-export declare function dbLambdaConfiguration(vpc: IVpc, lambdaDbSg: ISecurityGroup, props: LambdaConfiguration, config: FunctionParameters): FunctionProps;
 export declare function defaultLambdaConfiguration(config: FunctionParameters): FunctionProps;
 export interface FunctionParameters {
     memorySize?: number;
@@ -44,9 +18,7 @@ export interface FunctionParameters {
     code: Code;
     handler: string;
     readOnly?: boolean;
-    environment?: {
-        [key: string]: string;
-    };
+    environment?: Record<string, string>;
     reservedConcurrentExecutions?: number;
     role?: Role;
     vpc?: IVpc;
@@ -61,4 +33,3 @@ export type MonitoredFunctionParameters = FunctionParameters & {
     readonly errorAlarmProps?: MonitoredFunctionAlarmProps;
     readonly throttleAlarmProps?: MonitoredFunctionAlarmProps;
 };
-export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultLambdaConfiguration = exports.dbLambdaConfiguration = exports.lambdaFunctionProps = exports.databaseFunctionProps = void 0;
+exports.defaultLambdaConfiguration = exports.lambdaFunctionProps = exports.databaseFunctionProps = void 0;
 const aws_lambda_1 = require("aws-cdk-lib/aws-lambda");
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const aws_logs_1 = require("aws-cdk-lib/aws-logs");
@@ -13,9 +13,9 @@ function databaseFunctionProps(stack, environment, lambdaName, simpleLambdaName,
     return {
         ...lambdaFunctionProps(stack, environment, lambdaName, simpleLambdaName, config),
         ...{
-            vpc: stack.vpc || undefined,
+            vpc: stack.vpc ?? undefined,
             vpcSubnets,
-            securityGroup: stack.lambdaDbSg || undefined,
+            securityGroup: stack.lambdaDbSg ?? undefined,
         },
     };
 }
@@ -42,39 +42,6 @@ function getAssetCode(simpleLambdaName, isSingleLambda) {
         : `dist/lambda/${simpleLambdaName}`;
     return new aws_lambda_1.AssetCode(lambdaPath);
 }
-/**
- * Creates a base configuration for a Lambda that uses an RDS database
- * @param vpc "Private" Lambdas are associated with a VPC
- * @param lambdaDbSg Security Group shared by Lambda and RDS
- * @param props Database connection properties for the Lambda
- * @param config Lambda configuration
- */
-function dbLambdaConfiguration(vpc, lambdaDbSg, props, config) {
-    return {
-        runtime: props.runtime ?? aws_lambda_1.Runtime.NODEJS_16_X,
-        memorySize: props.memorySize ?? config.memorySize ?? 1024,
-        functionName: config.functionName,
-        code: config.code,
-        role: config.role,
-        handler: config.handler,
-        timeout: aws_cdk_lib_1.Duration.seconds(config.timeout ?? props.defaultLambdaDurationSeconds ?? 60),
-        environment: config.environment ?? {
-            DB_USER: props.dbProps?.username ?? "",
-            DB_PASS: props.dbProps?.password ?? "",
-            DB_URI: (config.readOnly
-                ? props.dbProps?.ro_uri
-                : props.dbProps?.uri) ?? "",
-        },
-        logRetention: aws_logs_1.RetentionDays.ONE_YEAR,
-        vpc: vpc,
-        vpcSubnets: {
-            subnets: vpc.privateSubnets,
-        },
-        securityGroups: [lambdaDbSg],
-        reservedConcurrentExecutions: config.reservedConcurrentExecutions ?? 3,
-    };
-}
-exports.dbLambdaConfiguration = dbLambdaConfiguration;
 function defaultLambdaConfiguration(config) {
     const props = {
         runtime: aws_lambda_1.Runtime.NODEJS_16_X,
@@ -86,7 +53,7 @@ function defaultLambdaConfiguration(config) {
         reservedConcurrentExecutions: config.reservedConcurrentExecutions,
         code: config.code,
         role: config.role,
-        timeout: aws_cdk_lib_1.Duration.seconds(config.timeout || 10),
+        timeout: aws_cdk_lib_1.Duration.seconds(config.timeout ?? 10),
     };
     if (config.vpc) {
         return {
@@ -94,7 +61,7 @@ function defaultLambdaConfiguration(config) {
             ...{
                 vpc: config.vpc,
                 vpcSubnets: {
-                    subnets: config.vpc?.privateSubnets,
+                    subnets: config.vpc.privateSubnets,
                 },
             },
         };

package/dist/aws/infra/stack/monitoredfunction.js

@@ -22,7 +22,9 @@ class MonitoredFunction extends aws_lambda_1.Function {
     static create(stack, id, functionProps, props) {
         if (props === MonitoredFunction.DISABLE_ALARMS &&
             stack.configuration.production) {
-            throw new Error(`Function ${functionProps.functionName} has DISABLE_ALARMS.  Remove before installing to production or define your own properties!`);
+            throw new Error(
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            `Function ${functionProps.functionName} has DISABLE_ALARMS.  Remove before installing to production or define your own properties!`);
         }
         return new MonitoredFunction(stack, id, functionProps, stack.alarmTopic, stack.warningTopic, stack.configuration.production, stack.configuration.trafficType, props);
     }

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

@@ -67,7 +67,7 @@ class DbStack extends aws_cdk_lib_1.Stack {
                 vpc,
                 securityGroups: [securityGroup],
                 vpcSubnets: {
-                    subnetType: aws_ec2_1.SubnetType.PRIVATE_WITH_NAT,
+                    subnetType: aws_ec2_1.SubnetType.PRIVATE_WITH_EGRESS,
                 },
                 instanceType: configuration.dbInstanceType,
                 parameterGroup,

package/dist/aws/infra/stacks/network-stack.d.ts

@@ -1,12 +1,13 @@
 import { Stack } from "aws-cdk-lib";
 import { Construct } from "constructs";
-import { Vpc } from "aws-cdk-lib/aws-ec2";
+import { IVpc, Vpc } from "aws-cdk-lib/aws-ec2";
 import { InfraStackConfiguration } from "./intra-stack-configuration";
 export interface NetworkConfiguration {
     readonly vpcName: string;
     readonly cidr: string;
 }
 export declare class NetworkStack extends Stack {
+    readonly vpc: IVpc;
     constructor(scope: Construct, id: string, isc: InfraStackConfiguration, configuration: NetworkConfiguration);
     createVpc(configuration: NetworkConfiguration): Vpc;
 }