Merge branch 'master' into dependabot/npm_and_yarn/braces-3.0.3

.gitignore

@@ -8,6 +8,8 @@ bb-airgapped.tar.gz
 packages/server/build/oldClientVersions/**/*
 packages/builder/src/components/deploy/clientVersions.json
 
+packages/server/src/integrations/tests/utils/*.lock
+
 # Logs
 logs
 *.log

packages/backend-core/src/environment.ts

@@ -126,6 +126,7 @@ const environment = {
   REDIS_CLUSTERED: process.env.REDIS_CLUSTERED,
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
+  AWS_SESSION_TOKEN: process.env.AWS_SESSION_TOKEN,
   AWS_REGION: process.env.AWS_REGION,
   MINIO_URL: process.env.MINIO_URL,
   MINIO_ENABLED: process.env.MINIO_ENABLED || 1,

packages/backend-core/src/objectStore/objectStore.ts

@@ -101,6 +101,11 @@ export function ObjectStore(
     }
   }
 
+  // for AWS Credentials using temporary session token
+  if (!env.MINIO_ENABLED && env.AWS_SESSION_TOKEN) {
+    config.sessionToken = env.AWS_SESSION_TOKEN
+  }
+
   // custom S3 is in use i.e. minio
   if (env.MINIO_URL) {
     if (opts.presigning && env.MINIO_ENABLED) {

packages/server/specs/openapi.json

@@ -860,8 +860,10 @@
                         "json",
                         "internal",
                         "barcodeqr",
+                        "signature_single",
                         "bigint",
-                        "bb_reference"
+                        "bb_reference",
+                        "bb_reference_single"
                       ],
                       "description": "Defines the type of the column, most explain themselves, a link column is a relationship."
                     },
@@ -1067,8 +1069,10 @@
                             "json",
                             "internal",
                             "barcodeqr",
+                            "signature_single",
                             "bigint",
-                            "bb_reference"
+                            "bb_reference",
+                            "bb_reference_single"
                           ],
                           "description": "Defines the type of the column, most explain themselves, a link column is a relationship."
                         },
@@ -1285,8 +1289,10 @@
                               "json",
                               "internal",
                               "barcodeqr",
+                              "signature_single",
                               "bigint",
-                              "bb_reference"
+                              "bb_reference",
+                              "bb_reference_single"
                             ],
                             "description": "Defines the type of the column, most explain themselves, a link column is a relationship."
                           },

packages/server/specs/openapi.yaml

@@ -782,8 +782,10 @@ components:
                       - json
                       - internal
                       - barcodeqr
+                      - signature_single
                       - bigint
                       - bb_reference
+                      - bb_reference_single
                     description: Defines the type of the column, most explain themselves, a link
                       column is a relationship.
                   constraints:
@@ -948,8 +950,10 @@ components:
                           - json
                           - internal
                           - barcodeqr
+                          - signature_single
                           - bigint
                           - bb_reference
+                          - bb_reference_single
                         description: Defines the type of the column, most explain themselves, a link
                           column is a relationship.
                       constraints:
@@ -1121,8 +1125,10 @@ components:
                             - json
                             - internal
                             - barcodeqr
+                            - signature_single
                             - bigint
                             - bb_reference
+                            - bb_reference_single
                           description: Defines the type of the column, most explain themselves, a link
                             column is a relationship.
                         constraints:

packages/server/src/environment.ts

@@ -48,6 +48,7 @@ const environment = {
   MINIO_URL: process.env.MINIO_URL,
   WORKER_URL: process.env.WORKER_URL,
   AWS_REGION: process.env.AWS_REGION,
+  AWS_SESSION_TOKEN: process.env.AWS_SESSION_TOKEN,
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
   REDIS_URL: process.env.REDIS_URL,

packages/server/src/integrations/tests/utils/index.ts

@@ -4,8 +4,9 @@ import * as mongodb from "./mongodb"
 import * as mysql from "./mysql"
 import * as mssql from "./mssql"
 import * as mariadb from "./mariadb"
-import { GenericContainer } from "testcontainers"
+import { GenericContainer, StartedTestContainer } from "testcontainers"
 import { testContainerUtils } from "@budibase/backend-core/tests"
+import cloneDeep from "lodash/cloneDeep"
 
 export type DatasourceProvider = () => Promise<Datasource>
 
@@ -65,9 +66,39 @@ export async function rawQuery(ds: Datasource, sql: string): Promise<any> {
 }
 
 export async function startContainer(container: GenericContainer) {
-  container = container.withReuse().withLabels({ "com.budibase": "true" })
+  const imageName = (container as any).imageName.string as string
+  const key = imageName.replaceAll("/", "-").replaceAll(":", "-")
 
-  const startedContainer = await container.start()
+  container = container
+    .withReuse()
+    .withLabels({ "com.budibase": "true" })
+    .withName(key)
+
+  let startedContainer: StartedTestContainer | undefined = undefined
+  let lastError = undefined
+  for (let i = 0; i < 10; i++) {
+    try {
+      // container.start() is not an idempotent operation, calling `start`
+      // modifies the internal state of a GenericContainer instance such that
+      // the hash it uses to determine reuse changes. We need to clone the
+      // container before calling start to ensure that we're using the same
+      // reuse hash every time.
+      const containerCopy = cloneDeep(container)
+      startedContainer = await containerCopy.start()
+      lastError = undefined
+      break
+    } catch (e: any) {
+      lastError = e
+      await new Promise(resolve => setTimeout(resolve, 1000))
+    }
+  }
+
+  if (!startedContainer) {
+    if (lastError) {
+      throw lastError
+    }
+    throw new Error(`failed to start container: ${imageName}`)
+  }
 
   const info = testContainerUtils.getContainerById(startedContainer.getId())
   if (!info) {

packages/server/src/integrations/tests/utils/mssql.ts

@@ -29,6 +29,9 @@ export async function getDatasource(): Promise<Datasource> {
   }
 
   const port = (await ports).find(x => x.container === 1433)?.host
+  if (!port) {
+    throw new Error("SQL Server port not found")
+  }
 
   const datasource: Datasource = {
     type: "datasource_plus",

packages/server/src/integrations/tests/utils/mysql.ts

@@ -38,6 +38,9 @@ export async function getDatasource(): Promise<Datasource> {
   }
 
   const port = (await ports).find(x => x.container === 3306)?.host
+  if (!port) {
+    throw new Error("MySQL port not found")
+  }
 
   const datasource: Datasource = {
     type: "datasource_plus",

packages/server/src/integrations/tests/utils/postgres.ts

@@ -21,6 +21,9 @@ export async function getDatasource(): Promise<Datasource> {
   }
 
   const port = (await ports).find(x => x.container === 5432)?.host
+  if (!port) {
+    throw new Error("Postgres port not found")
+  }
 
   const datasource: Datasource = {
     type: "datasource_plus",

packages/worker/src/environment.ts

@@ -24,6 +24,7 @@ const environment = {
   // auth
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
+  AWS_SESSION_TOKEN: process.env.AWS_SESSION_TOKEN,
   SALT_ROUNDS: process.env.SALT_ROUNDS,
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
   COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,