@budibase/server 1.2.51 → 1.2.54

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.2.51",
+  "version": "1.2.54",
   "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": "^1.2.51",
-    "@budibase/client": "^1.2.51",
-    "@budibase/pro": "1.2.50",
-    "@budibase/string-templates": "^1.2.51",
-    "@budibase/types": "^1.2.51",
+    "@budibase/backend-core": "^1.2.54",
+    "@budibase/client": "^1.2.54",
+    "@budibase/pro": "1.2.53",
+    "@budibase/string-templates": "^1.2.54",
+    "@budibase/types": "^1.2.54",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -99,6 +99,7 @@
     "curlconverter": "3.21.0",
     "dotenv": "8.2.0",
     "download": "8.0.0",
+    "elastic-apm-node": "3.38.0",
     "fix-path": "3.0.0",
     "form-data": "4.0.0",
     "fs-extra": "8.1.0",
@@ -195,5 +196,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "910759bebb2b6430a3284f9d18ecb93ff2114eaf"
+  "gitHead": "af896d37aa6407f5a2f5f1478f7e61a72f20e3fe"
 }

package/src/app.ts

@@ -1,6 +1,15 @@
 // need to load environment first
-import { ExtendableContext } from "koa"
 import * as env from "./environment"
+
+// 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,
+  })
+}
+
+import { ExtendableContext } from "koa"
 import db from "./db"
 db.init()
 const Koa = require("koa")

package/src/db/dynamoClient.js

@@ -103,11 +103,9 @@ class Table {
 
 exports.init = endpoint => {
   let AWS = require("aws-sdk")
-  AWS.config.update({
-    region: AWS_REGION,
-  })
   let docClientParams = {
     correctClockSkew: true,
+    region: AWS_REGION,
   }
   if (endpoint) {
     docClientParams.endpoint = endpoint

package/src/environment.js

@@ -13,10 +13,7 @@ function isJest() {
 }
 
 function isDev() {
-  return (
-    process.env.NODE_ENV !== "production" &&
-    process.env.BUDIBASE_ENVIRONMENT !== "production"
-  )
+  return process.env.NODE_ENV !== "production"
 }
 
 function isCypress() {

package/src/integrations/dynamodb.ts

@@ -13,7 +13,8 @@ module DynamoModule {
     region: string
     accessKeyId: string
     secretAccessKey: string
-    endpoint: string
+    endpoint?: string
+    currentClockSkew?: boolean
   }
 
   const SCHEMA: Integration = {
@@ -132,31 +133,20 @@ module DynamoModule {
 
     constructor(config: DynamoDBConfig) {
       this.config = config
-      if (this.config.endpoint && !this.config.endpoint.includes("localhost")) {
-        this.connect()
-      }
-      let options = {
-        correctClockSkew: true,
-        region: this.config.region || AWS_REGION,
-        endpoint: config.endpoint ? config.endpoint : undefined,
-      }
-      this.client = new AWS.DynamoDB.DocumentClient(options)
-    }
-
-    end() {
-      this.disconnect()
-    }
 
-    connect() {
-      AWS.config.update(this.config)
-    }
+      // User is using a local dynamoDB endpoint, don't auth with remote
+      if (this.config?.endpoint?.includes("localhost")) {
+        // @ts-ignore
+        this.config = {}
+      }
 
-    disconnect() {
-      AWS.config.update({
-        secretAccessKey: undefined,
-        accessKeyId: undefined,
-        region: AWS_REGION,
-      })
+      this.config = {
+        ...this.config,
+        currentClockSkew: true,
+        region: config.region || AWS_REGION,
+        endpoint: config.endpoint || undefined,
+      }
+      this.client = new AWS.DynamoDB.DocumentClient(this.config)
     }
 
     async create(query: { table: string; json: object }) {
@@ -197,7 +187,7 @@ module DynamoModule {
       const params = {
         TableName: query.table,
       }
-      return new AWS.DynamoDB().describeTable(params).promise()
+      return new AWS.DynamoDB(this.config).describeTable(params).promise()
     }
 
     async get(query: { table: string; json: object }) {

package/src/integrations/tests/dynamodb.spec.js

@@ -100,4 +100,52 @@ describe("DynamoDB Integration", () => {
       Name: "John"
     })
   })
+
+  it("configures the dynamoDB constructor based on an empty endpoint parameter", async () => {
+    const config = {
+      region: "us-east-1",
+      accessKeyId: "test",
+      secretAccessKeyId: "test"
+    }
+
+    const integration = new DynamoDBIntegration.integration(config)
+
+    expect(integration.config).toEqual({
+      currentClockSkew: true,
+      ...config
+    })
+  })
+
+  it("configures the dynamoDB constructor based on a localhost endpoint parameter", async () => {
+    const config = {
+      region: "us-east-1",
+      accessKeyId: "test",
+      secretAccessKeyId: "test",
+      endpoint: "localhost:8080"
+    }
+
+    const integration = new DynamoDBIntegration.integration(config)
+
+    expect(integration.config).toEqual({
+      region: "us-east-1",
+      currentClockSkew: true,
+      endpoint: "localhost:8080"
+    })
+  })
+
+  it("configures the dynamoDB constructor based on a remote endpoint parameter", async () => {
+    const config = {
+      region: "us-east-1",
+      accessKeyId: "test",
+      secretAccessKeyId: "test",
+      endpoint: "dynamodb.aws.foo.net"
+    }
+
+    const integration = new DynamoDBIntegration.integration(config)
+
+    expect(integration.config).toEqual({
+      currentClockSkew: true,
+      ...config
+    })
+  })
 })