From 66789888ace6c636aa63e1db930d7f72ed83bfe1 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 11 Jun 2024 11:23:52 +0100
Subject: [PATCH 1/2] Caching is making testing difficult - want to confirm app
 migrations are doing what they are expected to do

---
 packages/server/src/appMigrations/appMigrationMetadata.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/appMigrations/appMigrationMetadata.ts b/packages/server/src/appMigrations/appMigrationMetadata.ts
index 613f46cf3d..54edd826c3 100644
--- a/packages/server/src/appMigrations/appMigrationMetadata.ts
+++ b/packages/server/src/appMigrations/appMigrationMetadata.ts
@@ -26,9 +26,9 @@ export async function getAppMigrationVersion(appId: string): Promise<string> {
   let metadata: AppMigrationDoc | undefined = await cache.get(cacheKey)
 
   // We don't want to cache in dev, in order to be able to tweak it
-  if (metadata && !env.isDev()) {
-    return metadata.version
-  }
+  // if (metadata && !env.isDev()) {
+  //   return metadata.version
+  // }
 
   let version
   try {

From 334334bbcdd5057fff4edc11bccbebc74dc2cd39 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 11 Jun 2024 12:13:18 +0100
Subject: [PATCH 2/2] Adding a check for QA.

---
 packages/backend-core/src/environment.ts                  | 6 ++++++
 packages/server/src/appMigrations/appMigrationMetadata.ts | 8 ++++----
 packages/server/src/startup/index.ts                      | 6 +++++-
 packages/worker/src/environment.ts                        | 1 +
 packages/worker/src/index.ts                              | 6 +++++-
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index 1e7da2f9a2..c84a162ab6 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -93,15 +93,21 @@ function isApps() {
   return environment.SERVICE_TYPE === ServiceType.APPS
 }
 
+function isQA() {
+  return environment.BUDIBASE_ENVIRONMENT === "QA"
+}
+
 const environment = {
   isTest,
   isJest,
   isDev,
   isWorker,
   isApps,
+  isQA,
   isProd: () => {
     return !isDev()
   },
+  BUDIBASE_ENVIRONMENT: process.env.BUDIBASE_ENVIRONMENT,
   JS_BCRYPT: process.env.JS_BCRYPT,
   JWT_SECRET: process.env.JWT_SECRET,
   JWT_SECRET_FALLBACK: process.env.JWT_SECRET_FALLBACK,
diff --git a/packages/server/src/appMigrations/appMigrationMetadata.ts b/packages/server/src/appMigrations/appMigrationMetadata.ts
index 54edd826c3..a9a75bc104 100644
--- a/packages/server/src/appMigrations/appMigrationMetadata.ts
+++ b/packages/server/src/appMigrations/appMigrationMetadata.ts
@@ -25,10 +25,10 @@ export async function getAppMigrationVersion(appId: string): Promise<string> {
 
   let metadata: AppMigrationDoc | undefined = await cache.get(cacheKey)
 
-  // We don't want to cache in dev, in order to be able to tweak it
-  // if (metadata && !env.isDev()) {
-  //   return metadata.version
-  // }
+  // We don't want to cache in dev or QA, in order to be able to tweak it
+  if (metadata && !env.isDev() && !env.isQA()) {
+    return metadata.version
+  }
 
   let version
   try {
diff --git a/packages/server/src/startup/index.ts b/packages/server/src/startup/index.ts
index c14ec0ca1b..7f244f6573 100644
--- a/packages/server/src/startup/index.ts
+++ b/packages/server/src/startup/index.ts
@@ -72,7 +72,11 @@ export async function startup(
   printFeatures()
   STARTUP_RAN = true
   if (app && server && !env.CLUSTER_MODE) {
-    console.log(`Budibase running on ${JSON.stringify(server.address())}`)
+    let startupLog = `Budibase running on ${JSON.stringify(server.address())}`
+    if (env.BUDIBASE_ENVIRONMENT) {
+      startupLog = `${startupLog} - environment: "${env.BUDIBASE_ENVIRONMENT}"`
+    }
+    console.log(startupLog)
     const address = server.address() as AddressInfo
     env._set("PORT", address.port)
   }
diff --git a/packages/worker/src/environment.ts b/packages/worker/src/environment.ts
index 70fb911ee1..d0f5e1fb67 100644
--- a/packages/worker/src/environment.ts
+++ b/packages/worker/src/environment.ts
@@ -46,6 +46,7 @@ const environment = {
   SMTP_FALLBACK_ENABLED: process.env.SMTP_FALLBACK_ENABLED,
   DISABLE_DEVELOPER_LICENSE: process.env.DISABLE_DEVELOPER_LICENSE,
   SQS_SEARCH_ENABLE: process.env.SQS_SEARCH_ENABLE,
+  BUDIBASE_ENVIRONMENT: process.env.BUDIBASE_ENVIRONMENT,
   // smtp
   SMTP_USER: process.env.SMTP_USER,
   SMTP_PASSWORD: process.env.SMTP_PASSWORD,
diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
index 4e770c6ecb..85e5d6ad2e 100644
--- a/packages/worker/src/index.ts
+++ b/packages/worker/src/index.ts
@@ -88,7 +88,11 @@ const shutdown = () => {
 }
 
 export default server.listen(parseInt(env.PORT || "4002"), async () => {
-  console.log(`Worker running on ${JSON.stringify(server.address())}`)
+  let startupLog = `Worker running on ${JSON.stringify(server.address())}`
+  if (env.BUDIBASE_ENVIRONMENT) {
+    startupLog = `${startupLog} - environment: "${env.BUDIBASE_ENVIRONMENT}"`
+  }
+  console.log(startupLog)
   await initPro()
   await redis.clients.init()
   cache.docWritethrough.init()