@digitraffic/common 2022.11.23-2 → 2022.11.23-3

package/dist/aws/infra/api/integration.d.ts

@@ -1,7 +1,7 @@
 import { IntegrationResponse, LambdaIntegration } from "aws-cdk-lib/aws-apigateway";
 import { IFunction } from "aws-cdk-lib/aws-lambda";
 import { MediaType } from "../../types/mediatypes";
-declare type ParameterType = "path" | "querystring";
+type ParameterType = "path" | "querystring";
 interface ApiParameter {
     type: ParameterType;
     name: string;

package/dist/aws/infra/api/response.d.ts

@@ -24,5 +24,4 @@ export declare class DigitrafficMethodResponse {
     static response(statusCode: string, model: IModel, mediaType: MediaType, disableCors?: boolean): MethodResponse;
     static response200(model: IModel, mediaType?: MediaType): MethodResponse;
     static response500(model?: IModel, mediaType?: MediaType): MethodResponse;
-    static response400(model?: IModel, mediaType?: MediaType): MethodResponse;
 }

package/dist/aws/infra/api/response.js

@@ -84,9 +84,6 @@ class DigitrafficMethodResponse {
     static response500(model = aws_apigateway_1.Model.EMPTY_MODEL, mediaType = mediatypes_1.MediaType.APPLICATION_JSON) {
         return DigitrafficMethodResponse.response("500", model, mediaType, false);
     }
-    static response400(model = aws_apigateway_1.Model.EMPTY_MODEL, mediaType = mediatypes_1.MediaType.APPLICATION_JSON) {
-        return DigitrafficMethodResponse.response("400", model, mediaType, false);
-    }
 }
 exports.DigitrafficMethodResponse = DigitrafficMethodResponse;
 //# sourceMappingURL=response.js.map

package/dist/aws/infra/canaries/canary-parameters.d.ts

@@ -1,7 +1,7 @@
 import { Schedule } from "@aws-cdk/aws-synthetics-alpha";
 /** Optional env parameters for canary */
-declare type CanaryEnv = Record<string, string>;
-export declare type CanaryParameters = {
+type CanaryEnv = Record<string, string>;
+export type CanaryParameters = {
     readonly name: string;
     readonly schedule?: Schedule;
     readonly secret?: string;

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";
-declare type CheckerFunction = (Res: IncomingMessage) => void;
-declare type JsonCheckerFunction<T> = (json: T, body: string, message: IncomingMessage) => void;
+type CheckerFunction = (Res: IncomingMessage) => void;
+type JsonCheckerFunction<T> = (json: T, body: string, message: IncomingMessage) => void;
 export declare class UrlChecker {
     private readonly requestOptions;
     constructor(hostname: string, apiKey?: string);

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

@@ -3,8 +3,8 @@ import { ISecurityGroup, IVpc, SubnetSelection } from "aws-cdk-lib/aws-ec2";
 import { Role } from "aws-cdk-lib/aws-iam";
 import { DigitrafficStack } from "./stack";
 import { MonitoredFunctionAlarmProps } from "./monitoredfunction";
-export declare type LambdaEnvironment = Record<string, string>;
-export declare type DBLambdaEnvironment = LambdaEnvironment & {
+export type LambdaEnvironment = Record<string, string>;
+export type DBLambdaEnvironment = LambdaEnvironment & {
     SECRET_ID?: string;
     DB_APPLICATION: string;
 };
@@ -55,7 +55,7 @@ export interface FunctionParameters {
     architecture?: Architecture;
     singleLambda?: boolean;
 }
-export declare type MonitoredFunctionParameters = FunctionParameters & {
+export type MonitoredFunctionParameters = FunctionParameters & {
     readonly durationAlarmProps?: MonitoredFunctionAlarmProps;
     readonly durationWarningProps?: MonitoredFunctionAlarmProps;
     readonly errorAlarmProps?: MonitoredFunctionAlarmProps;

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

@@ -8,7 +8,7 @@ import { TrafficType } from "../../../types/traffictype";
 /**
  * Allows customization of CloudWatch Alarm properties
  */
-export declare type MonitoredFunctionAlarmProps = {
+export type MonitoredFunctionAlarmProps = {
     /**
      * Setting this to false will not create a CloudWatch alarm
      */
@@ -18,7 +18,7 @@ export declare type MonitoredFunctionAlarmProps = {
     readonly datapointsToAlarm?: number;
     readonly comparisonOperator?: ComparisonOperator;
 };
-export declare type MonitoredFunctionProps = {
+export type MonitoredFunctionProps = {
     readonly durationAlarmProps?: MonitoredFunctionAlarmProps;
     readonly durationWarningProps?: MonitoredFunctionAlarmProps;
     readonly errorAlarmProps?: MonitoredFunctionAlarmProps;

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

@@ -11,6 +11,37 @@ const subscription_1 = require("../stack/subscription");
  * Creates a Lambda function that monitors default CloudWatch Lambda metrics with CloudWatch Alarms.
  */
 class MonitoredFunction extends aws_lambda_1.Function {
+    /**
+     * Create new MonitoredFunction.  Use topics from given DigitrafficStack.
+     *
+     * @param stack DigitrafficStack
+     * @param id Lambda construct Id
+     * @param functionProps Lambda function properties
+     * @param props Monitored function properties
+     */
+    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!`);
+        }
+        return new MonitoredFunction(stack, id, functionProps, stack.alarmTopic, stack.warningTopic, stack.configuration.production, stack.configuration.trafficType, props);
+    }
+    /**
+     * Create new MonitoredFunction.  Use topics from given DigitrafficStack.  Generate names from given name and configuration shortName.
+     *
+     * For example, shortName FOO and given name update-things will create function FOO-UpdateThings and use code from lambda/update-things/update-things.ts method handler.
+     *
+     * @param stack DigitrafficStack
+     * @param name param-case name
+     * @param environment Lambda environment
+     * @param functionParameters Lambda function parameters
+     */
+    static createV2(stack, name, environment, functionParameters) {
+        const functionName = functionParameters?.functionName ||
+            `${stack.configuration.shortName}-${(0, change_case_1.pascalCase)(name)}`;
+        const functionProps = (0, lambda_configs_1.databaseFunctionProps)(stack, environment, functionName, name, functionParameters);
+        return MonitoredFunction.create(stack, functionName, functionProps, functionParameters);
+    }
     /**
      * @param scope Stack
      * @param id Lambda construct Id
@@ -48,37 +79,6 @@ class MonitoredFunction extends aws_lambda_1.Function {
             this.createAlarm(scope, this.metricThrottles(), "Throttles", "Throttles alarm", "Has throttled", trafficType, this.getAlarmActionForEnv(alarmSnsAction, warningSnsAction, production), 0, 1, 1, aws_cloudwatch_1.ComparisonOperator.GREATER_THAN_THRESHOLD, props?.throttleAlarmProps);
         }
     }
-    /**
-     * Create new MonitoredFunction.  Use topics from given DigitrafficStack.
-     *
-     * @param stack DigitrafficStack
-     * @param id Lambda construct Id
-     * @param functionProps Lambda function properties
-     * @param props Monitored function properties
-     */
-    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!`);
-        }
-        return new MonitoredFunction(stack, id, functionProps, stack.alarmTopic, stack.warningTopic, stack.configuration.production, stack.configuration.trafficType, props);
-    }
-    /**
-     * Create new MonitoredFunction.  Use topics from given DigitrafficStack.  Generate names from given name and configuration shortName.
-     *
-     * For example, shortName FOO and given name update-things will create function FOO-UpdateThings and use code from lambda/update-things/update-things.ts method handler.
-     *
-     * @param stack DigitrafficStack
-     * @param name param-case name
-     * @param environment Lambda environment
-     * @param functionParameters Lambda function parameters
-     */
-    static createV2(stack, name, environment, functionParameters) {
-        const functionName = functionParameters?.functionName ||
-            `${stack.configuration.shortName}-${(0, change_case_1.pascalCase)(name)}`;
-        const functionProps = (0, lambda_configs_1.databaseFunctionProps)(stack, environment, functionName, name, functionParameters);
-        return MonitoredFunction.create(stack, functionName, functionProps, functionParameters);
-    }
     createAlarm(stack, metric, alarmId, alarmName, alarmDescription, trafficType, alarmSnsAction, threshold, evaluationPeriods, datapointsToAlarm, comparisonOperator, alarmProps) {
         metric
             .createAlarm(stack, `${this.node.id}-${alarmId}`, {

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

@@ -1,4 +1,5 @@
-export declare type DbSecret = {
+import { GenericSecret } from "./secret";
+export type DbSecret = {
     readonly username: string;
     readonly password: string;
     readonly host: string;
@@ -16,8 +17,8 @@ export declare enum RdsSecretKey {
     host = "host",
     ro_host = "ro_host"
 }
-export declare type RdsProxySecret = Record<RdsProxySecretKey, string>;
-export declare type RdsSecret = Record<RdsSecretKey, string>;
+export type RdsProxySecret = Record<RdsProxySecretKey, string>;
+export type RdsSecret = Record<RdsSecretKey, string>;
 export declare enum DatabaseEnvironmentKeys {
     DB_USER = "DB_USER",
     DB_PASS = "DB_PASS",
@@ -33,13 +34,13 @@ export declare enum DatabaseEnvironmentKeys {
  * The secret that is passed to the given function will not include the prefix in it's keys.
 
  */
-export declare type SecretOptions = {
+export type SecretOptions = {
     readonly expectedKeys?: string[];
     readonly prefix?: string;
 };
-export declare type SecretToPromiseFunction<Secret, Response = void> = (secret: Secret) => Promise<Response> | void;
-export declare type SecretFunction<Secret, Response = void> = (secretId: string, fn: SecretToPromiseFunction<Secret, Response>, options?: SecretOptions) => Promise<Response | void>;
-export declare type EmptySecretFunction<Response = void> = SecretFunction<DbSecret, Response>;
+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.
  *
@@ -51,4 +52,4 @@ export declare type EmptySecretFunction<Response = void> = SecretFunction<DbSecr
  * @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>(keys: string[], secret: Secret): void;
+export declare function checkExpectedSecretKeys<Secret extends GenericSecret>(keys: string[], secret: Secret): void;

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

@@ -33,7 +33,7 @@ function setDbSecret(secret) {
 // cached at Lambda container level
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let cachedSecret;
-const missingSecretErrorText = 'Missing or empty secretId';
+const missingSecretErrorText = "Missing or empty secretId";
 /**
  * Run the given function with secret retrieved from Secrets Manager.  Also injects database-credentials into environment.
  *
@@ -75,7 +75,7 @@ async function withDbSecret(secretId, fn, options) {
         return fn(cachedSecret);
     }
     catch (error) {
-        console.error('method=withDbSecret Caught an error, refreshing secret', 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);
@@ -86,10 +86,10 @@ async function withDbSecret(secretId, fn, options) {
 }
 exports.withDbSecret = withDbSecret;
 function checkExpectedSecretKeys(keys, secret) {
-    const missingKeys = keys.filter(key => !(key in secret));
+    const missingKeys = keys.filter((key) => !(key in secret));
     if (missingKeys.length) {
         console.error(`method=checkExpectedSecretKeys secret didn't contain the key(s) ${missingKeys}`);
-        throw new Error('Expected keys were not found');
+        throw new Error("Expected keys were not found");
     }
 }
 exports.checkExpectedSecretKeys = checkExpectedSecretKeys;

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

@@ -1,3 +1,4 @@
+import { GenericSecret } from "./secret";
 /**
  * Utility class for getting secrets from Secret Manager.
  * Supports prefix for secrets, checking of expected keys and ttl-configuration.
@@ -6,7 +7,7 @@
  *
  * Supports setting the database environment paramaters from the secret too.
  */
-export declare class SecretHolder<Secret> {
+export declare class SecretHolder<Secret extends GenericSecret> {
     private readonly secretId;
     private readonly prefix;
     private readonly expectedKeys;
@@ -15,7 +16,7 @@ export declare class SecretHolder<Secret> {
         ttl: number;
     });
     private initSecret;
-    static create<S>(prefix?: string, expectedKeys?: string[]): SecretHolder<S>;
+    static create<S extends GenericSecret>(prefix?: string, expectedKeys?: string[]): SecretHolder<S>;
     get(): Promise<Secret>;
     private parseSecret;
     private getSecret;

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

@@ -1,5 +1,5 @@
 import { SecretToPromiseFunction } from "./dbsecret";
-export declare type GenericSecret = Record<string, string>;
+export type GenericSecret = Record<string, string>;
 /**
  @deprecated use SecretHolder & ProxyHolder
  */

package/dist/aws/types/proxytypes.d.ts

@@ -3,7 +3,7 @@
  *
  * Not fully described, extend if necessary.
  */
-export declare type ProxyLambdaResponse = {
+export type ProxyLambdaResponse = {
     readonly statusCode: number;
     readonly body: string;
     readonly headers?: Record<string, string>;
@@ -14,7 +14,7 @@ export declare type ProxyLambdaResponse = {
  *
  * Not fully described, extend if necessary.
  */
-export declare type ProxyLambdaRequest = {
+export type ProxyLambdaRequest = {
     readonly resource: string;
     readonly path: string;
     readonly httpMethod: string;

package/dist/database/database.d.ts

@@ -1,6 +1,6 @@
 import { IDatabase, ITask } from "pg-promise";
-export declare type DTDatabase = IDatabase<unknown>;
-export declare type DTTransaction = ITask<unknown>;
+export type DTDatabase = IDatabase<unknown>;
+export type DTTransaction = ITask<unknown>;
 /**
  * Creates a non-pooling database connection primarily used by Lambdas.
  *

package/dist/marine/rtz.d.ts

@@ -1,16 +1,16 @@
-export declare type RtzPositionCoordinate = {
+export type RtzPositionCoordinate = {
     readonly $: {
         readonly lat: number;
         readonly lon: number;
     };
 };
-export declare type RtzWaypointPosition = {
+export type RtzWaypointPosition = {
     readonly position: RtzPositionCoordinate[];
 };
-export declare type RtzWaypoint = {
+export type RtzWaypoint = {
     readonly waypoint: RtzWaypointPosition[];
 };
-export declare type RtzScheduleElement = {
+export type RtzScheduleElement = {
     readonly $: {
         /**
          * Date
@@ -22,27 +22,27 @@ export declare type RtzScheduleElement = {
         readonly eta?: string;
     };
 };
-export declare type RtzSchedule = {
+export type RtzSchedule = {
     readonly scheduleElement: RtzScheduleElement[];
 };
-export declare type RtzScheduleWrapper = {
+export type RtzScheduleWrapper = {
     readonly manual?: RtzSchedule[];
     readonly calculated?: RtzSchedule[];
 };
-export declare type RtzSchedules = {
+export type RtzSchedules = {
     readonly schedule: RtzScheduleWrapper[];
 };
-export declare type RtzRouteInfo = {
+export type RtzRouteInfo = {
     readonly $: {
         readonly vesselMMSI: string;
         readonly vesselIMO: string;
     };
 };
-export declare type RtzRoute = {
+export type RtzRoute = {
     readonly routeInfo: RtzRouteInfo[];
     readonly waypoints: RtzWaypoint[];
     readonly schedules: RtzSchedules[];
 };
-export declare type RtzVoyagePlan = {
+export type RtzVoyagePlan = {
     readonly route: RtzRoute;
 };

package/dist/types/either.d.ts

@@ -1,9 +1,9 @@
-export declare type EitherOk<T> = {
+export type EitherOk<T> = {
     result: "ok";
     value: T;
 };
-export declare type EitherError = {
+export type EitherError = {
     result: "error";
     message: string;
 };
-export declare type Either<T> = EitherOk<T> | EitherError;
+export type Either<T> = EitherOk<T> | EitherError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2022.11.23-2",
+  "version": "2022.11.23-3",
   "description": "",
   "repository": {
     "type": "git",
@@ -10,36 +10,41 @@
     "node": ">=14 <17",
     "yarn": ">1.2 <2"
   },
-  "scripts": {
-    "build": "tsc",
-    "lint": "eslint --cache .",
-    "eslint-report": "eslint . --format html",
-    "clean": "rimraf dist output",
-    "test": "jest --detectOpenHandles --forceExit --coverage --coverageDirectory=output/coverage/jest",
-    "prepare": "husky install",
-    "prepublishOnly": "yarn clean && yarn build && yarn test"
-  },
   "license": "EUPL-1.2",
   "private": false,
   "files": [
     "dist/**/*.js",
+    "dist/**/*.d.ts",
     "src/**/*.ts"
   ],
-  "dependencies": {
-    "@aws-cdk/aws-synthetics-alpha": "2.50.0-alpha.0",
+  "peerDependencies": {
+    "pg-promise": "^10.12.0",
+    "spex": "^3.0.0",
+    "constructs": "^10.1.131",
+    "@aws-cdk/aws-synthetics-alpha": "^2.50.0-alpha.0",
     "@types/geojson": "^7946.0.10",
-    "aws-cdk-lib": "2.51.1",
-    "aws-sdk": "2.1241.0",
+    "aws-cdk-lib": "^2.51.1",
+    "aws-sdk": "^2.1241.0",
     "axios": "^0.21.1",
-    "change-case": "4.1.2",
-    "constructs": "10.1.131",
+    "change-case": "^4.1.2",
     "geojson-validation": "^1.0.2",
     "moment": "^2.29.4",
     "node-ttl": "^0.2.0",
-    "pg-native": "^3.0.1",
-    "pg-promise": "^10.12.0"
+    "pg-native": "^3.0.1"
   },
   "devDependencies": {
+    "@aws-cdk/aws-synthetics-alpha": "2.50.0-alpha.0",
+    "@types/geojson": "^7946.0.10",
+    "aws-cdk-lib": "^2.50.0",
+    "aws-sdk": "^2.1241.0",
+    "axios": "^0.21.1",
+    "change-case": "^4.1.2",
+    "constructs": "^10.1.131",
+    "geojson-validation": "^1.0.2",
+    "moment": "^2.29.4",
+    "node-ttl": "^0.2.0",
+    "pg-native": "^3.0.1",
+    "pg-promise": "^10.12.0",
     "@types/aws-lambda": "^8.10.106",
     "@types/jest": "^29.0.3",
     "@types/node": "^18.7.23",
@@ -58,8 +63,8 @@
     "ramda": "^0.28.0",
     "rimraf": "^3.0.2",
     "sinon": "^14.0.0",
-    "ts-jest": "^29.0.3",
-    "typescript": "^4.8.4"
+    "typescript": "^4.7.4",
+    "ts-jest": "^29.0.3"
   },
   "externals": [
     "aws-sdk",
@@ -67,5 +72,12 @@
   ],
   "lint-staged": {
     "*.{js,ts,css,md,yml,yaml,json}": "prettier --write"
+  },
+  "scripts": {
+    "build": "tsc",
+    "lint": "eslint --cache .",
+    "eslint-report": "eslint . --format html",
+    "clean": "rimraf dist output",
+    "test": "jest --detectOpenHandles --forceExit --coverage --coverageDirectory=output/coverage/jest"
   }
-}
+}

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

@@ -133,16 +133,4 @@ export class DigitrafficMethodResponse {
             false
         );
     }
-
-    static response400(
-        model = Model.EMPTY_MODEL,
-        mediaType = MediaType.APPLICATION_JSON
-    ) {
-        return DigitrafficMethodResponse.response(
-            "400",
-            model,
-            mediaType,
-            false
-        );
-    }
 }

package/src/aws/runtime/secrets/dbsecret.ts

@@ -1,18 +1,24 @@
-import {withSecret, withSecretAndPrefix} from "./secret";
+import { GenericSecret, withSecret, withSecretAndPrefix } from "./secret";
 
 export type DbSecret = {
-    readonly username: string
-    readonly password: string
-    readonly host: string
-    readonly ro_host: string
+    readonly username: string;
+    readonly password: string;
+    readonly host: string;
+    readonly ro_host: string;
 };
 
 export enum RdsProxySecretKey {
-    username = "username", password = "password", proxy_host = "proxy_host", proxy_ro_host = "proxy_ro_host"
+    username = "username",
+    password = "password",
+    proxy_host = "proxy_host",
+    proxy_ro_host = "proxy_ro_host",
 }
 
 export enum RdsSecretKey {
-    username = "username", password = "password", host = "host", ro_host = "ro_host"
+    username = "username",
+    password = "password",
+    host = "host",
+    ro_host = "ro_host",
 }
 
 export type RdsProxySecret = Record<RdsProxySecretKey, string>;
@@ -37,7 +43,7 @@ function setDbSecret(secret: DbSecret) {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let cachedSecret: any;
 
-const missingSecretErrorText = 'Missing or empty secretId';
+const missingSecretErrorText = "Missing or empty secretId";
 
 /**
  * You can give the following options for retrieving a secret:
@@ -48,13 +54,22 @@ const missingSecretErrorText = 'Missing or empty secretId';
 
  */
 export type SecretOptions = {
-    readonly expectedKeys?: string[],
-    readonly prefix?: string
-}
+    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>;
+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.
@@ -66,7 +81,11 @@ export type EmptySecretFunction<Response = void> = SecretFunction<DbSecret, Resp
  * @param {function} fn
  * @param {SecretOptions} options
  */
-export async function withDbSecret<Secret, Response>(secretId: string, fn: SecretToPromiseFunction<Secret, Response>, options?: SecretOptions): Promise<Response | void> {
+export async function withDbSecret<Secret, Response>(
+    secretId: string,
+    fn: SecretToPromiseFunction<Secret, Response>,
+    options?: SecretOptions
+): Promise<Response | void> {
     if (!secretId) {
         console.error(missingSecretErrorText);
         return Promise.reject(missingSecretErrorText);
@@ -81,9 +100,13 @@ export async function withDbSecret<Secret, Response>(secretId: string, fn: Secre
             });
 
             // then actual secret
-            await withSecretAndPrefix(secretId, options.prefix, (fetchedSecret: Secret) => {
-                cachedSecret = fetchedSecret;
-            });
+            await withSecretAndPrefix(
+                secretId,
+                options.prefix,
+                (fetchedSecret: Secret) => {
+                    cachedSecret = fetchedSecret;
+                }
+            );
         } else {
             await withSecret(secretId, (fetchedSecret: DbSecret) => {
                 setDbSecret(fetchedSecret);
@@ -97,7 +120,10 @@ export async function withDbSecret<Secret, Response>(secretId: string, fn: Secre
         }
         return fn(cachedSecret);
     } catch (error) {
-        console.error('method=withDbSecret Caught an error, refreshing secret', error);
+        console.error(
+            "method=withDbSecret Caught an error, refreshing secret",
+            error
+        );
         // try to refetch secret in case it has changed
         await withSecret(secretId, (fetchedSecret: DbSecret) => {
             setDbSecret(fetchedSecret);
@@ -107,10 +133,15 @@ export async function withDbSecret<Secret, Response>(secretId: string, fn: Secre
     }
 }
 
-export function checkExpectedSecretKeys<Secret>(keys: string[], secret: Secret) {
-    const missingKeys = keys.filter(key => !(key in secret));
+export function checkExpectedSecretKeys<Secret extends GenericSecret>(
+    keys: string[],
+    secret: Secret
+) {
+    const missingKeys = keys.filter((key) => !(key in secret));
     if (missingKeys.length) {
-        console.error(`method=checkExpectedSecretKeys secret didn't contain the key(s) ${missingKeys}`);
-        throw new Error('Expected keys were not found');
+        console.error(
+            `method=checkExpectedSecretKeys secret didn't contain the key(s) ${missingKeys}`
+        );
+        throw new Error("Expected keys were not found");
     }
 }

package/src/aws/runtime/secrets/secret-holder.ts

@@ -23,7 +23,7 @@ const DEFAULT_CONFIGURATION = {
  *
  * Supports setting the database environment paramaters from the secret too.
  */
-export class SecretHolder<Secret> {
+export class SecretHolder<Secret extends GenericSecret> {
     private readonly secretId: string;
     private readonly prefix: string;
     private readonly expectedKeys: string[];
@@ -51,7 +51,7 @@ export class SecretHolder<Secret> {
         this.secretCache.push(DEFAULT_SECRET_KEY, secretValue);
     }
 
-    public static create<S>(
+    public static create<S extends GenericSecret>(
         prefix = DEFAULT_PREFIX,
         expectedKeys: string[] = []
     ) {
@@ -67,10 +67,7 @@ export class SecretHolder<Secret> {
         const parsedSecret =
             this.prefix === DEFAULT_PREFIX
                 ? secret
-                : this.parseSecret(
-                      secret as unknown as GenericSecret,
-                      `${this.prefix}.`
-                  );
+                : this.parseSecret(secret, `${this.prefix}.`);
 
         if (this.expectedKeys.length > 0) {
             checkExpectedSecretKeys(this.expectedKeys, parsedSecret);

package/dist/aws/infra/api/integration.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"integration.js","sourceRoot":"","sources":["../../../../src/aws/infra/api/integration.ts"],"names":[],"mappings":";;;AAAA,+DAIoC;AAEpC,uDAAmD;AACnD,qGAAgG;AAShG,MAAa,sBAAsB;IAM/B,YAAY,MAAiB,EAAE,SAAS,GAAG,sBAAS,CAAC,UAAU;QAFtD,eAAU,GAAmB,EAAE,CAAC;QAGrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAED,gBAAgB,CAAC,GAAG,KAAe;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAEtE,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,iBAAiB,CAAC,GAAG,KAAe;QAChC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACnB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CACtD,CAAC;QAEF,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK;QACD,MAAM,oBAAoB,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAEpD,OAAO,IAAI,kCAAiB,CAAC,IAAI,CAAC,MAAM,EAAE;YACtC,KAAK,EAAE,KAAK;YACZ,oBAAoB;YACpB,iBAAiB,EACb,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC;gBACvB,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,IAAI,CAAC,uBAAuB,EAAE;YACxC,gBAAgB,EACZ,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC;gBACvB,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,IAAI,CAAC,sBAAsB,EAAE;YACvC,mBAAmB,EAAE,oCAAmB,CAAC,aAAa;SACzD,CAAC,CAAC;IACP,CAAC;IAED,uBAAuB;QACnB,MAAM,iBAAiB,GAA2B,EAAE,CAAC;QAErD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAuB,EAAE,EAAE;YAChD,iBAAiB,CACb,uBAAuB,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,EAAE,CAC5D,GAAG,kBAAkB,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAED,sBAAsB;QAClB,MAAM,WAAW,GAA2B,EAAE,CAAC;QAE/C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAuB,EAAE,EAAE;YAChD,WAAW,CACP,SAAS,CAAC,IAAI,CACjB,GAAG,yCAAyC,SAAS,CAAC,IAAI,KAAK,CAAC;QACrE,CAAC,CAAC,CAAC;QAEH,OAAO;YACH,CAAC,sBAAS,CAAC,gBAAgB,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;SAC5D,CAAC;IACN,CAAC;IAED,eAAe;QACX,OAAO,CAAC,iEAA8B,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAC/D,CAAC;CACJ;AAxED,wDAwEC"}

package/dist/aws/infra/api/response.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"response.js","sourceRoot":"","sources":["../../../../src/aws/infra/api/response.ts"],"names":[],"mappings":"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"}