@budibase/worker 2.3.16 → 2.3.17-alpha.1

package/src/elasticApm.ts

@@ -0,0 +1,10 @@
+import apm from "elastic-apm-node"
+
+// enable APM if configured
+if (process.env.ELASTIC_APM_ENABLED) {
+  console.log("Starting elastic-apm-node")
+  apm.start({
+    serviceName: process.env.SERVICE,
+    environment: process.env.BUDIBASE_ENVIRONMENT,
+  })
+}

package/src/index.ts

@@ -1,14 +1,13 @@
-// need to load environment first
-import env from "./environment"
+if (process.env.DD_APM_ENABLED) {
+  require("./ddApm")
+}
 
-// enable APM if configured
 if (process.env.ELASTIC_APM_ENABLED) {
-  const apm = require("elastic-apm-node").start({
-    serviceName: process.env.SERVICE,
-    environment: process.env.BUDIBASE_ENVIRONMENT,
-  })
+  require("./elasticApm")
 }
 
+// need to load environment first
+import env from "./environment"
 import { Scope } from "@sentry/node"
 import { Event } from "@sentry/types/dist/event"
 import Application from "koa"

package/src/sdk/users/users.ts

@@ -264,7 +264,6 @@ export const save = async (
     builtUser._rev = response.rev
 
     await eventHelpers.handleSaveEvents(builtUser, dbUser)
-    await addTenant(tenantId, _id, email)
     await cache.user.invalidateUser(response.id)
 
     // let server know to sync user

package/src/tests/TestConfiguration.ts

@@ -20,22 +20,44 @@ import {
   auth,
   constants,
   env as coreEnv,
+  DEFAULT_TENANT_ID,
 } from "@budibase/backend-core"
-import structures, { TENANT_ID, TENANT_1, CSRF_TOKEN } from "./structures"
+import structures, { TENANT_ID, CSRF_TOKEN } from "./structures"
 import { CreateUserResponse, User, AuthToken } from "@budibase/types"
 import API from "./api"
+import sdk from "../sdk"
 
 enum Mode {
   CLOUD = "cloud",
   SELF = "self",
 }
 
+async function retry<T extends (...arg0: any[]) => any>(
+  fn: T,
+  maxTry: number = 5,
+  retryCount = 1
+): Promise<Awaited<ReturnType<T>>> {
+  const currRetry = typeof retryCount === "number" ? retryCount : 1
+  try {
+    const result = await fn()
+    return result
+  } catch (e) {
+    console.log(`Retry ${currRetry} failed.`)
+    if (currRetry > maxTry) {
+      console.log(`All ${maxTry} retry attempts exhausted`)
+      throw e
+    }
+    return retry(fn, maxTry, currRetry + 1)
+  }
+}
+
 class TestConfiguration {
   server: any
   request: any
   api: API
   defaultUser?: User
   tenant1User?: User
+  #tenantId?: string
 
   constructor(
     opts: { openServer: boolean; mode: Mode } = {
@@ -112,13 +134,21 @@ class TestConfiguration {
   // SETUP / TEARDOWN
 
   async beforeAll() {
-    await this.createDefaultUser()
-    await this.createSession(this.defaultUser!)
+    try {
+      this.#tenantId = structures.tenant.id()
 
-    await tenancy.doInTenant(TENANT_1, async () => {
-      await this.createTenant1User()
-      await this.createSession(this.tenant1User!)
-    })
+      // Running tests in parallel causes issues creating the globaldb twice. This ensures the db is properly created before starting
+      await retry(async () => await this.createDefaultUser())
+      await this.createSession(this.defaultUser!)
+
+      await tenancy.doInTenant(this.#tenantId, async () => {
+        await this.createTenant1User()
+        await this.createSession(this.tenant1User!)
+      })
+    } catch (e: any) {
+      console.log(e)
+      throw new Error(e.message)
+    }
   }
 
   async afterAll() {
@@ -133,6 +163,8 @@ class TestConfiguration {
     // create user / new tenant
     const res = await this.api.users.createAdminUser()
 
+    await sdk.users.addTenant(res.tenantId, res.userId, res.email)
+
     // return the created user
     const userRes = await this.api.users.getUser(res.userId, {
       headers: {
@@ -152,7 +184,7 @@ class TestConfiguration {
     try {
       return tenancy.getTenantId()
     } catch (e: any) {
-      return TENANT_ID
+      return DEFAULT_TENANT_ID
     }
   }
 
@@ -203,7 +235,7 @@ class TestConfiguration {
     const tenantId = this.getTenantId()
     if (tenantId === TENANT_ID) {
       return this.authHeaders(this.defaultUser!)
-    } else if (tenantId === TENANT_1) {
+    } else if (tenantId === this.getTenantId()) {
       return this.authHeaders(this.tenant1User!)
     } else {
       throw new Error("could not determine auth headers to use")
@@ -222,7 +254,6 @@ class TestConfiguration {
 
   async createDefaultUser() {
     const user = structures.users.adminUser({
-      email: "test@test.com",
       password: "test",
     })
     this.defaultUser = await this.createUser(user)
@@ -230,7 +261,6 @@ class TestConfiguration {
 
   async createTenant1User() {
     const user = structures.users.adminUser({
-      email: "tenant1@test.com",
       password: "test",
     })
     this.tenant1User = await this.createUser(user)

package/src/tests/api/auth.ts

@@ -1,3 +1,4 @@
+import structures from "../structures"
 import TestConfiguration from "../TestConfiguration"
 import { TestAPI } from "./base"
 
@@ -24,14 +25,17 @@ export class AuthAPI extends TestAPI {
       .expect(200)
   }
 
-  requestPasswordReset = async (sendMailMock: any) => {
+  requestPasswordReset = async (sendMailMock: any, userEmail: string) => {
     await this.config.saveSmtpConfig()
     await this.config.saveSettingsConfig()
-    await this.config.createUser()
+    await this.config.createUser({
+      ...structures.users.user(),
+      email: userEmail,
+    })
     const res = await this.request
       .post(`/api/global/auth/${this.config.getTenantId()}/reset`)
       .send({
-        email: "test@test.com",
+        email: userEmail,
       })
       .expect("Content-Type", /json/)
       .expect(200)

package/src/tests/api/configs.ts

@@ -10,8 +10,8 @@ export class ConfigAPI extends TestAPI {
     return this.request
       .get(`/api/global/configs/checklist`)
       .set(this.config.defaultHeaders())
-      .expect("Content-Type", /json/)
       .expect(200)
+      .expect("Content-Type", /json/)
   }
 
   saveConfig = (data: any) => {
@@ -19,8 +19,8 @@ export class ConfigAPI extends TestAPI {
       .post(`/api/global/configs`)
       .send(data)
       .set(this.config.defaultHeaders())
-      .expect("Content-Type", /json/)
       .expect(200)
+      .expect("Content-Type", /json/)
   }
 
   OIDCCallback = (configId: string, preAuthRes: any) => {

package/src/tests/api/users.ts

@@ -26,8 +26,8 @@ export class UserAPI extends TestAPI {
         email,
       })
       .set(this.config.defaultHeaders())
-      .expect("Content-Type", /json/)
       .expect(status)
+      .expect("Content-Type", /json/)
 
     if (status !== 200) {
       return { code: undefined, res }
@@ -100,7 +100,7 @@ export class UserAPI extends TestAPI {
       request = {
         email: structures.email(),
         password: generator.string(),
-        tenantId: structures.uuid(),
+        tenantId: structures.tenant.id(),
       }
     }
     const res = await this.request

package/src/tests/jestSetup.ts

@@ -1,4 +1,7 @@
-import { mocks } from "@budibase/backend-core/tests"
+import { mocks, testContainerUtils } from "@budibase/backend-core/tests"
+
+import env from "../environment"
+import { env as coreEnv } from "@budibase/backend-core"
 
 // must explicitly enable fetch mock
 mocks.fetch.enable()
@@ -15,5 +18,9 @@ if (!process.env.DEBUG) {
 if (!process.env.CI) {
   // set a longer timeout in dev for debugging
   // 100 seconds
-  jest.setTimeout(100000)
+  jest.setTimeout(100 * 1000)
+} else {
+  jest.setTimeout(10 * 1000)
 }
+
+testContainerUtils.setupEnv(env, coreEnv)

package/src/tests/structures/index.ts

@@ -5,7 +5,6 @@ import * as groups from "./groups"
 import { v4 as uuid } from "uuid"
 
 export const TENANT_ID = "default"
-export const TENANT_1 = "tenant1"
 export const CSRF_TOKEN = "e3727778-7af0-4226-b5eb-f43cbe60a306"
 
 const pkg = {
@@ -14,7 +13,6 @@ const pkg = {
   configs,
   users,
   TENANT_ID,
-  TENANT_1,
   CSRF_TOKEN,
   groups,
 }