Configure lambdas from parameter store (#658)

* Simplify Database transaction handling Signed-off-by: Carl Gieringer <78054+carlgieringer@users.noreply.github.com> * Make getting a DB connection async (prep for async DB config) Signed-off-by: Carl Gieringer <78054+carlgieringer@users.noreply.github.com> * Load database connection info from parameter store Signed-off-by: Carl Gieringer <78054+carlgieringer@users.noreply.github.com> * PR edits Signed-off-by: Carl Gieringer <78054+carlgieringer@users.noreply.github.com> * Fix message handler test Signed-off-by: Carl Gieringer <78054+carlgieringer@users.noreply.github.com> --------- Signed-off-by: Carl Gieringer <78054+carlgieringer@users.noreply.github.com>
Howdju · Mar 17, 2024 · 6a5b9e7 · 6a5b9e7
1 parent 40f021f
commit 6a5b9e7
Show file tree

Hide file tree

Showing 47 changed files with 1,822 additions and 472 deletions.
diff --git a/babel-node-modules-opt-in.txt b/babel-node-modules-opt-in.txt
@@ -0,0 +1,14 @@
+# Patterns matching node_modules dependencies that Babel and Jest should transform
+@grrr/cookie-consent
+@grrr/utils
+nanoid
+jsdom
+strip-indent
+normalize-url
+text-fragments-polyfill
+approx-string-match
+is-absolute-url
+# Because there is a node_modules in this path, we must we must also match it separately
+@smithy/middleware-retry/node_modules/uuid/dist/esm-browser
+# (match the included node_modules path separately)
+uuid/dist/esm-browser
diff --git a/babel.config.js b/babel.config.js
@@ -1,12 +1,20 @@
+var fs = require("fs");
+var ignores = fs
+  .readFileSync(__dirname + "/babel-node-modules-opt-in.txt", "utf8")
+  .replace(/#.*\n/g, "")
+  .split("\n")
+  .filter(Boolean)
+  .join("|");
+
 module.exports = {
   presets: [
     ["@babel/preset-env", { targets: { node: "current" } }],
     "@babel/preset-typescript",
   ],
   ignore: [
     new RegExp(
-      // What we add here should probably go into Jest's transformIgnorePatterns too.
-      "/node_modules/(?!(@grrr/cookie-consent|@grrr/utils|nanoid|jsdom|strip-indent|normalize-url|text-fragments-polyfill|approx-string-match|is-absolute-url))"
+      // Ignore node_modules except for specific packages we must transform.
+      "/node_modules/(?!(" + ignores + "))"
     ),
   ],
   plugins: [

diff --git a/howdju-service-common/lib/daos/AppearancesDao.test.ts b/howdju-service-common/lib/daos/AppearancesDao.test.ts
@@ -1,36 +1,42 @@
-import { Pool } from "pg";
-
+import { utcNow } from "howdju-common";
 import { mockLogger } from "howdju-test-common";
 
-import { endPoolAndDropDb, initDb, makeTestDbConfig } from "@/util/testUtil";
-import { Database, makePool } from "../database";
+import {
+  endPoolAndDropDb,
+  initDb,
+  makeTestClientProvider,
+  makeTestDbConfig,
+} from "@/util/testUtil";
+import { Database, PoolClientProvider } from "../database";
 import { makeTestProvider } from "@/initializers/TestProvider";
 import TestHelper from "@/initializers/TestHelper";
 import { AppearancesDao } from "./AppearancesDao";
-import { utcNow } from "howdju-common";
 
 const dbConfig = makeTestDbConfig();
 
 describe("AppearancesDao", () => {
   let dbName: string;
-  let pool: Pool;
+  let clientProvider: PoolClientProvider;
   let database: Database;
 
   let dao: AppearancesDao;
   let testHelper: TestHelper;
   beforeEach(async () => {
     dbName = await initDb(dbConfig);
 
-    pool = makePool(mockLogger, { ...dbConfig, database: dbName });
-    database = new Database(mockLogger, pool);
+    clientProvider = makeTestClientProvider({
+      ...dbConfig,
+      database: dbName,
+    });
+    database = new Database(mockLogger, clientProvider);
 
     const provider = makeTestProvider(database);
 
     dao = provider.appearancesDao;
     testHelper = provider.testHelper;
   });
   afterEach(async () => {
-    await endPoolAndDropDb(pool, dbConfig, dbName);
+    await endPoolAndDropDb(clientProvider, dbConfig, dbName);
   });
 
   describe("createAppearanceReturningId", () => {

diff --git a/howdju-service-common/lib/daos/JustificationsDao.test.ts b/howdju-service-common/lib/daos/JustificationsDao.test.ts
@@ -1,7 +1,6 @@
 import { expect } from "@jest/globals";
 import { assign, omit, pick } from "lodash";
 import moment from "moment";
-import { Pool } from "pg";
 
 import {
   JustificationRef,
@@ -23,22 +22,27 @@ import {
 } from "howdju-test-common";
 
 import { JustificationsDao } from "./JustificationsDao";
-import { endPoolAndDropDb, initDb, makeTestDbConfig } from "@/util/testUtil";
+import {
+  endPoolAndDropDb,
+  initDb,
+  makeTestClientProvider,
+  makeTestDbConfig,
+} from "@/util/testUtil";
 import {
   Database,
-  makePool,
   PersorgsDao,
   PropositionsDao,
   StatementsService,
   PropositionCompoundsService,
+  PoolClientProvider,
 } from "..";
 import { makeTestProvider } from "@/initializers/TestProvider";
 import { CreateJustificationDataIn } from "./dataTypes";
 import TestHelper from "@/initializers/TestHelper";
 
 describe("JustificationsDao", () => {
   const dbConfig = makeTestDbConfig();
-  let pool: Pool;
+  let clientProvider: PoolClientProvider;
   let dao: JustificationsDao;
   let dbName: string;
   let statementsService: StatementsService;
@@ -49,8 +53,11 @@ describe("JustificationsDao", () => {
   beforeEach(async () => {
     dbName = await initDb(dbConfig);
 
-    pool = makePool(mockLogger, { ...dbConfig, database: dbName });
-    const database = new Database(mockLogger, pool);
+    clientProvider = makeTestClientProvider({
+      ...dbConfig,
+      database: dbName,
+    });
+    const database = new Database(mockLogger, clientProvider);
 
     const provider = makeTestProvider(database);
 
@@ -62,7 +69,7 @@ describe("JustificationsDao", () => {
     propositionCompoundsService = provider.propositionCompoundsService;
   });
   afterEach(async () => {
-    await endPoolAndDropDb(pool, dbConfig, dbName);
+    await endPoolAndDropDb(clientProvider, dbConfig, dbName);
   });
 
   describe("createJustification", () => {

diff --git a/howdju-service-common/lib/daos/MediaExcerptsDao.test.ts b/howdju-service-common/lib/daos/MediaExcerptsDao.test.ts
@@ -1,11 +1,15 @@
-import { Pool } from "pg";
 import { merge, parseInt, toString } from "lodash";
 
 import { MomentConstructor, normalizeUrl, utcNow } from "howdju-common";
 import { expectToBeSameMomentDeep, mockLogger } from "howdju-test-common";
 
-import { endPoolAndDropDb, initDb, makeTestDbConfig } from "@/util/testUtil";
-import { Database, makePool } from "../database";
+import {
+  endPoolAndDropDb,
+  initDb,
+  makeTestClientProvider,
+  makeTestDbConfig,
+} from "@/util/testUtil";
+import { Database, PoolClientProvider } from "../database";
 import { MediaExcerptsDao, SourcesDao, UrlsDao } from "../daos";
 import { makeTestProvider } from "@/initializers/TestProvider";
 import TestHelper from "@/initializers/TestHelper";
@@ -15,7 +19,7 @@ const dbConfig = makeTestDbConfig();
 
 describe("MediaExcerptsDao", () => {
   let dbName: string;
-  let pool: Pool;
+  let clientProvider: PoolClientProvider;
   let database: Database;
 
   let dao: MediaExcerptsDao;
@@ -26,8 +30,11 @@ describe("MediaExcerptsDao", () => {
   beforeEach(async () => {
     dbName = await initDb(dbConfig);
 
-    pool = makePool(mockLogger, { ...dbConfig, database: dbName });
-    database = new Database(mockLogger, pool);
+    clientProvider = makeTestClientProvider({
+      ...dbConfig,
+      database: dbName,
+    });
+    database = new Database(mockLogger, clientProvider);
 
     const provider = makeTestProvider(database);
 
@@ -38,7 +45,7 @@ describe("MediaExcerptsDao", () => {
     testHelper = provider.testHelper;
   });
   afterEach(async () => {
-    await endPoolAndDropDb(pool, dbConfig, dbName);
+    await endPoolAndDropDb(clientProvider, dbConfig, dbName);
   });
 
   describe("readMediaExcerptForId", () => {

diff --git a/howdju-service-common/lib/daos/PersorgsDao.test.ts b/howdju-service-common/lib/daos/PersorgsDao.test.ts
@@ -1,9 +1,12 @@
-import { Pool } from "pg";
-
 import { mockLogger } from "howdju-test-common";
 
-import { endPoolAndDropDb, initDb, makeTestDbConfig } from "@/util/testUtil";
-import { Database, makePool } from "../database";
+import {
+  endPoolAndDropDb,
+  initDb,
+  makeTestClientProvider,
+  makeTestDbConfig,
+} from "@/util/testUtil";
+import { Database, PoolClientProvider } from "../database";
 import { makeTestProvider } from "@/initializers/TestProvider";
 import TestHelper from "@/initializers/TestHelper";
 import { PersorgsDao } from "./PersorgsDao";
@@ -13,24 +16,27 @@ const dbConfig = makeTestDbConfig();
 
 describe("PersorgsDao", () => {
   let dbName: string;
-  let pool: Pool;
+  let clientProvider: PoolClientProvider;
   let database: Database;
 
   let dao: PersorgsDao;
   let testHelper: TestHelper;
   beforeEach(async () => {
     dbName = await initDb(dbConfig);
 
-    pool = makePool(mockLogger, { ...dbConfig, database: dbName });
-    database = new Database(mockLogger, pool);
+    clientProvider = makeTestClientProvider({
+      ...dbConfig,
+      database: dbName,
+    });
+    database = new Database(mockLogger, clientProvider);
 
     const provider = makeTestProvider(database);
 
     dao = provider.persorgsDao;
     testHelper = provider.testHelper;
   });
   afterEach(async () => {
-    await endPoolAndDropDb(pool, dbConfig, dbName);
+    await endPoolAndDropDb(clientProvider, dbConfig, dbName);
   });
 
   describe("readEquivalentPersorg", () => {

diff --git a/howdju-service-common/lib/daos/PropositionsDao.test.ts b/howdju-service-common/lib/daos/PropositionsDao.test.ts
@@ -1,10 +1,13 @@
-import { Pool } from "pg";
-
 import { CreateProposition, utcNow } from "howdju-common";
 import { expectToBeSameMomentDeep, mockLogger } from "howdju-test-common";
 
-import { endPoolAndDropDb, initDb, makeTestDbConfig } from "@/util/testUtil";
-import { Database, makePool } from "../database";
+import {
+  endPoolAndDropDb,
+  initDb,
+  makeTestClientProvider,
+  makeTestDbConfig,
+} from "@/util/testUtil";
+import { Database, PoolClientProvider } from "../database";
 import { PropositionsDao } from "../daos";
 import { makeTestProvider } from "@/initializers/TestProvider";
 import TestHelper from "@/initializers/TestHelper";
@@ -13,23 +16,26 @@ const dbConfig = makeTestDbConfig();
 
 describe("PropositionsDao", () => {
   let dbName: string;
-  let pool: Pool;
+  let clientProvider: PoolClientProvider;
 
   let dao: PropositionsDao;
   let testHelper: TestHelper;
   beforeEach(async () => {
     dbName = await initDb(dbConfig);
 
-    pool = makePool(mockLogger, { ...dbConfig, database: dbName });
-    const database = new Database(mockLogger, pool);
+    clientProvider = makeTestClientProvider({
+      ...dbConfig,
+      database: dbName,
+    });
+    const database = new Database(mockLogger, clientProvider);
 
     const provider = makeTestProvider(database);
 
     dao = provider.propositionsDao;
     testHelper = provider.testHelper;
   });
   afterEach(async () => {
-    await endPoolAndDropDb(pool, dbConfig, dbName);
+    await endPoolAndDropDb(clientProvider, dbConfig, dbName);
   });
 
   describe("readPropositionByText", () => {

diff --git a/howdju-service-common/lib/daos/StatementsDao.test.ts b/howdju-service-common/lib/daos/StatementsDao.test.ts
@@ -1,20 +1,23 @@
-import { Pool } from "pg";
-
 import { CreatePersorg, CreateProposition, utcNow } from "howdju-common";
 import { mockLogger } from "howdju-test-common";
 
 import { StatementsDao } from "./StatementsDao";
-import { Database, makePool } from "../database";
+import { Database, PoolClientProvider } from "../database";
 import TestHelper from "@/initializers/TestHelper";
-import { endPoolAndDropDb, initDb, makeTestDbConfig } from "@/util/testUtil";
+import {
+  endPoolAndDropDb,
+  initDb,
+  makeTestClientProvider,
+  makeTestDbConfig,
+} from "@/util/testUtil";
 import { makeTestProvider } from "@/initializers/TestProvider";
 import { PersorgsService, PropositionsService } from "..";
 
 const dbConfig = makeTestDbConfig();
 
 describe("StatementsDao", () => {
   let dbName: string;
-  let pool: Pool;
+  let clientProvider: PoolClientProvider;
   let database: Database;
 
   let dao: StatementsDao;
@@ -24,8 +27,11 @@ describe("StatementsDao", () => {
   beforeEach(async () => {
     dbName = await initDb(dbConfig);
 
-    pool = makePool(mockLogger, { ...dbConfig, database: dbName });
-    database = new Database(mockLogger, pool);
+    clientProvider = makeTestClientProvider({
+      ...dbConfig,
+      database: dbName,
+    });
+    database = new Database(mockLogger, clientProvider);
 
     const provider = makeTestProvider(database);
 
@@ -35,7 +41,7 @@ describe("StatementsDao", () => {
     testHelper = provider.testHelper;
   });
   afterEach(async () => {
-    await endPoolAndDropDb(pool, dbConfig, dbName);
+    await endPoolAndDropDb(clientProvider, dbConfig, dbName);
   });
   describe("readStatementForId", () => {
     test("reads a statement for an ID", async () => {