@budibase/server 2.0.30-alpha.0 → 2.0.30-alpha.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.30-alpha.0",
+  "version": "2.0.30-alpha.2",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.0.30-alpha.0",
-    "@budibase/client": "2.0.30-alpha.0",
-    "@budibase/pro": "2.0.29",
-    "@budibase/string-templates": "2.0.30-alpha.0",
-    "@budibase/types": "2.0.30-alpha.0",
+    "@budibase/backend-core": "2.0.30-alpha.2",
+    "@budibase/client": "2.0.30-alpha.2",
+    "@budibase/pro": "2.0.30-alpha.1",
+    "@budibase/string-templates": "2.0.30-alpha.2",
+    "@budibase/types": "2.0.30-alpha.2",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -199,5 +199,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "d0200a093e9d0030f1194c2b0084f775c76a7121"
+  "gitHead": "d5b65426c0d87bf44de3bd8ed396554387d55af4"
 }

package/src/api/controllers/deploy/index.ts

@@ -17,7 +17,6 @@ import {
   getProdAppDB,
   getDevAppDB,
 } from "@budibase/backend-core/context"
-import { quotas } from "@budibase/pro"
 import { events } from "@budibase/backend-core"
 
 // the max time we can wait for an invalidation to complete before considering it failed

package/src/api/controllers/query/index.ts

@@ -56,6 +56,7 @@ const _import = async (ctx: any) => {
       config: {
         url: info.url,
         defaultHeaders: [],
+        rejectUnauthorized: true,
       },
       name: info.name,
     }

package/src/integrations/rest.ts

@@ -78,16 +78,11 @@ const SCHEMA: Integration = {
       default: {},
     },
     rejectUnauthorized: {
+      display: "Reject Unauthorized",
       type: DatasourceFieldType.BOOLEAN,
       default: true,
       required: false,
     },
-    legacyHttpParser: {
-      display: "Legacy HTTP Support",
-      type: DatasourceFieldType.BOOLEAN,
-      required: false,
-      default: false,
-    },
   },
   query: {
     create: {
@@ -397,6 +392,7 @@ class RestIntegration implements IntegrationBase {
       })
     }
 
+    // Deprecated by rejectUnauthorized
     if (this.config.legacyHttpParser) {
       // https://github.com/nodejs/node/issues/43798
       input.extraHttpOptions = { insecureHTTPParser: true }

package/src/integrations/tests/rest.spec.ts

@@ -1,17 +1,16 @@
-jest.mock("node-fetch", () =>
-  jest.fn(() => ({
-    headers: {
-      raw: () => {
-        return { "content-type": ["application/json"] }
-      },
-      get: () => ["application/json"],
+const mockFetch = jest.fn(() => ({
+  headers: {
+    raw: () => {
+      return { "content-type": ["application/json"] }
     },
-    json: jest.fn(() => ({
-      my_next_cursor: 123,
-    })),
-    text: jest.fn(),
-  }))
-)
+    get: () => ["application/json"],
+  },
+  json: jest.fn(() => ({
+    my_next_cursor: 123,
+  })),
+  text: jest.fn(),
+}))
+jest.mock("node-fetch", () => mockFetch)
 import fetch from "node-fetch"
 import { default as RestIntegration } from "../rest"
 const FormData = require("form-data")
@@ -572,4 +571,21 @@ describe("REST Integration", () => {
       })
     })
   })
+
+  it("Attaches custom agent when Reject Unauthorized option is false", async () => {
+    config = new TestConfiguration({
+      url: BASE_URL,
+      rejectUnauthorized: false,
+    })
+    await config.integration.read({})
+
+    const calls: any = mockFetch.mock.calls[0]
+    const url = calls[0]
+    expect(url).toBe(`${BASE_URL}/`)
+
+    const calledConfig = calls[1]
+    expect(calledConfig.method).toBe("GET")
+    expect(calledConfig.headers).toEqual({})
+    expect(calledConfig.agent.options.rejectUnauthorized).toBe(false)
+  })
 })

package/src/migrations/index.ts

@@ -1,5 +1,11 @@
-import { migrations, redis } from "@budibase/backend-core"
-import { Migration, MigrationOptions, MigrationName } from "@budibase/types"
+import { locks, migrations } from "@budibase/backend-core"
+import {
+  Migration,
+  MigrationOptions,
+  MigrationName,
+  LockType,
+  LockName,
+} from "@budibase/types"
 import env from "../environment"
 
 // migration functions
@@ -86,33 +92,14 @@ export const migrate = async (options?: MigrationOptions) => {
 }
 
 const migrateWithLock = async (options?: MigrationOptions) => {
-  // get a new lock client
-  const redlock = await redis.clients.getMigrationsRedlock()
-  // lock for 15 minutes
-  const ttl = 1000 * 60 * 15
-
-  let migrationLock
-
-  // acquire lock
-  try {
-    migrationLock = await redlock.lock("migrations", ttl)
-  } catch (e: any) {
-    if (e.name === "LockError") {
-      return
-    } else {
-      throw e
+  await locks.doWithLock(
+    {
+      type: LockType.TRY_ONCE,
+      name: LockName.MIGRATIONS,
+      ttl: 1000 * 60 * 15, // auto expire the migration lock after 15 minutes
+    },
+    async () => {
+      await migrations.runMigrations(MIGRATIONS, options)
     }
-  }
-
-  // run migrations
-  try {
-    await migrations.runMigrations(MIGRATIONS, options)
-  } finally {
-    // release lock
-    try {
-      await migrationLock.unlock()
-    } catch (e) {
-      console.error("unable to release migration lock")
-    }
-  }
+  )
 }