From b27899b1e6469cea37ac4e417cd4291ee2b62f8d Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 5 Sep 2023 10:47:59 +0200
Subject: [PATCH] Redo helpers

---
 .../src/integration-test/postgres.spec.ts     | 20 +++++---
 .../src/integrations/tests/utils/index.ts     |  7 +--
 .../src/integrations/tests/utils/postgres.ts  | 46 +++++++++++++++++++
 3 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index 7dde9f2e0c..fd85393477 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -17,7 +17,7 @@ import {
 import _ from "lodash"
 import { generator } from "@budibase/backend-core/tests"
 import { utils } from "@budibase/backend-core"
-import { testDatasourceConfig } from "../integrations/tests/utils"
+import { PostgresProvider } from "../integrations/tests/utils"
 
 const config = setup.getConfig()!
 
@@ -34,10 +34,10 @@ describe("postgres integrations", () => {
     manyToOneRelationshipInfo: ForeignTableInfo,
     manyToManyRelationshipInfo: ForeignTableInfo
 
-  let pgDatasourceConfig: Datasource
+  let provider: PostgresProvider
 
   beforeAll(async () => {
-    pgDatasourceConfig = await testDatasourceConfig.postgres()
+    provider = await PostgresProvider.init()
 
     await config.init()
     const apiKey = await config.generateApiKey()
@@ -46,7 +46,9 @@ describe("postgres integrations", () => {
   })
 
   beforeEach(async () => {
-    postgresDatasource = await config.api.datasource.create(pgDatasourceConfig)
+    postgresDatasource = await config.api.datasource.create(
+      provider.getDsConfig()
+    )
 
     async function createAuxTable(prefix: string) {
       return await config.createTable({
@@ -1004,17 +1006,21 @@ describe("postgres integrations", () => {
   describe("POST /api/datasources/verify", () => {
     it("should be able to verify the connection", async () => {
       const response = await config.api.datasource.verify({
-        datasource: pgDatasourceConfig,
+        datasource: provider.getDsConfig(),
       })
       expect(response.status).toBe(200)
       expect(response.body.connected).toBe(true)
     })
 
     it("should state an invalid datasource cannot connect", async () => {
+      const dbConfig = provider.getDsConfig()
       const response = await config.api.datasource.verify({
         datasource: {
-          ...pgDatasourceConfig,
-          config: { ...pgDatasourceConfig.config, password: "wrongpassword" },
+          ...dbConfig,
+          config: {
+            ...dbConfig.config,
+            password: "wrongpassword",
+          },
         },
       })
 
diff --git a/packages/server/src/integrations/tests/utils/index.ts b/packages/server/src/integrations/tests/utils/index.ts
index 2c8c583fd4..e80dbed83a 100644
--- a/packages/server/src/integrations/tests/utils/index.ts
+++ b/packages/server/src/integrations/tests/utils/index.ts
@@ -1,5 +1,6 @@
-import * as postgres from "./postgres"
+import { Datasource } from "@budibase/types"
+export * from "./postgres"
 
-export const testDatasourceConfig = {
-  postgres: postgres.getDatasourceConfig,
+export interface DatabasePlusTestProvider {
+  getDsConfig(): Datasource
 }
diff --git a/packages/server/src/integrations/tests/utils/postgres.ts b/packages/server/src/integrations/tests/utils/postgres.ts
index 9f9e98fe17..514605306e 100644
--- a/packages/server/src/integrations/tests/utils/postgres.ts
+++ b/packages/server/src/integrations/tests/utils/postgres.ts
@@ -1,5 +1,51 @@
 import { Datasource, SourceName } from "@budibase/types"
 import { GenericContainer, Wait } from "testcontainers"
+import { DatabasePlusTestProvider } from "."
+
+export class PostgresProvider implements DatabasePlusTestProvider {
+  private host: string
+  private port: number
+
+  private constructor(host: string, port: number) {
+    this.host = host
+    this.port = port
+  }
+
+  static async init() {
+    const containerPostgres = await new GenericContainer("postgres")
+      .withExposedPorts(5432)
+      .withEnv("POSTGRES_PASSWORD", "password")
+      .withWaitStrategy(
+        Wait.forLogMessage(
+          "PostgreSQL init process complete; ready for start up."
+        )
+      )
+      .start()
+
+    const host = containerPostgres.getContainerIpAddress()
+    const port = containerPostgres.getMappedPort(5432)
+    return new PostgresProvider(host, port)
+  }
+
+  getDsConfig(): Datasource {
+    return {
+      type: "datasource_plus",
+      source: SourceName.POSTGRES,
+      plus: true,
+      config: {
+        host: this.host,
+        port: this.port,
+        database: "postgres",
+        user: "postgres",
+        password: "password",
+        schema: "public",
+        ssl: false,
+        rejectUnauthorized: false,
+        ca: false,
+      },
+    }
+  }
+}
 
 export async function getDatasourceConfig(): Promise<Datasource> {
   const containerPostgres = await new GenericContainer("postgres")