From 056d65cb1e6d08c4d138845da795a27f610db6da Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 3 Jul 2024 15:07:35 +0100 Subject: [PATCH] Splitting app migrations for SQS into their own environment variable so that they can be enabled separately. --- packages/server/src/appMigrations/migrations.ts | 2 +- .../appMigrations/migrations/20240604153647_initial_sqs.ts | 2 +- .../migrations/tests/20240604153647_initial_sqs.spec.ts | 4 ++-- packages/server/src/environment.ts | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/server/src/appMigrations/migrations.ts b/packages/server/src/appMigrations/migrations.ts index 14eb9d0923..aeb4844751 100644 --- a/packages/server/src/appMigrations/migrations.ts +++ b/packages/server/src/appMigrations/migrations.ts @@ -10,6 +10,6 @@ export const MIGRATIONS: AppMigration[] = [ { id: "20240604153647_initial_sqs", func: m20240604153647_initial_sqs, - disabled: !env.SQS_SEARCH_ENABLE, + disabled: !env.SQS_MIGRATION_ENABLE, }, ] diff --git a/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts b/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts index 800de1418a..6ac0fc2523 100644 --- a/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts +++ b/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts @@ -40,7 +40,7 @@ const migration = async () => { // only do initial search if environment is using SQS already // initial search makes sure that all the indexes have been created // and are ready to use, avoiding any initial waits for large tables - if (env.SQS_SEARCH_ENABLE) { + if (env.SQS_MIGRATION_ENABLE) { const tables = await sdk.tables.getAllInternalTables() // do these one by one - running in parallel could cause problems for (let table of tables) { diff --git a/packages/server/src/appMigrations/migrations/tests/20240604153647_initial_sqs.spec.ts b/packages/server/src/appMigrations/migrations/tests/20240604153647_initial_sqs.spec.ts index 572e694855..08393378fb 100644 --- a/packages/server/src/appMigrations/migrations/tests/20240604153647_initial_sqs.spec.ts +++ b/packages/server/src/appMigrations/migrations/tests/20240604153647_initial_sqs.spec.ts @@ -67,11 +67,11 @@ function oldLinkDocument(): Omit { } async function sqsDisabled(cb: () => Promise) { - await config.withEnv({ SQS_SEARCH_ENABLE: "" }, cb) + await config.withEnv({ SQS_MIGRATION_ENABLE: "" }, cb) } async function sqsEnabled(cb: () => Promise) { - await config.withEnv({ SQS_SEARCH_ENABLE: "1" }, cb) + await config.withEnv({ SQS_MIGRATION_ENABLE: "1" }, cb) } beforeAll(async () => { diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts index 341483d861..c6123852fd 100644 --- a/packages/server/src/environment.ts +++ b/packages/server/src/environment.ts @@ -92,6 +92,7 @@ const environment = { SQL_LOGGING_ENABLE: process.env.SQL_LOGGING_ENABLE, SQL_ALIASING_DISABLE: process.env.SQL_ALIASING_DISABLE, SQS_SEARCH_ENABLE: process.env.SQS_SEARCH_ENABLE, + SQS_MIGRATION_ENABLE: process.env.SQS_MIGRATION_ENABLE, // flags ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS, DISABLE_THREADING: process.env.DISABLE_THREADING,