fix: do not cache tenant config on migration error

Author: thebengeu

src/utils/migrate.ts

@@ -4,11 +4,7 @@ import { getConfig } from './config'
 
 const { multitenantDatabaseUrl } = getConfig()
 
-async function connectAndMigrate(
-  databaseUrl: string | undefined,
-  migrationsDirectory: string,
-  logOnError = false
-) {
+async function connectAndMigrate(databaseUrl: string | undefined, migrationsDirectory: string) {
   const dbConfig = {
     connectionString: databaseUrl,
     connectionTimeoutMillis: 1000,
@@ -17,12 +13,6 @@ async function connectAndMigrate(
   try {
     await client.connect()
     await migrate({ client }, migrationsDirectory)
-  } catch (error) {
-    if (logOnError) {
-      console.error('Migration error:', error.message)
-    } else {
-      throw error
-    }
   } finally {
     await client.end()
   }
@@ -41,5 +31,5 @@ export async function runMultitenantMigrations(): Promise<void> {
 }
 
 export async function runMigrationsOnTenant(databaseUrl: string): Promise<void> {
-  await connectAndMigrate(databaseUrl, './migrations/tenant', true)
+  await connectAndMigrate(databaseUrl, './migrations/tenant')
 }

src/utils/tenant.ts

@@ -14,9 +14,19 @@ const tenantConfigCache = new Map<string, TenantConfig>()
 
 export async function cacheTenantConfigAndRunMigrations(
   tenantId: string,
-  config: TenantConfig
+  config: TenantConfig,
+  logOnError = false
 ): Promise<void> {
-  await runMigrationsOnTenant(config.databaseUrl)
+  try {
+    await runMigrationsOnTenant(config.databaseUrl)
+  } catch (error) {
+    if (logOnError) {
+      console.error('Migration error:', error.message)
+      return
+    } else {
+      throw error
+    }
+  }
   tenantConfigCache.set(tenantId, config)
 }
 
@@ -30,12 +40,16 @@ export async function cacheTenantConfigsFromDbAndRunMigrations(): Promise<void>
   await Promise.all(
     tenants.map(({ id, anon_key, database_url, jwt_secret, service_key }) =>
       limit(() =>
-        cacheTenantConfigAndRunMigrations(id, {
-          anonKey: decrypt(anon_key),
-          databaseUrl: decrypt(database_url),
-          jwtSecret: decrypt(jwt_secret),
-          serviceKey: decrypt(service_key),
-        })
+        cacheTenantConfigAndRunMigrations(
+          id,
+          {
+            anonKey: decrypt(anon_key),
+            databaseUrl: decrypt(database_url),
+            jwtSecret: decrypt(jwt_secret),
+            serviceKey: decrypt(service_key),
+          },
+          true
+        )
       )
     )
   )