@digitraffic/common 2023.1.18-2 → 2023.1.23-2

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

@@ -1,5 +1,4 @@
-import {SecretsManager} from 'aws-sdk';
-import {SecretToPromiseFunction} from "./dbsecret";
+import { SecretsManager } from "aws-sdk";
 
 const smClient = new SecretsManager({
     region: process.env.AWS_REGION,
@@ -7,29 +6,29 @@ const smClient = new SecretsManager({
 
 export type GenericSecret = Record<string, string>;
 
-/**
- @deprecated use SecretHolder & ProxyHolder
- */
-export async function withSecret<Secret, Response>(secretId: string, fn: SecretToPromiseFunction<Secret, Response>): Promise<Response | void> {
-    return fn(await getSecret(secretId));
-}
-
-export async function getSecret<Secret>(secretId: string, prefix = ''): Promise<Secret> {
-    const secretObj = await smClient.getSecretValue({
-        SecretId: secretId,
-    }).promise();
+export async function getSecret<Secret>(
+    secretId: string,
+    prefix = ""
+): Promise<Secret> {
+    const secretObj = await smClient
+        .getSecretValue({
+            SecretId: secretId,
+        })
+        .promise();
 
     if (!secretObj.SecretString) {
-        throw new Error('No secret found!');
+        throw new Error("No secret found!");
     }
 
-    const secret = JSON.parse(secretObj.SecretString);
+    const secret: GenericSecret | Secret = JSON.parse(
+        secretObj.SecretString
+    ) as unknown as GenericSecret | Secret;
 
-    if (prefix === '') {
-        return secret;
+    if (!prefix) {
+        return secret as Secret;
     }
 
-    return parseSecret(secret, `${prefix}.`);
+    return parseSecret(secret as GenericSecret, `${prefix}.`);
 }
 
 function parseSecret<Secret>(secret: GenericSecret, prefix: string): Secret {
@@ -44,7 +43,3 @@ function parseSecret<Secret>(secret: GenericSecret, prefix: string): Secret {
 
     return parsed as unknown as Secret;
 }
-
-export async function withSecretAndPrefix<Secret, Response>(secretId: string, prefix: string, fn: SecretToPromiseFunction<Secret, Response>): Promise<Response | void> {
-    return fn(await getSecret(secretId, prefix));
-}

package/src/database/database.ts

@@ -1,20 +1,30 @@
 import { IDatabase, ITask } from "pg-promise";
-import { DatabaseEnvironmentKeys } from "../aws/runtime/secrets/dbsecret";
 import { getEnvVariable } from "../utils/utils";
 import { envValue } from "../aws/runtime/environment";
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
+export enum DatabaseEnvironmentKeys {
+    DB_USER = "DB_USER",
+    DB_PASS = "DB_PASS",
+    DB_URI = "DB_URI",
+    DB_RO_URI = "DB_RO_URI",
+    DB_APPLICATION = "DB_APPLICATION",
+}
+
+// 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: string) => {
     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: string) => {
     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: string) => {
     return parseFloat(value);
 });
@@ -44,6 +54,7 @@ export function initDbConnection(
 ): DTDatabase {
     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);
 }
 
@@ -90,6 +101,6 @@ async function doInDatabase<T>(
         console.error("Error in db:", e);
         throw e;
     } finally {
-        db.$pool.end();
+        await db.$pool.end();
     }
 }

package/src/test/db-testutils.ts

@@ -1,5 +1,8 @@
-import { DTDatabase, initDbConnection } from "../database/database";
-import { DatabaseEnvironmentKeys } from "../aws/runtime/secrets/dbsecret";
+import {
+    DatabaseEnvironmentKeys,
+    DTDatabase,
+    initDbConnection,
+} from "../database/database";
 import { Countable } from "../database/models";
 
 export async function assertCount(db: DTDatabase, sql: string, count: number) {

package/dist/test/secret.d.ts

@@ -1,3 +0,0 @@
-import { EmptySecretFunction, SecretFunction } from "../aws/runtime/secrets/dbsecret";
-export declare function createSecretFunction<Secret, Response>(secret: Secret): SecretFunction<Secret, Response>;
-export declare function createEmptySecretFunction<Response>(): EmptySecretFunction<Response>;

package/dist/test/secret.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createEmptySecretFunction = exports.createSecretFunction = void 0;
-const EMPTY_DB_SECRET = {
-    username: '',
-    password: '',
-    host: '',
-    // eslint-disable-next-line camelcase
-    ro_host: '',
-};
-function createSecretFunction(secret) {
-    // eslint-disable-next-line require-await
-    return async (secretId, fn) => {
-        return fn(secret);
-    };
-}
-exports.createSecretFunction = createSecretFunction;
-function createEmptySecretFunction() {
-    // eslint-disable-next-line require-await
-    return async (secretId, fn) => {
-        return fn(EMPTY_DB_SECRET);
-    };
-}
-exports.createEmptySecretFunction = createEmptySecretFunction;
-//# sourceMappingURL=secret.js.map

package/src/test/secret.ts

@@ -1,23 +0,0 @@
-import {DbSecret, EmptySecretFunction, SecretFunction, SecretToPromiseFunction} from "../aws/runtime/secrets/dbsecret";
-
-const EMPTY_DB_SECRET: DbSecret = {
-    username: '',
-    password: '',
-    host: '',
-    // eslint-disable-next-line camelcase
-    ro_host: '',
-};
-
-export function createSecretFunction<Secret, Response>(secret: Secret): SecretFunction<Secret, Response> {
-    // eslint-disable-next-line require-await
-    return async (secretId: string, fn: SecretToPromiseFunction<Secret, Response>) => {
-        return fn(secret);
-    };
-}
-
-export function createEmptySecretFunction<Response>(): EmptySecretFunction<Response> {
-    // eslint-disable-next-line require-await
-    return async (secretId: string, fn: SecretToPromiseFunction<DbSecret, Response>) => {
-        return fn(EMPTY_DB_SECRET);
-    };
-}