@budibase/server 2.6.16-alpha.5 → 2.6.17

package/src/integrations/s3.ts

@@ -3,12 +3,10 @@ import {
   QueryType,
   IntegrationBase,
   DatasourceFieldType,
-  DatasourceFeature,
-  ConnectionInfo,
 } from "@budibase/types"
 
-import AWS from "aws-sdk"
-import csv from "csvtojson"
+const AWS = require("aws-sdk")
+const csv = require("csvtojson")
 
 interface S3Config {
   region: string
@@ -24,7 +22,6 @@ const SCHEMA: Integration = {
     "Amazon Simple Storage Service (Amazon S3) is an object storage service that offers industry-leading scalability, data availability, security, and performance.",
   friendlyName: "Amazon S3",
   type: "Object store",
-  features: [DatasourceFeature.CONNECTION_CHECKING],
   datasource: {
     region: {
       type: "string",
@@ -155,7 +152,7 @@ const SCHEMA: Integration = {
 
 class S3Integration implements IntegrationBase {
   private readonly config: S3Config
-  private client
+  private client: any
 
   constructor(config: S3Config) {
     this.config = config
@@ -168,19 +165,6 @@ class S3Integration implements IntegrationBase {
     this.client = new AWS.S3(this.config)
   }
 
-  async testConnection() {
-    const response: ConnectionInfo = {
-      connected: false,
-    }
-    try {
-      await this.client.listBuckets().promise()
-      response.connected = true
-    } catch (e: any) {
-      response.error = e.message as string
-    }
-    return response
-  }
-
   async create(query: {
     bucket: string
     location: string

package/src/integrations/snowflake.ts

@@ -1,10 +1,4 @@
-import {
-  ConnectionInfo,
-  DatasourceFeature,
-  Integration,
-  QueryType,
-  SqlQuery,
-} from "@budibase/types"
+import { Integration, QueryType, SqlQuery } from "@budibase/types"
 import { Snowflake } from "snowflake-promise"
 
 interface SnowflakeConfig {
@@ -22,7 +16,6 @@ const SCHEMA: Integration = {
     "Snowflake is a solution for data warehousing, data lakes, data engineering, data science, data application development, and securely sharing and consuming shared data.",
   friendlyName: "Snowflake",
   type: "Relational",
-  features: [DatasourceFeature.CONNECTION_CHECKING],
   datasource: {
     account: {
       type: "string",
@@ -72,18 +65,6 @@ class SnowflakeIntegration {
     this.client = new Snowflake(config)
   }
 
-  async testConnection(): Promise<ConnectionInfo> {
-    try {
-      await this.client.connect()
-      return { connected: true }
-    } catch (e: any) {
-      return {
-        connected: false,
-        error: e.message as string,
-      }
-    }
-  }
-
   async internalQuery(query: SqlQuery) {
     await this.client.connect()
     try {

package/src/migrations/functions/backfill/app/queries.ts

@@ -33,7 +33,7 @@ export const backfill = async (appDb: any, timestamp: string | number) => {
         datasource = {
           type: "unknown",
           _id: query.datasourceId,
-          source: "unknown" as SourceName,
+          source: SourceName.UNKNOWN,
         }
       } else {
         throw e

package/src/sdk/app/datasources/datasources.ts

@@ -13,7 +13,6 @@ import {
 import { cloneDeep } from "lodash/fp"
 import { getEnvironmentVariables } from "../../utils"
 import { getDefinitions, getDefinition } from "../../../integrations"
-import _ from "lodash"
 
 const ENV_VAR_PREFIX = "env."
 
@@ -42,7 +41,7 @@ async function enrichDatasourceWithValues(datasource: Datasource) {
     { onlyFound: true }
   ) as Datasource
   const definition = await getDefinition(processed.source)
-  processed.config = checkDatasourceTypes(definition!, processed.config)
+  processed.config = checkDatasourceTypes(definition, processed.config)
   return {
     datasource: processed,
     envVars: env as Record<string, string>,
@@ -148,11 +147,6 @@ export function mergeConfigs(update: Datasource, old: Datasource) {
       }
     }
   }
-
-  if (old.config?.auth) {
-    update.config = _.merge(old.config, update.config)
-  }
-
   // update back to actual passwords for everything else
   for (let [key, value] of Object.entries(update.config)) {
     if (value !== PASSWORD_REPLACEMENT) {

package/src/threads/automation.ts

@@ -13,13 +13,18 @@ import { generateAutomationMetadataID, isProdAppID } from "../db/utils"
 import { definitions as triggerDefs } from "../automations/triggerInfo"
 import { AutomationErrors, MAX_AUTOMATION_RECURRING_ERRORS } from "../constants"
 import { storeLog } from "../automations/logging"
-import { Automation, AutomationStep, AutomationStatus } from "@budibase/types"
+import {
+  Automation,
+  AutomationStep,
+  AutomationStatus,
+  AutomationMetadata,
+  AutomationJob,
+} from "@budibase/types"
 import {
   LoopStep,
   LoopInput,
   TriggerOutput,
   AutomationContext,
-  AutomationMetadata,
 } from "../definitions/automations"
 import { WorkerCallback } from "./definitions"
 import { context, logging } from "@budibase/backend-core"
@@ -60,11 +65,11 @@ class Orchestrator {
   _job: Job
   executionOutput: AutomationContext
 
-  constructor(job: Job) {
-    let automation = job.data.automation,
-      triggerOutput = job.data.event
+  constructor(job: AutomationJob) {
+    let automation = job.data.automation
+    let triggerOutput = job.data.event
     const metadata = triggerOutput.metadata
-    this._chainCount = metadata ? metadata.automationChainCount : 0
+    this._chainCount = metadata ? metadata.automationChainCount! : 0
     this._appId = triggerOutput.appId as string
     this._job = job
     const triggerStepId = automation.definition.trigger.stepId

package/src/threads/definitions.ts

@@ -1,5 +1,3 @@
-import { EnvironmentVariablesDecrypted } from "@budibase/types"
-
 export type WorkerCallback = (error: any, response?: any) => void
 
 export interface QueryEvent {

package/src/threads/index.ts

@@ -1,5 +1,7 @@
 import workerFarm from "worker-farm"
 import env from "../environment"
+import { AutomationJob } from "@budibase/types"
+import { QueryEvent } from "./definitions"
 
 export const ThreadType = {
   QUERY: "query",
@@ -64,11 +66,11 @@ export class Thread {
     )
   }
 
-  run(data: any) {
+  run(job: AutomationJob | QueryEvent) {
     const timeout = this.timeoutMs
     return new Promise((resolve, reject) => {
       function fire(worker: any) {
-        worker.execute(data, (err: any, response: any) => {
+        worker.execute(job, (err: any, response: any) => {
           if (err && err.type === "TimeoutError") {
             reject(
               new Error(`Query response time exceeded ${timeout}ms timeout.`)

package/tsconfig.json

@@ -11,7 +11,7 @@
       "@budibase/backend-core": ["../backend-core/src"],
       "@budibase/backend-core/*": ["../backend-core/*"],
       "@budibase/shared-core": ["../shared-core/src"],
-      "@budibase/pro": ["../pro/packages/pro/src"]
+      "@budibase/pro": ["../../../budibase-pro/packages/pro/src"]
     }
   },
   "ts-node": {

package/src/automations/tests/make.spec.ts

@@ -1,54 +0,0 @@
-import { getConfig, afterAll, runStep, actions } from "./utilities"
-
-describe("test the outgoing webhook action", () => {
-  let config = getConfig()
-
-  beforeAll(async () => {
-    await config.init()
-  })
-
-  afterAll()
-
-  it("should be able to run the action", async () => {
-    const res = await runStep(actions.integromat.stepId, {
-      value1: "test",
-      url: "http://www.test.com",
-    })
-    expect(res.response.url).toEqual("http://www.test.com")
-    expect(res.response.method).toEqual("post")
-    expect(res.success).toEqual(true)
-  })
-
-  it("should add the payload props when a JSON string is provided", async () => {
-    const payload = `{"value1":1,"value2":2,"value3":3,"value4":4,"value5":5,"name":"Adam","age":9}`
-    const res = await runStep(actions.integromat.stepId, {
-      value1: "ONE",
-      value2: "TWO",
-      value3: "THREE",
-      value4: "FOUR",
-      value5: "FIVE",
-      body: {
-        value: payload,
-      },
-      url: "http://www.test.com",
-    })
-    expect(res.response.url).toEqual("http://www.test.com")
-    expect(res.response.method).toEqual("post")
-    expect(res.response.body).toEqual(payload)
-    expect(res.success).toEqual(true)
-  })
-
-  it("should return a 400 if the JSON payload string is malformed", async () => {
-    const payload = `{ value1 1 }`
-    const res = await runStep(actions.integromat.stepId, {
-      value1: "ONE",
-      body: {
-        value: payload,
-      },
-      url: "http://www.test.com",
-    })
-    expect(res.httpStatus).toEqual(400)
-    expect(res.response).toEqual("Invalid payload JSON")
-    expect(res.success).toEqual(false)
-  })
-})

package/src/automations/tests/zapier.spec.ts

@@ -1,56 +0,0 @@
-import { getConfig, afterAll, runStep, actions } from "./utilities"
-
-describe("test the outgoing webhook action", () => {
-  let config = getConfig()
-
-  beforeAll(async () => {
-    await config.init()
-  })
-
-  afterAll()
-
-  it("should be able to run the action", async () => {
-    const res = await runStep(actions.zapier.stepId, {
-      value1: "test",
-      url: "http://www.test.com",
-    })
-    expect(res.response.url).toEqual("http://www.test.com")
-    expect(res.response.method).toEqual("post")
-    expect(res.success).toEqual(true)
-  })
-
-  it("should add the payload props when a JSON string is provided", async () => {
-    const payload = `{ "value1": 1, "value2": 2, "value3": 3, "value4": 4, "value5": 5, "name": "Adam", "age": 9 }`
-    const res = await runStep(actions.zapier.stepId, {
-      value1: "ONE",
-      value2: "TWO",
-      value3: "THREE",
-      value4: "FOUR",
-      value5: "FIVE",
-      body: {
-        value: payload,
-      },
-      url: "http://www.test.com",
-    })
-    expect(res.response.url).toEqual("http://www.test.com")
-    expect(res.response.method).toEqual("post")
-    expect(res.response.body).toEqual(
-      `{"platform":"budibase","value1":1,"value2":2,"value3":3,"value4":4,"value5":5,"name":"Adam","age":9}`
-    )
-    expect(res.success).toEqual(true)
-  })
-
-  it("should return a 400 if the JSON payload string is malformed", async () => {
-    const payload = `{ value1 1 }`
-    const res = await runStep(actions.zapier.stepId, {
-      value1: "ONE",
-      body: {
-        value: payload,
-      },
-      url: "http://www.test.com",
-    })
-    expect(res.httpStatus).toEqual(400)
-    expect(res.response).toEqual("Invalid payload JSON")
-    expect(res.success).toEqual(false)
-  })
-})