@budibase/backend-core 2.22.11 → 2.22.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +69 -58
- package/dist/index.js.map +2 -2
- package/dist/index.js.meta.json +1 -1
- package/dist/jest.config.js +1 -1
- package/dist/jest.config.js.map +1 -1
- package/dist/package.json +4 -5
- package/dist/plugins.js.meta.json +1 -1
- package/dist/src/db/Replication.js +1 -1
- package/dist/src/db/Replication.js.map +1 -1
- package/dist/src/events/events.d.ts +2 -2
- package/dist/src/events/events.js +7 -3
- package/dist/src/events/events.js.map +1 -1
- package/dist/src/events/publishers/account.d.ts +2 -2
- package/dist/src/events/publishers/account.js +2 -2
- package/dist/src/events/publishers/account.js.map +1 -1
- package/dist/src/platform/users.d.ts +3 -1
- package/dist/src/platform/users.js +9 -2
- package/dist/src/platform/users.js.map +1 -1
- package/dist/src/users/db.d.ts +1 -1
- package/dist/src/users/db.js +2 -2
- package/dist/src/users/db.js.map +1 -1
- package/dist/tests/core/utilities/testContainerUtils.js +27 -56
- package/dist/tests/core/utilities/testContainerUtils.js.map +1 -1
- package/dist/tests/jestEnv.js +4 -0
- package/dist/tests/jestEnv.js.map +1 -1
- package/package.json +4 -5
- package/src/db/Replication.ts +1 -1
- package/src/events/events.ts +11 -4
- package/src/events/publishers/account.ts +8 -2
- package/src/platform/users.ts +13 -4
- package/src/users/db.ts +2 -2
- package/tests/core/utilities/testContainerUtils.ts +46 -65
- package/tests/jestEnv.ts +4 -0
package/dist/src/users/db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../../src/users/db.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../../src/users/db.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,75 +1,46 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.setupEnv = void 0;
|
|
4
|
+
const db_1 = require("../../../src/db");
|
|
4
5
|
const child_process_1 = require("child_process");
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
for (let line of lines) {
|
|
13
|
-
if (first) {
|
|
14
|
-
first = false;
|
|
15
|
-
continue;
|
|
16
|
-
}
|
|
17
|
-
let toLookFor = serverName.split("-service")[0];
|
|
18
|
-
if (!line.includes(toLookFor)) {
|
|
19
|
-
continue;
|
|
20
|
-
}
|
|
21
|
-
const regex = new RegExp(`0.0.0.0:([0-9]*)->${port}`, "g");
|
|
22
|
-
const found = line.match(regex);
|
|
23
|
-
if (found) {
|
|
24
|
-
return found[0].split(":")[1].split("->")[0];
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
return null;
|
|
6
|
+
function getTestcontainers() {
|
|
7
|
+
return (0, child_process_1.execSync)("docker ps --format json")
|
|
8
|
+
.toString()
|
|
9
|
+
.split("\n")
|
|
10
|
+
.filter(x => x.length > 0)
|
|
11
|
+
.map(x => JSON.parse(x))
|
|
12
|
+
.filter(x => x.Labels.includes("org.testcontainers=true"));
|
|
28
13
|
}
|
|
29
|
-
function
|
|
30
|
-
|
|
31
|
-
k.includes(`${key.toUpperCase()}`));
|
|
32
|
-
if (!entry) {
|
|
33
|
-
return null;
|
|
34
|
-
}
|
|
35
|
-
return entry[1];
|
|
14
|
+
function getContainerByImage(image) {
|
|
15
|
+
return getTestcontainers().find(x => x.Image.startsWith(image));
|
|
36
16
|
}
|
|
37
|
-
function
|
|
38
|
-
|
|
39
|
-
if (!
|
|
40
|
-
|
|
41
|
-
const outputBuffer = (0, child_process_1.execSync)("docker ps");
|
|
42
|
-
dockerPsResult = outputBuffer.toString("utf8");
|
|
43
|
-
}
|
|
44
|
-
catch (err) {
|
|
45
|
-
//no-op
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
const possiblePort = formatDockerPsResult(containerName, port);
|
|
49
|
-
if (possiblePort) {
|
|
50
|
-
assignedPort = possiblePort;
|
|
17
|
+
function getExposedPort(container, port) {
|
|
18
|
+
const match = container.Ports.match(new RegExp(`0.0.0.0:(\\d+)->${port}/tcp`));
|
|
19
|
+
if (!match) {
|
|
20
|
+
return undefined;
|
|
51
21
|
}
|
|
52
|
-
|
|
53
|
-
return {
|
|
54
|
-
port: assignedPort,
|
|
55
|
-
host,
|
|
56
|
-
url: host && assignedPort && `http://${host}:${assignedPort}`,
|
|
57
|
-
};
|
|
58
|
-
}
|
|
59
|
-
function getCouchConfig() {
|
|
60
|
-
return getContainerInfo("couchdb", 5984);
|
|
22
|
+
return parseInt(match[1]);
|
|
61
23
|
}
|
|
62
24
|
function setupEnv(...envs) {
|
|
63
|
-
const couch =
|
|
25
|
+
const couch = getContainerByImage("budibase/couchdb");
|
|
26
|
+
if (!couch) {
|
|
27
|
+
throw new Error("CouchDB container not found");
|
|
28
|
+
}
|
|
29
|
+
const couchPort = getExposedPort(couch, 5984);
|
|
30
|
+
if (!couchPort) {
|
|
31
|
+
throw new Error("CouchDB port not found");
|
|
32
|
+
}
|
|
64
33
|
const configs = [
|
|
65
|
-
{ key: "COUCH_DB_PORT", value:
|
|
66
|
-
{ key: "COUCH_DB_URL", value:
|
|
34
|
+
{ key: "COUCH_DB_PORT", value: `${couchPort}` },
|
|
35
|
+
{ key: "COUCH_DB_URL", value: `http://localhost:${couchPort}` },
|
|
67
36
|
];
|
|
68
37
|
for (const config of configs.filter(x => !!x.value)) {
|
|
69
38
|
for (const env of envs) {
|
|
70
39
|
env._set(config.key, config.value);
|
|
71
40
|
}
|
|
72
41
|
}
|
|
42
|
+
// @ts-expect-error
|
|
43
|
+
db_1.DatabaseImpl.nano = undefined;
|
|
73
44
|
}
|
|
74
45
|
exports.setupEnv = setupEnv;
|
|
75
46
|
//# sourceMappingURL=testContainerUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testContainerUtils.js","sourceRoot":"","sources":["../../../../tests/core/utilities/testContainerUtils.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"testContainerUtils.js","sourceRoot":"","sources":["../../../../tests/core/utilities/testContainerUtils.ts"],"names":[],"mappings":";;;AAAA,wCAA8C;AAC9C,iDAAwC;AAmBxC,SAAS,iBAAiB;IACxB,OAAO,IAAA,wBAAQ,EAAC,yBAAyB,CAAC;SACvC,QAAQ,EAAE;SACV,KAAK,CAAC,IAAI,CAAC;SACX,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;SACzB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAkB,CAAC;SACxC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC,CAAA;AAC9D,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAa;IACxC,OAAO,iBAAiB,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAA;AACjE,CAAC;AAED,SAAS,cAAc,CAAC,SAAwB,EAAE,IAAY;IAC5D,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,mBAAmB,IAAI,MAAM,CAAC,CAAC,CAAA;IAC9E,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,SAAS,CAAA;KACjB;IACD,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AAC3B,CAAC;AAED,SAAgB,QAAQ,CAAC,GAAG,IAAW;IACrC,MAAM,KAAK,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,CAAA;IACrD,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;KAC/C;IAED,MAAM,SAAS,GAAG,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IAC7C,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;KAC1C;IAED,MAAM,OAAO,GAAG;QACd,EAAE,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,SAAS,EAAE,EAAE;QAC/C,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,oBAAoB,SAAS,EAAE,EAAE;KAChE,CAAA;IAED,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;QACnD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;SACnC;KACF;IAED,mBAAmB;IACnB,iBAAY,CAAC,IAAI,GAAG,SAAS,CAAA;AAC/B,CAAC;AAxBD,4BAwBC"}
|
package/dist/tests/jestEnv.js
CHANGED
|
@@ -5,4 +5,8 @@ process.env.NODE_ENV = "jest";
|
|
|
5
5
|
process.env.MOCK_REDIS = "1";
|
|
6
6
|
process.env.LOG_LEVEL = process.env.LOG_LEVEL || "error";
|
|
7
7
|
process.env.REDIS_PASSWORD = "budibase";
|
|
8
|
+
process.env.COUCH_DB_PASSWORD = "budibase";
|
|
9
|
+
process.env.COUCH_DB_USER = "budibase";
|
|
10
|
+
process.env.API_ENCRYPTION_KEY = "testsecret";
|
|
11
|
+
process.env.JWT_SECRET = "testsecret";
|
|
8
12
|
//# sourceMappingURL=jestEnv.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jestEnv.js","sourceRoot":"","sources":["../../tests/jestEnv.ts"],"names":[],"mappings":";AAAA,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,GAAG,CAAA;AAC7B,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,GAAG,CAAA;AAC/B,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAA;AAC7B,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAA;AAC5B,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,OAAO,CAAA;AACxD,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,UAAU,CAAA"}
|
|
1
|
+
{"version":3,"file":"jestEnv.js","sourceRoot":"","sources":["../../tests/jestEnv.ts"],"names":[],"mappings":";AAAA,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,GAAG,CAAA;AAC7B,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,GAAG,CAAA;AAC/B,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAA;AAC7B,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAA;AAC5B,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,OAAO,CAAA;AACxD,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,UAAU,CAAA;AACvC,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,UAAU,CAAA;AAC1C,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,UAAU,CAAA;AACtC,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,YAAY,CAAA;AAC7C,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,YAAY,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.22.
|
|
3
|
+
"version": "2.22.13",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@budibase/nano": "10.1.5",
|
|
25
25
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
26
|
-
"@budibase/shared-core": "2.22.
|
|
27
|
-
"@budibase/types": "2.22.
|
|
26
|
+
"@budibase/shared-core": "2.22.13",
|
|
27
|
+
"@budibase/types": "2.22.13",
|
|
28
28
|
"@govtechsg/passport-openidconnect": "^1.0.2",
|
|
29
29
|
"aws-cloudfront-sign": "3.0.2",
|
|
30
30
|
"aws-sdk": "2.1030.0",
|
|
@@ -60,7 +60,6 @@
|
|
|
60
60
|
"@shopify/jest-koa-mocks": "5.1.1",
|
|
61
61
|
"@swc/core": "1.3.71",
|
|
62
62
|
"@swc/jest": "0.2.27",
|
|
63
|
-
"@trendyol/jest-testcontainers": "^2.1.1",
|
|
64
63
|
"@types/chance": "1.1.3",
|
|
65
64
|
"@types/cookies": "0.7.8",
|
|
66
65
|
"@types/jest": "29.5.5",
|
|
@@ -97,5 +96,5 @@
|
|
|
97
96
|
}
|
|
98
97
|
}
|
|
99
98
|
},
|
|
100
|
-
"gitHead": "
|
|
99
|
+
"gitHead": "a8479c046fc0ccb320f5f128aafeb9421dde5db5"
|
|
101
100
|
}
|
package/src/db/Replication.ts
CHANGED
package/src/events/events.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Event } from "@budibase/types"
|
|
1
|
+
import { Event, Identity } from "@budibase/types"
|
|
2
2
|
import { processors } from "./processors"
|
|
3
3
|
import identification from "./identification"
|
|
4
4
|
import * as backfill from "./backfill"
|
|
@@ -7,12 +7,19 @@ import { publishAsyncEvent } from "./asyncEvents"
|
|
|
7
7
|
export const publishEvent = async (
|
|
8
8
|
event: Event,
|
|
9
9
|
properties: any,
|
|
10
|
-
timestamp?: string | number
|
|
10
|
+
timestamp?: string | number,
|
|
11
|
+
identityOverride?: Identity
|
|
11
12
|
) => {
|
|
12
13
|
// in future this should use async events via a distributed queue.
|
|
13
|
-
const identity =
|
|
14
|
+
const identity =
|
|
15
|
+
identityOverride || (await identification.getCurrentIdentity())
|
|
16
|
+
|
|
17
|
+
// Backfilling is get from the user cache, but when we override the identity cache is not available. Overrides are
|
|
18
|
+
// normally performed in automatic actions or operations in async flows (BPM) where the user session is not available.
|
|
19
|
+
const backfilling = identityOverride
|
|
20
|
+
? false
|
|
21
|
+
: await backfill.isBackfillingEvent(event)
|
|
14
22
|
|
|
15
|
-
const backfilling = await backfill.isBackfillingEvent(event)
|
|
16
23
|
// no backfill - send the event and exit
|
|
17
24
|
if (!backfilling) {
|
|
18
25
|
// send off async events if required
|
|
@@ -5,13 +5,19 @@ import {
|
|
|
5
5
|
AccountCreatedEvent,
|
|
6
6
|
AccountDeletedEvent,
|
|
7
7
|
AccountVerifiedEvent,
|
|
8
|
+
Identity,
|
|
8
9
|
} from "@budibase/types"
|
|
9
10
|
|
|
10
|
-
async function created(account: Account) {
|
|
11
|
+
async function created(account: Account, identityOverride?: Identity) {
|
|
11
12
|
const properties: AccountCreatedEvent = {
|
|
12
13
|
tenantId: account.tenantId,
|
|
13
14
|
}
|
|
14
|
-
await publishEvent(
|
|
15
|
+
await publishEvent(
|
|
16
|
+
Event.ACCOUNT_CREATED,
|
|
17
|
+
properties,
|
|
18
|
+
undefined,
|
|
19
|
+
identityOverride
|
|
20
|
+
)
|
|
15
21
|
}
|
|
16
22
|
|
|
17
23
|
async function deleted(account: Account) {
|
package/src/platform/users.ts
CHANGED
|
@@ -20,7 +20,7 @@ export async function lookupTenantId(userId: string) {
|
|
|
20
20
|
return user.tenantId
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
-
async function getUserDoc(emailOrId: string): Promise<PlatformUser> {
|
|
23
|
+
export async function getUserDoc(emailOrId: string): Promise<PlatformUser> {
|
|
24
24
|
const db = getPlatformDB()
|
|
25
25
|
return db.get(emailOrId)
|
|
26
26
|
}
|
|
@@ -79,6 +79,17 @@ async function addUserDoc(emailOrId: string, newDocFn: () => PlatformUser) {
|
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
81
|
|
|
82
|
+
export async function addSsoUser(
|
|
83
|
+
ssoId: string,
|
|
84
|
+
email: string,
|
|
85
|
+
userId: string,
|
|
86
|
+
tenantId: string
|
|
87
|
+
) {
|
|
88
|
+
return addUserDoc(ssoId, () =>
|
|
89
|
+
newUserSsoIdDoc(ssoId, email, userId, tenantId)
|
|
90
|
+
)
|
|
91
|
+
}
|
|
92
|
+
|
|
82
93
|
export async function addUser(
|
|
83
94
|
tenantId: string,
|
|
84
95
|
userId: string,
|
|
@@ -91,9 +102,7 @@ export async function addUser(
|
|
|
91
102
|
]
|
|
92
103
|
|
|
93
104
|
if (ssoId) {
|
|
94
|
-
promises.push(
|
|
95
|
-
addUserDoc(ssoId, () => newUserSsoIdDoc(ssoId, email, userId, tenantId))
|
|
96
|
-
)
|
|
105
|
+
promises.push(addSsoUser(ssoId, email, userId, tenantId))
|
|
97
106
|
}
|
|
98
107
|
|
|
99
108
|
await Promise.all(promises)
|
package/src/users/db.ts
CHANGED
|
@@ -500,13 +500,13 @@ export class UserDB {
|
|
|
500
500
|
|
|
501
501
|
static async createAdminUser(
|
|
502
502
|
email: string,
|
|
503
|
-
password: string,
|
|
504
503
|
tenantId: string,
|
|
504
|
+
password?: string,
|
|
505
505
|
opts?: CreateAdminUserOpts
|
|
506
506
|
) {
|
|
507
507
|
const user: User = {
|
|
508
508
|
email: email,
|
|
509
|
-
password
|
|
509
|
+
password,
|
|
510
510
|
createdAt: Date.now(),
|
|
511
511
|
roles: {},
|
|
512
512
|
builder: {
|
|
@@ -1,80 +1,58 @@
|
|
|
1
|
+
import { DatabaseImpl } from "../../../src/db"
|
|
1
2
|
import { execSync } from "child_process"
|
|
2
3
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
continue
|
|
19
|
-
}
|
|
20
|
-
const regex = new RegExp(`0.0.0.0:([0-9]*)->${port}`, "g")
|
|
21
|
-
const found = line.match(regex)
|
|
22
|
-
if (found) {
|
|
23
|
-
return found[0].split(":")[1].split("->")[0]
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
return null
|
|
4
|
+
interface ContainerInfo {
|
|
5
|
+
Command: string
|
|
6
|
+
CreatedAt: string
|
|
7
|
+
ID: string
|
|
8
|
+
Image: string
|
|
9
|
+
Labels: string
|
|
10
|
+
LocalVolumes: string
|
|
11
|
+
Mounts: string
|
|
12
|
+
Names: string
|
|
13
|
+
Networks: string
|
|
14
|
+
Ports: string
|
|
15
|
+
RunningFor: string
|
|
16
|
+
Size: string
|
|
17
|
+
State: string
|
|
18
|
+
Status: string
|
|
27
19
|
}
|
|
28
20
|
|
|
29
|
-
function
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
)
|
|
33
|
-
|
|
34
|
-
(
|
|
35
|
-
|
|
36
|
-
k.includes(`${key.toUpperCase()}`)
|
|
37
|
-
)
|
|
38
|
-
if (!entry) {
|
|
39
|
-
return null
|
|
40
|
-
}
|
|
41
|
-
return entry[1]
|
|
21
|
+
function getTestcontainers(): ContainerInfo[] {
|
|
22
|
+
return execSync("docker ps --format json")
|
|
23
|
+
.toString()
|
|
24
|
+
.split("\n")
|
|
25
|
+
.filter(x => x.length > 0)
|
|
26
|
+
.map(x => JSON.parse(x) as ContainerInfo)
|
|
27
|
+
.filter(x => x.Labels.includes("org.testcontainers=true"))
|
|
42
28
|
}
|
|
43
29
|
|
|
44
|
-
function
|
|
45
|
-
|
|
46
|
-
containerName.toUpperCase(),
|
|
47
|
-
`PORT_${port}`
|
|
48
|
-
)
|
|
49
|
-
if (!dockerPsResult) {
|
|
50
|
-
try {
|
|
51
|
-
const outputBuffer = execSync("docker ps")
|
|
52
|
-
dockerPsResult = outputBuffer.toString("utf8")
|
|
53
|
-
} catch (err) {
|
|
54
|
-
//no-op
|
|
55
|
-
}
|
|
56
|
-
}
|
|
57
|
-
const possiblePort = formatDockerPsResult(containerName, port)
|
|
58
|
-
if (possiblePort) {
|
|
59
|
-
assignedPort = possiblePort
|
|
60
|
-
}
|
|
61
|
-
const host = getTestContainerSettings(containerName.toUpperCase(), "IP")
|
|
62
|
-
return {
|
|
63
|
-
port: assignedPort,
|
|
64
|
-
host,
|
|
65
|
-
url: host && assignedPort && `http://${host}:${assignedPort}`,
|
|
66
|
-
}
|
|
30
|
+
function getContainerByImage(image: string) {
|
|
31
|
+
return getTestcontainers().find(x => x.Image.startsWith(image))
|
|
67
32
|
}
|
|
68
33
|
|
|
69
|
-
function
|
|
70
|
-
|
|
34
|
+
function getExposedPort(container: ContainerInfo, port: number) {
|
|
35
|
+
const match = container.Ports.match(new RegExp(`0.0.0.0:(\\d+)->${port}/tcp`))
|
|
36
|
+
if (!match) {
|
|
37
|
+
return undefined
|
|
38
|
+
}
|
|
39
|
+
return parseInt(match[1])
|
|
71
40
|
}
|
|
72
41
|
|
|
73
42
|
export function setupEnv(...envs: any[]) {
|
|
74
|
-
const couch =
|
|
43
|
+
const couch = getContainerByImage("budibase/couchdb")
|
|
44
|
+
if (!couch) {
|
|
45
|
+
throw new Error("CouchDB container not found")
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
const couchPort = getExposedPort(couch, 5984)
|
|
49
|
+
if (!couchPort) {
|
|
50
|
+
throw new Error("CouchDB port not found")
|
|
51
|
+
}
|
|
52
|
+
|
|
75
53
|
const configs = [
|
|
76
|
-
{ key: "COUCH_DB_PORT", value:
|
|
77
|
-
{ key: "COUCH_DB_URL", value:
|
|
54
|
+
{ key: "COUCH_DB_PORT", value: `${couchPort}` },
|
|
55
|
+
{ key: "COUCH_DB_URL", value: `http://localhost:${couchPort}` },
|
|
78
56
|
]
|
|
79
57
|
|
|
80
58
|
for (const config of configs.filter(x => !!x.value)) {
|
|
@@ -82,4 +60,7 @@ export function setupEnv(...envs: any[]) {
|
|
|
82
60
|
env._set(config.key, config.value)
|
|
83
61
|
}
|
|
84
62
|
}
|
|
63
|
+
|
|
64
|
+
// @ts-expect-error
|
|
65
|
+
DatabaseImpl.nano = undefined
|
|
85
66
|
}
|
package/tests/jestEnv.ts
CHANGED
|
@@ -4,3 +4,7 @@ process.env.NODE_ENV = "jest"
|
|
|
4
4
|
process.env.MOCK_REDIS = "1"
|
|
5
5
|
process.env.LOG_LEVEL = process.env.LOG_LEVEL || "error"
|
|
6
6
|
process.env.REDIS_PASSWORD = "budibase"
|
|
7
|
+
process.env.COUCH_DB_PASSWORD = "budibase"
|
|
8
|
+
process.env.COUCH_DB_USER = "budibase"
|
|
9
|
+
process.env.API_ENCRYPTION_KEY = "testsecret"
|
|
10
|
+
process.env.JWT_SECRET = "testsecret"
|