@digitraffic/common 2023.1.18-2 → 2023.1.23-2

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

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

@@ -3,12 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NetworkStack = void 0;
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
+const import_util_1 = require("../import-util");
 class NetworkStack extends aws_cdk_lib_1.Stack {
     constructor(scope, id, isc, configuration) {
         super(scope, id, {
             env: isc.env,
         });
-        this.createVpc(configuration);
+        this.vpc = this.createVpc(configuration);
+        (0, import_util_1.exportValue)(this, isc.environmentName, "VPCID", this.vpc.vpcId);
     }
     createVpc(configuration) {
         return new aws_ec2_1.Vpc(this, "DigitrafficVPC", {
@@ -26,7 +28,7 @@ class NetworkStack extends aws_cdk_lib_1.Stack {
                 {
                     name: "private",
                     cidrMask: 24,
-                    subnetType: aws_ec2_1.SubnetType.PRIVATE_WITH_NAT,
+                    subnetType: aws_ec2_1.SubnetType.PRIVATE_WITH_EGRESS,
                 },
             ],
         });

package/dist/aws/runtime/digitraffic-integration-response.d.ts

@@ -1,8 +1,8 @@
 import { IntegrationResponse } from "aws-cdk-lib/aws-apigateway";
 import { MediaType } from "../types/mediatypes";
 export declare abstract class DigitrafficIntegrationResponse {
-    static ok(mediaType: MediaType): IntegrationResponse;
+    static ok(mediaType: MediaType, sunset?: string): IntegrationResponse;
     static badRequest(mediaType?: MediaType): IntegrationResponse;
     static notImplemented(mediaType?: MediaType): IntegrationResponse;
-    static create(statusCode: string, mediaType: MediaType): IntegrationResponse;
+    static create(statusCode: string, mediaType: MediaType, sunset?: string): IntegrationResponse;
 }

package/dist/aws/runtime/digitraffic-integration-response.js

@@ -4,8 +4,8 @@ exports.DigitrafficIntegrationResponse = void 0;
 const mediatypes_1 = require("../types/mediatypes");
 const response_1 = require("../infra/api/response");
 class DigitrafficIntegrationResponse {
-    static ok(mediaType) {
-        return this.create("200", mediaType);
+    static ok(mediaType, sunset) {
+        return this.create("200", mediaType, sunset);
     }
     static badRequest(mediaType) {
         return this.create("400", mediaType ?? mediatypes_1.MediaType.TEXT_PLAIN);
@@ -13,11 +13,13 @@ class DigitrafficIntegrationResponse {
     static notImplemented(mediaType) {
         return this.create("501", mediaType ?? mediatypes_1.MediaType.TEXT_PLAIN);
     }
-    static create(statusCode, mediaType) {
+    static create(statusCode, mediaType, sunset) {
         return {
             statusCode,
             responseTemplates: {
-                [mediaType]: response_1.RESPONSE_DEFAULT_LAMBDA,
+                [mediaType]: sunset
+                    ? (0, response_1.getDeprecatedDefaultLambdaResponse)(sunset)
+                    : response_1.RESPONSE_DEFAULT_LAMBDA,
             },
         };
     }

package/dist/aws/runtime/secrets/dbsecret.d.ts

@@ -1,10 +1,4 @@
 import { GenericSecret } from "./secret";
-export interface DbSecret {
-    readonly username: string;
-    readonly password: string;
-    readonly host: string;
-    readonly ro_host: string;
-}
 export declare enum RdsProxySecretKey {
     username = "username",
     password = "password",
@@ -19,37 +13,4 @@ export declare enum RdsSecretKey {
 }
 export type RdsProxySecret = Record<RdsProxySecretKey, string>;
 export type RdsSecret = Record<RdsSecretKey, string>;
-export declare enum DatabaseEnvironmentKeys {
-    DB_USER = "DB_USER",
-    DB_PASS = "DB_PASS",
-    DB_URI = "DB_URI",
-    DB_RO_URI = "DB_RO_URI",
-    DB_APPLICATION = "DB_APPLICATION"
-}
-/**
- * You can give the following options for retrieving a secret:
- *
- * expectedKeys: the list of keys the secret must include.  If not, an error will be thrown.
- * prefix: a prefix that's included in retrieved secret's keys.  Only keys begining with the prefix will be included.
- * The secret that is passed to the given function will not include the prefix in it's keys.
-
- */
-export interface SecretOptions {
-    readonly expectedKeys?: string[];
-    readonly prefix?: string;
-}
-export type SecretToPromiseFunction<Secret, Response = void> = (secret: Secret) => Promise<Response> | void;
-export type SecretFunction<Secret, Response = void> = (secretId: string, fn: SecretToPromiseFunction<Secret, Response>, options?: SecretOptions) => Promise<Response | void>;
-export type EmptySecretFunction<Response = void> = SecretFunction<DbSecret, Response>;
-/**
- * Run the given function with secret retrieved from Secrets Manager.  Also injects database-credentials into environment.
- *
- * @deprecated use SecretHolder & ProxyHolder
- * @see SecretOptions
- *
- * @param {string} secretId
- * @param {function} fn
- * @param {SecretOptions} options
- */
-export declare function withDbSecret<Secret, Response>(secretId: string, fn: SecretToPromiseFunction<Secret, Response>, options?: SecretOptions): Promise<Response | void>;
 export declare function checkExpectedSecretKeys<Secret extends GenericSecret>(keys: string[], secret: Secret): void;

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkExpectedSecretKeys = exports.withDbSecret = exports.DatabaseEnvironmentKeys = exports.RdsSecretKey = exports.RdsProxySecretKey = void 0;
-const secret_1 = require("./secret");
+exports.checkExpectedSecretKeys = exports.RdsSecretKey = exports.RdsProxySecretKey = void 0;
 var RdsProxySecretKey;
 (function (RdsProxySecretKey) {
     RdsProxySecretKey["username"] = "username";
@@ -16,75 +15,6 @@ var RdsSecretKey;
     RdsSecretKey["host"] = "host";
     RdsSecretKey["ro_host"] = "ro_host";
 })(RdsSecretKey = exports.RdsSecretKey || (exports.RdsSecretKey = {}));
-var DatabaseEnvironmentKeys;
-(function (DatabaseEnvironmentKeys) {
-    DatabaseEnvironmentKeys["DB_USER"] = "DB_USER";
-    DatabaseEnvironmentKeys["DB_PASS"] = "DB_PASS";
-    DatabaseEnvironmentKeys["DB_URI"] = "DB_URI";
-    DatabaseEnvironmentKeys["DB_RO_URI"] = "DB_RO_URI";
-    DatabaseEnvironmentKeys["DB_APPLICATION"] = "DB_APPLICATION";
-})(DatabaseEnvironmentKeys = exports.DatabaseEnvironmentKeys || (exports.DatabaseEnvironmentKeys = {}));
-function setDbSecret(secret) {
-    process.env[DatabaseEnvironmentKeys.DB_USER] = secret.username;
-    process.env[DatabaseEnvironmentKeys.DB_PASS] = secret.password;
-    process.env[DatabaseEnvironmentKeys.DB_URI] = secret.host;
-    process.env[DatabaseEnvironmentKeys.DB_RO_URI] = secret.ro_host;
-}
-// cached at Lambda container level
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let cachedSecret;
-const missingSecretErrorText = "Missing or empty secretId";
-/**
- * Run the given function with secret retrieved from Secrets Manager.  Also injects database-credentials into environment.
- *
- * @deprecated use SecretHolder & ProxyHolder
- * @see SecretOptions
- *
- * @param {string} secretId
- * @param {function} fn
- * @param {SecretOptions} options
- */
-async function withDbSecret(secretId, fn, options) {
-    if (!secretId) {
-        console.error(missingSecretErrorText);
-        return Promise.reject(missingSecretErrorText);
-    }
-    if (!cachedSecret) {
-        // if prefix is given, first set db values and then fetch secret
-        if (options?.prefix) {
-            // first set db values
-            await (0, secret_1.withSecret)(secretId, (fetchedSecret) => {
-                setDbSecret(fetchedSecret);
-            });
-            // then actual secret
-            await (0, secret_1.withSecretAndPrefix)(secretId, options.prefix, (fetchedSecret) => {
-                cachedSecret = fetchedSecret;
-            });
-        }
-        else {
-            await (0, secret_1.withSecret)(secretId, (fetchedSecret) => {
-                setDbSecret(fetchedSecret);
-                cachedSecret = fetchedSecret;
-            });
-        }
-    }
-    try {
-        if (options?.expectedKeys?.length) {
-            checkExpectedSecretKeys(options.expectedKeys, cachedSecret);
-        }
-        return fn(cachedSecret);
-    }
-    catch (error) {
-        console.error("method=withDbSecret Caught an error, refreshing secret", error);
-        // try to refetch secret in case it has changed
-        await (0, secret_1.withSecret)(secretId, (fetchedSecret) => {
-            setDbSecret(fetchedSecret);
-            cachedSecret = fetchedSecret;
-        });
-        return fn(cachedSecret);
-    }
-}
-exports.withDbSecret = withDbSecret;
 function checkExpectedSecretKeys(keys, secret) {
     const missingKeys = keys.filter((key) => !(key in secret));
     if (missingKeys.length) {

package/dist/aws/runtime/secrets/proxy-holder.js

@@ -4,6 +4,7 @@ exports.ProxyHolder = void 0;
 const secret_holder_1 = require("./secret-holder");
 const dbsecret_1 = require("./dbsecret");
 const utils_1 = require("../../../utils/utils");
+const database_1 = require("../../../database/database");
 const RDS_PROXY_SECRET_KEYS = Object.values(dbsecret_1.RdsProxySecretKey);
 /**
  * Holds credentials for RDS Proxy access.
@@ -17,10 +18,10 @@ class ProxyHolder {
     }
     async setCredentials() {
         const secret = await this.secretHolder.get();
-        process.env[dbsecret_1.DatabaseEnvironmentKeys.DB_USER] = secret.username;
-        process.env[dbsecret_1.DatabaseEnvironmentKeys.DB_PASS] = secret.password;
-        process.env[dbsecret_1.DatabaseEnvironmentKeys.DB_URI] = secret.proxy_host;
-        process.env[dbsecret_1.DatabaseEnvironmentKeys.DB_RO_URI] = secret.proxy_ro_host;
+        process.env[database_1.DatabaseEnvironmentKeys.DB_USER] = secret.username;
+        process.env[database_1.DatabaseEnvironmentKeys.DB_PASS] = secret.password;
+        process.env[database_1.DatabaseEnvironmentKeys.DB_URI] = secret.proxy_host;
+        process.env[database_1.DatabaseEnvironmentKeys.DB_RO_URI] = secret.proxy_ro_host;
     }
 }
 exports.ProxyHolder = ProxyHolder;

package/dist/aws/runtime/secrets/rds-holder.js

@@ -4,6 +4,7 @@ exports.RdsHolder = void 0;
 const secret_holder_1 = require("./secret-holder");
 const dbsecret_1 = require("./dbsecret");
 const utils_1 = require("../../../utils/utils");
+const database_1 = require("../../../database/database");
 const RDS_SECRET_KEYS = Object.values(dbsecret_1.RdsSecretKey);
 /**
  * Holds credentials for RDS access.
@@ -17,10 +18,10 @@ class RdsHolder {
     }
     async setCredentials() {
         const secret = await this.secretHolder.get();
-        process.env[dbsecret_1.DatabaseEnvironmentKeys.DB_USER] = secret.username;
-        process.env[dbsecret_1.DatabaseEnvironmentKeys.DB_PASS] = secret.password;
-        process.env[dbsecret_1.DatabaseEnvironmentKeys.DB_URI] = secret.host;
-        process.env[dbsecret_1.DatabaseEnvironmentKeys.DB_RO_URI] = secret.ro_host;
+        process.env[database_1.DatabaseEnvironmentKeys.DB_USER] = secret.username;
+        process.env[database_1.DatabaseEnvironmentKeys.DB_PASS] = secret.password;
+        process.env[database_1.DatabaseEnvironmentKeys.DB_URI] = secret.host;
+        process.env[database_1.DatabaseEnvironmentKeys.DB_RO_URI] = secret.ro_host;
     }
 }
 exports.RdsHolder = RdsHolder;

package/dist/aws/runtime/secrets/secret-holder.d.ts

@@ -20,8 +20,4 @@ export declare class SecretHolder<Secret extends GenericSecret> {
     get(): Promise<Secret>;
     private parseSecret;
     private getSecret;
-    /**
-     * @deprecated Use ProxyHolder
-     */
-    setDatabaseCredentials(): Promise<void>;
 }

package/dist/aws/runtime/secrets/secret-holder.js

@@ -4,7 +4,7 @@ exports.SecretHolder = void 0;
 const secret_1 = require("./secret");
 const dbsecret_1 = require("./dbsecret");
 const utils_1 = require("../../../utils/utils");
-// eslint-disable-next-line @typescript-eslint/no-var-requires
+// eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment
 const NodeTtl = require("node-ttl");
 const DEFAULT_PREFIX = "";
 const DEFAULT_SECRET_KEY = "SECRET";
@@ -24,11 +24,13 @@ class SecretHolder {
         this.secretId = secretId;
         this.prefix = prefix;
         this.expectedKeys = expectedKeys;
+        // eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
         this.secretCache = new NodeTtl(configuration);
     }
     async initSecret() {
         const secretValue = await (0, secret_1.getSecret)(this.secretId);
         console.info("refreshing secret " + this.secretId);
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
         this.secretCache.push(DEFAULT_SECRET_KEY, secretValue);
     }
     static create(prefix = DEFAULT_PREFIX, expectedKeys = []) {
@@ -55,21 +57,13 @@ class SecretHolder {
         return parsed;
     }
     async getSecret() {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
         const secret = this.secretCache.get(DEFAULT_SECRET_KEY);
         if (!secret) {
             await this.initSecret();
         }
-        return secret || this.secretCache.get(DEFAULT_SECRET_KEY);
-    }
-    /**
-     * @deprecated Use ProxyHolder
-     */
-    async setDatabaseCredentials() {
-        const secret = await this.getSecret();
-        process.env[dbsecret_1.DatabaseEnvironmentKeys.DB_USER] = secret.username;
-        process.env[dbsecret_1.DatabaseEnvironmentKeys.DB_PASS] = secret.password;
-        process.env[dbsecret_1.DatabaseEnvironmentKeys.DB_URI] = secret.host;
-        process.env[dbsecret_1.DatabaseEnvironmentKeys.DB_RO_URI] = secret.ro_host;
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
+        return secret ?? this.secretCache.get(DEFAULT_SECRET_KEY);
     }
 }
 exports.SecretHolder = SecretHolder;

package/dist/aws/runtime/secrets/secret.d.ts

@@ -1,8 +1,2 @@
-import { SecretToPromiseFunction } from "./dbsecret";
 export type GenericSecret = Record<string, string>;
-/**
- @deprecated use SecretHolder & ProxyHolder
- */
-export declare function withSecret<Secret, Response>(secretId: string, fn: SecretToPromiseFunction<Secret, Response>): Promise<Response | void>;
 export declare function getSecret<Secret>(secretId: string, prefix?: string): Promise<Secret>;
-export declare function withSecretAndPrefix<Secret, Response>(secretId: string, prefix: string, fn: SecretToPromiseFunction<Secret, Response>): Promise<Response | void>;

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

@@ -1,26 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withSecretAndPrefix = exports.getSecret = exports.withSecret = void 0;
+exports.getSecret = void 0;
 const aws_sdk_1 = require("aws-sdk");
 const smClient = new aws_sdk_1.SecretsManager({
     region: process.env.AWS_REGION,
 });
-/**
- @deprecated use SecretHolder & ProxyHolder
- */
-async function withSecret(secretId, fn) {
-    return fn(await getSecret(secretId));
-}
-exports.withSecret = withSecret;
-async function getSecret(secretId, prefix = '') {
-    const secretObj = await smClient.getSecretValue({
+async function getSecret(secretId, prefix = "") {
+    const secretObj = await smClient
+        .getSecretValue({
         SecretId: secretId,
-    }).promise();
+    })
+        .promise();
     if (!secretObj.SecretString) {
-        throw new Error('No secret found!');
+        throw new Error("No secret found!");
     }
     const secret = JSON.parse(secretObj.SecretString);
-    if (prefix === '') {
+    if (!prefix) {
         return secret;
     }
     return parseSecret(secret, `${prefix}.`);
@@ -36,8 +31,4 @@ function parseSecret(secret, prefix) {
     }
     return parsed;
 }
-async function withSecretAndPrefix(secretId, prefix, fn) {
-    return fn(await getSecret(secretId, prefix));
-}
-exports.withSecretAndPrefix = withSecretAndPrefix;
 //# sourceMappingURL=secret.js.map

package/dist/database/database.d.ts

@@ -1,4 +1,11 @@
 import { IDatabase, ITask } from "pg-promise";
+export declare enum DatabaseEnvironmentKeys {
+    DB_USER = "DB_USER",
+    DB_PASS = "DB_PASS",
+    DB_URI = "DB_URI",
+    DB_RO_URI = "DB_RO_URI",
+    DB_APPLICATION = "DB_APPLICATION"
+}
 export type DTDatabase = IDatabase<unknown>;
 export type DTTransaction = ITask<unknown>;
 /**

package/dist/database/database.js

@@ -1,18 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.inDatabaseReadonly = exports.inDatabase = exports.inTransaction = exports.initDbConnection = void 0;
-const dbsecret_1 = require("../aws/runtime/secrets/dbsecret");
+exports.inDatabaseReadonly = exports.inDatabase = exports.inTransaction = exports.initDbConnection = exports.DatabaseEnvironmentKeys = void 0;
 const utils_1 = require("../utils/utils");
 const environment_1 = require("../aws/runtime/environment");
-// eslint-disable-next-line @typescript-eslint/no-var-requires
+var DatabaseEnvironmentKeys;
+(function (DatabaseEnvironmentKeys) {
+    DatabaseEnvironmentKeys["DB_USER"] = "DB_USER";
+    DatabaseEnvironmentKeys["DB_PASS"] = "DB_PASS";
+    DatabaseEnvironmentKeys["DB_URI"] = "DB_URI";
+    DatabaseEnvironmentKeys["DB_RO_URI"] = "DB_RO_URI";
+    DatabaseEnvironmentKeys["DB_APPLICATION"] = "DB_APPLICATION";
+})(DatabaseEnvironmentKeys = exports.DatabaseEnvironmentKeys || (exports.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
+// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
 pgp.pg.types.setTypeParser(pgp.pg.types.builtins.INT8, (value) => {
     return parseInt(value);
 });
+// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
 pgp.pg.types.setTypeParser(pgp.pg.types.builtins.FLOAT8, (value) => {
     return parseFloat(value);
 });
+// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
 pgp.pg.types.setTypeParser(pgp.pg.types.builtins.NUMERIC, (value) => {
     return parseFloat(value);
 });
@@ -30,6 +40,7 @@ pgp.pg.types.setTypeParser(pgp.pg.types.builtins.NUMERIC, (value) => {
  */
 function initDbConnection(username, password, applicationName, url, options) {
     const finalUrl = `postgresql://${username}:${password}@${url}?application_name=${applicationName}`;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
     return pgp(finalUrl, options);
 }
 exports.initDbConnection = initDbConnection;
@@ -46,11 +57,11 @@ function inDatabaseReadonly(fn) {
 }
 exports.inDatabaseReadonly = inDatabaseReadonly;
 async function doInDatabase(readonly, fn) {
-    const db_application = (0, environment_1.envValue)(dbsecret_1.DatabaseEnvironmentKeys.DB_APPLICATION, "unknown-cdk-application");
+    const db_application = (0, environment_1.envValue)(DatabaseEnvironmentKeys.DB_APPLICATION, "unknown-cdk-application");
     const db_uri = readonly
-        ? (0, environment_1.envValue)(dbsecret_1.DatabaseEnvironmentKeys.DB_RO_URI)
-        : (0, environment_1.envValue)(dbsecret_1.DatabaseEnvironmentKeys.DB_URI);
-    const db = initDbConnection((0, utils_1.getEnvVariable)(dbsecret_1.DatabaseEnvironmentKeys.DB_USER), (0, utils_1.getEnvVariable)(dbsecret_1.DatabaseEnvironmentKeys.DB_PASS), db_application, db_uri);
+        ? (0, environment_1.envValue)(DatabaseEnvironmentKeys.DB_RO_URI)
+        : (0, environment_1.envValue)(DatabaseEnvironmentKeys.DB_URI);
+    const db = initDbConnection((0, utils_1.getEnvVariable)(DatabaseEnvironmentKeys.DB_USER), (0, utils_1.getEnvVariable)(DatabaseEnvironmentKeys.DB_PASS), db_application, db_uri);
     try {
         // deallocate all prepared statements to allow for connection pooling
         // DISCARD instead of DEALLOCATE as it didn't always clean all prepared statements
@@ -62,7 +73,7 @@ async function doInDatabase(readonly, fn) {
         throw e;
     }
     finally {
-        db.$pool.end();
+        await db.$pool.end();
     }
 }
 //# sourceMappingURL=database.js.map

package/dist/test/db-testutils.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dbTestBase = exports.assertCount = void 0;
 const database_1 = require("../database/database");
-const dbsecret_1 = require("../aws/runtime/secrets/dbsecret");
 async function assertCount(db, sql, count) {
     await db.one(sql).then((x) => expect(x.count).toEqual(count));
 }
@@ -15,10 +14,10 @@ function dbTestBase(fn, truncateFn, dbUser, dbPass, dbUri) {
             noWarnings: true, // ignore duplicate connection warning for tests
         });
         beforeAll(async () => {
-            process.env[dbsecret_1.DatabaseEnvironmentKeys.DB_USER] = dbUser;
-            process.env[dbsecret_1.DatabaseEnvironmentKeys.DB_PASS] = dbPass;
-            process.env[dbsecret_1.DatabaseEnvironmentKeys.DB_URI] = theDbUri;
-            process.env[dbsecret_1.DatabaseEnvironmentKeys.DB_RO_URI] = theDbUri;
+            process.env[database_1.DatabaseEnvironmentKeys.DB_USER] = dbUser;
+            process.env[database_1.DatabaseEnvironmentKeys.DB_PASS] = dbPass;
+            process.env[database_1.DatabaseEnvironmentKeys.DB_URI] = theDbUri;
+            process.env[database_1.DatabaseEnvironmentKeys.DB_RO_URI] = theDbUri;
             await truncateFn(db);
         });
         afterAll(async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2023.01.18-2",
+  "version": "2023.01.23-2",
   "description": "",
   "repository": {
     "type": "git",

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

@@ -17,12 +17,17 @@ interface ApiParameter {
 export class DigitrafficIntegration {
     readonly lambda: IFunction;
     readonly mediaType: MediaType;
-
     readonly parameters: ApiParameter[] = [];
+    readonly sunset?: string;
 
-    constructor(lambda: IFunction, mediaType = MediaType.TEXT_PLAIN) {
+    constructor(
+        lambda: IFunction,
+        mediaType = MediaType.TEXT_PLAIN,
+        sunset?: string
+    ) {
         this.lambda = lambda;
         this.mediaType = mediaType;
+        this.sunset = sunset;
     }
 
     addPathParameter(...names: string[]): this {
@@ -84,6 +89,6 @@ export class DigitrafficIntegration {
     }
 
     createResponses(): IntegrationResponse[] {
-        return [DigitrafficIntegrationResponse.ok(this.mediaType)];
+        return [DigitrafficIntegrationResponse.ok(this.mediaType, this.sunset)];
     }
 }