fix: migrations should now use the same pg client as the rest of the …

…application
klarna-incubator · Nov 18, 2024 · 68b3764 · 68b3764
1 parent ba362dc
commit 68b3764
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 16 deletions.
diff --git a/api/jest.globalSetup.js b/api/jest.globalSetup.js
@@ -2,9 +2,13 @@ import { loadConfig } from "@gram/core/dist/config/index.js";
 import { registerConfiguration } from "@gram/core/dist/config/configMap.js";
 import { migrate } from "@gram/core/dist/data/Migration.js";
 import { testConfig } from "./dist/test-util/testConfig.js";
+import { DataAccessLayer } from "@gram/core/dist/data/dal.js";
+import { createPostgresPool } from "@gram/core/dist/data/postgres.js";
 
 export default async function setup() {
   registerConfiguration("test", testConfig);
   loadConfig();
-  await migrate();
-}
+  const pool = await createPostgresPool();
+  const dal = new DataAccessLayer(pool);  
+  await migrate(dal);
+}
diff --git a/api/src/util/sentry.ts b/api/src/util/sentry.ts
@@ -31,7 +31,7 @@ export function initSentry() {
   }
 
   // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const { nodeProfilingIntegration } = require("@sentry/profiling-node"); 
+  const { nodeProfilingIntegration } = require("@sentry/profiling-node");
 
   Sentry.init({
     release: `gram@${version}`,

diff --git a/core/jest.globalSetup.js b/core/jest.globalSetup.js
@@ -2,9 +2,13 @@ import { loadConfig } from "./dist/config/index.js";
 import { registerConfiguration } from "./dist/config/configMap.js";
 import { migrate } from "./dist/data/Migration.js";
 import { testConfig } from "./dist/test-util/testConfig.js";
+import { DataAccessLayer } from "./dist/data/dal.js";
+import { createPostgresPool } from "./dist/data/postgres.js";
 
 export default async function setup() {
   registerConfiguration("test", testConfig);
   loadConfig();
-  await migrate();
+  const pool = await createPostgresPool();
+  const dal = new DataAccessLayer(pool);  
+  await migrate(dal);
 }
diff --git a/core/src/bootstrap.ts b/core/src/bootstrap.ts
@@ -13,7 +13,7 @@ export async function bootstrap(): Promise<DataAccessLayer> {
   const dal = new DataAccessLayer(pool);
   const bt = new Bootstrapper(dal);
 
-  await migrate();
+  await migrate(dal);
 
   // Set https proxy for outgoing requests
   if (config.httpsProxy) {

diff --git a/core/src/data/Migration.ts b/core/src/data/Migration.ts
@@ -6,28 +6,39 @@ import {
 } from "postgres-migrations";
 import { config } from "../config/index.js";
 import { getDatabaseName } from "./postgres.js";
+import { DataAccessLayer } from "./dal.js";
+import { runCreateQuery } from "postgres-migrations/dist/create.js";
+import { Pool } from "pg";
 
 const log = log4js.getLogger("Migration");
 
 export class Migration {
   constructor(public folderPath: string, public pluginSuffix: string) {}
 
-  async migrate() {
+  async ensureDbExists(pool: Pool, databaseName: string) {
+    const result = await pool.query(
+      "SELECT 1 FROM pg_database WHERE datname=$1",
+      [databaseName]
+    );
+    if (result.rowCount !== 1) {
+      await runCreateQuery(databaseName, (msg: string) => log.debug(msg))(pool);
+    }
+  }
+
+  async migrate(dal: DataAccessLayer) {
     const host = await config.postgres.host.getValue();
     const databaseName = await getDatabaseName(this.pluginSuffix);
+    const pool = this.pluginSuffix
+      ? await dal.pluginPool(this.pluginSuffix)
+      : dal.pool._pool;
 
     log.info(
       `Starting migration for ${process.env.NODE_ENV} (${host} - ${databaseName})`
     );
 
-    const migrationConfig: MigrateDBConfig = {
-      database: databaseName,
-      port: parseInt((await config.postgres.port.getValue()) || "5432"),
-      host: (await config.postgres.host.getValue()) as string,
-      user: (await config.postgres.user.getValue()) as string,
-      password: (await config.postgres.password.getValue()) as string,
-      ensureDatabaseExists: true,
-    };
+    await this.ensureDbExists(pool, databaseName);
+
+    const migrationConfig: MigrateDBConfig = { client: pool };
 
     const migs = await postgresMigrate(migrationConfig, this.folderPath);
     migs.forEach((mig) => {
@@ -47,10 +58,10 @@ export const coreMigration = new Migration(
   ""
 );
 
-export async function migrate() {
+export async function migrate(dal: DataAccessLayer) {
   // Perform migrations
   const migrations = [coreMigration, ...(config.additionalMigrations || [])];
   for (const mig of migrations) {
-    await mig.migrate();
+    await mig.migrate(dal);
   }
 }