@budibase/worker 3.2.45 → 3.2.47

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "3.2.45",
+  "version": "3.2.47",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -114,5 +114,5 @@
       }
     }
   },
-  "gitHead": "a636af7d5f402da86321a48f64745fefd2f9d4a1"
+  "gitHead": "b05548bb07650275f45856cff116a59b5e78f5d3"
 }

package/src/api/controllers/global/users.ts

@@ -28,7 +28,6 @@ import {
   LockType,
   LookupAccountHolderResponse,
   LookupTenantUserResponse,
-  MigrationType,
   PlatformUserByEmail,
   SaveUserResponse,
   SearchUsersRequest,
@@ -45,7 +44,6 @@ import {
   cache,
   ErrorCode,
   events,
-  migrations,
   platform,
   tenancy,
   db,
@@ -187,10 +185,6 @@ export const adminUser = async (
   if (env.MULTI_TENANCY) {
     // store the new tenant record in the platform db
     await platform.tenants.addTenant(tenantId)
-    await migrations.backPopulateMigrations({
-      type: MigrationType.GLOBAL,
-      tenantId,
-    })
   }
 
   await tenancy.doInTenant(tenantId, async () => {

package/src/api/routes/index.ts

@@ -12,7 +12,6 @@ import tenantsRoutes from "./system/tenants"
 import statusRoutes from "./system/status"
 import selfRoutes from "./global/self"
 import licenseRoutes from "./global/license"
-import migrationRoutes from "./system/migrations"
 import accountRoutes from "./system/accounts"
 import restoreRoutes from "./system/restore"
 import systemLogRoutes from "./system/logs"
@@ -34,7 +33,6 @@ export const routes: Router[] = [
   licenseRoutes,
   pro.groups,
   pro.auditLogs,
-  migrationRoutes,
   accountRoutes,
   restoreRoutes,
   eventRoutes,

package/src/tests/api/index.ts

@@ -6,7 +6,6 @@ import { EmailAPI } from "./email"
 import { SelfAPI } from "./self"
 import { UserAPI } from "./users"
 import { EnvironmentAPI } from "./environment"
-import { MigrationAPI } from "./migrations"
 import { StatusAPI } from "./status"
 import { RestoreAPI } from "./restore"
 import { TenantAPI } from "./tenants"
@@ -26,7 +25,6 @@ export default class API {
   self: SelfAPI
   users: UserAPI
   environment: EnvironmentAPI
-  migrations: MigrationAPI
   status: StatusAPI
   restore: RestoreAPI
   tenants: TenantAPI
@@ -46,7 +44,6 @@ export default class API {
     this.self = new SelfAPI(config)
     this.users = new UserAPI(config)
     this.environment = new EnvironmentAPI(config)
-    this.migrations = new MigrationAPI(config)
     this.status = new StatusAPI(config)
     this.restore = new RestoreAPI(config)
     this.tenants = new TenantAPI(config)

package/src/api/controllers/system/migrations.ts

@@ -1,23 +0,0 @@
-import {
-  FetchMigrationDefinitionsResponse,
-  RunGlobalMigrationRequest,
-  RunGlobalMigrationResponse,
-  UserCtx,
-} from "@budibase/types"
-
-const { migrate, MIGRATIONS } = require("../../../migrations")
-
-export const runMigrations = async (
-  ctx: UserCtx<RunGlobalMigrationRequest, RunGlobalMigrationResponse>
-) => {
-  const options = ctx.request.body
-  // don't await as can take a while, just return
-  migrate(options)
-  ctx.body = { message: "Migration started." }
-}
-
-export const fetchDefinitions = async (
-  ctx: UserCtx<void, FetchMigrationDefinitionsResponse>
-) => {
-  ctx.body = MIGRATIONS
-}

package/src/api/routes/system/migrations.ts

@@ -1,19 +0,0 @@
-import Router from "@koa/router"
-import * as migrationsController from "../../controllers/system/migrations"
-import { auth } from "@budibase/backend-core"
-
-const router: Router = new Router()
-
-router
-  .post(
-    "/api/system/migrations/run",
-    auth.internalApi,
-    migrationsController.runMigrations
-  )
-  .get(
-    "/api/system/migrations/definitions",
-    auth.internalApi,
-    migrationsController.fetchDefinitions
-  )
-
-export default router

package/src/api/routes/system/tests/migrations.spec.ts

@@ -1,63 +0,0 @@
-const migrateFn = jest.fn()
-
-import { TestConfiguration } from "../../../../tests"
-
-jest.mock("../../../../migrations", () => {
-  return {
-    ...jest.requireActual("../../../../migrations"),
-    migrate: migrateFn,
-  }
-})
-
-describe("/api/system/migrations", () => {
-  const config = new TestConfiguration()
-
-  beforeAll(async () => {
-    await config.beforeAll()
-  })
-
-  afterAll(async () => {
-    await config.afterAll()
-  })
-
-  afterEach(() => {
-    jest.clearAllMocks()
-  })
-
-  describe("POST /api/system/migrations/run", () => {
-    it("fails with no internal api key", async () => {
-      const res = await config.api.migrations.runMigrations({
-        headers: {},
-        status: 403,
-      })
-      expect(res.body).toEqual({ message: "Unauthorized", status: 403 })
-      expect(migrateFn).toHaveBeenCalledTimes(0)
-    })
-
-    it("runs migrations", async () => {
-      const res = await config.api.migrations.runMigrations()
-      expect(res.body.message).toBeDefined()
-      expect(migrateFn).toHaveBeenCalledTimes(1)
-    })
-  })
-
-  describe("DELETE /api/system/migrations/definitions", () => {
-    it("fails with no internal api key", async () => {
-      const res = await config.api.migrations.getMigrationDefinitions({
-        headers: {},
-        status: 403,
-      })
-      expect(res.body).toEqual({ message: "Unauthorized", status: 403 })
-    })
-
-    it("returns definitions", async () => {
-      const res = await config.api.migrations.getMigrationDefinitions()
-      expect(res.body).toEqual([
-        {
-          name: "global_info_sync_users",
-          type: "global",
-        },
-      ])
-    })
-  })
-})

package/src/migrations/index.ts

@@ -1,62 +0,0 @@
-import { migrations, locks } from "@budibase/backend-core"
-import {
-  Migration,
-  MigrationOptions,
-  MigrationName,
-  LockType,
-  LockName,
-} from "@budibase/types"
-import env from "../environment"
-
-// migration functions
-import * as syncUserInfo from "./functions/globalInfoSyncUsers"
-
-/**
- * Populate the migration function and additional configuration from
- * the static migration definitions.
- */
-export const buildMigrations = () => {
-  const definitions = migrations.DEFINITIONS
-  const workerMigrations: Migration[] = []
-
-  for (const definition of definitions) {
-    switch (definition.name) {
-      case MigrationName.GLOBAL_INFO_SYNC_USERS: {
-        // only needed in cloud
-        if (!env.SELF_HOSTED) {
-          workerMigrations.push({
-            ...definition,
-            fn: syncUserInfo.run,
-          })
-        }
-        break
-      }
-    }
-  }
-
-  return workerMigrations
-}
-
-export const MIGRATIONS = buildMigrations()
-
-export const migrate = async (options?: MigrationOptions) => {
-  if (env.SELF_HOSTED) {
-    await migrateWithLock(options)
-  } else {
-    await migrations.runMigrations(MIGRATIONS, options)
-  }
-}
-
-const migrateWithLock = async (options?: MigrationOptions) => {
-  await locks.doWithLock(
-    {
-      type: LockType.TRY_ONCE,
-      name: LockName.MIGRATIONS,
-      ttl: 1000 * 60 * 15, // auto expire the migration lock after 15 minutes
-      systemLock: true,
-    },
-    async () => {
-      await migrations.runMigrations(MIGRATIONS, options)
-    }
-  )
-}

package/src/tests/api/migrations.ts

@@ -1,17 +0,0 @@
-import { TestAPI, TestAPIOpts } from "./base"
-
-export class MigrationAPI extends TestAPI {
-  runMigrations = (opts?: TestAPIOpts) => {
-    return this.request
-      .post(`/api/system/migrations/run`)
-      .set(opts?.headers ? opts.headers : this.config.internalAPIHeaders())
-      .expect(opts?.status ? opts.status : 200)
-  }
-
-  getMigrationDefinitions = (opts?: TestAPIOpts) => {
-    return this.request
-      .get(`/api/system/migrations/definitions`)
-      .set(opts?.headers ? opts.headers : this.config.internalAPIHeaders())
-      .expect(opts?.status ? opts.status : 200)
-  }
-}