@cubejs-backend/testing 0.29.53 → 0.29.54
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/CHANGELOG.md +11 -0
- package/birdbox-fixtures/multidb/cube.js +26 -0
- package/birdbox-fixtures/multidb/schema/Products.js +52 -0
- package/birdbox-fixtures/multidb/schema/Suppliers.js +34 -0
- package/birdbox-fixtures/multidb.yml +65 -0
- package/dist/src/REQUIRED_ENV_VARS.d.ts +8 -0
- package/dist/src/REQUIRED_ENV_VARS.d.ts.map +1 -0
- package/dist/src/{REQ_ENV_VARS.js → REQUIRED_ENV_VARS.js} +7 -9
- package/dist/src/REQUIRED_ENV_VARS.js.map +1 -0
- package/dist/src/birdbox.d.ts +6 -1
- package/dist/src/birdbox.d.ts.map +1 -1
- package/dist/src/birdbox.js +58 -45
- package/dist/src/birdbox.js.map +1 -1
- package/package.json +8 -8
- package/dist/src/REQ_ENV_VARS.d.ts +0 -7
- package/dist/src/REQ_ENV_VARS.d.ts.map +0 -1
- package/dist/src/REQ_ENV_VARS.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [0.29.54](https://github.com/cube-js/cube.js/compare/v0.29.53...v0.29.54) (2022-05-03)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* **cubejs:** rollupJoin between multiple databases ([#4371](https://github.com/cube-js/cube.js/issues/4371)) ([6cd77d5](https://github.com/cube-js/cube.js/commit/6cd77d542ec8af570f556a4cefd1710ab2e5f508))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## [0.29.53](https://github.com/cube-js/cube.js/compare/v0.29.52...v0.29.53) (2022-04-29)
|
|
7
18
|
|
|
8
19
|
**Note:** Version bump only for package @cubejs-backend/testing
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
const PostgresDriver = require('@cubejs-backend/postgres-driver');
|
|
2
|
+
const MySqlDriver = require("@cubejs-backend/mysql-driver");
|
|
3
|
+
|
|
4
|
+
module.exports = {
|
|
5
|
+
dbType: ({ dataSource }) => {
|
|
6
|
+
switch (dataSource) {
|
|
7
|
+
case 'suppliers': return 'postgres';
|
|
8
|
+
case 'products': return 'mysql';
|
|
9
|
+
default: return 'postgres';
|
|
10
|
+
}
|
|
11
|
+
},
|
|
12
|
+
|
|
13
|
+
driverFactory: ({ dataSource }) => {
|
|
14
|
+
switch (dataSource) {
|
|
15
|
+
case 'suppliers': return new PostgresDriver({});
|
|
16
|
+
case 'products': return new MySqlDriver({
|
|
17
|
+
host: process.env.CUBEJS_DB_HOST2,
|
|
18
|
+
port: process.env.CUBEJS_DB_PORT2,
|
|
19
|
+
database: process.env.CUBEJS_DB_NAME2,
|
|
20
|
+
user: process.env.CUBEJS_DB_USER2,
|
|
21
|
+
password: process.env.CUBEJS_DB_PASS2,
|
|
22
|
+
});
|
|
23
|
+
default: throw new Error(`driverFactory: Invalid dataSource '${dataSource}'`);
|
|
24
|
+
}
|
|
25
|
+
},
|
|
26
|
+
};
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
cube(`Products`, {
|
|
2
|
+
sql: `
|
|
3
|
+
SELECT 1 AS id, 'apples' AS name, 10 AS supplier_id
|
|
4
|
+
UNION ALL SELECT 2 AS id, 'bananas' AS name, 10 AS supplier_id
|
|
5
|
+
UNION ALL SELECT 3 AS id, 'oranges' AS name, 20 AS supplier_id
|
|
6
|
+
`,
|
|
7
|
+
|
|
8
|
+
preAggregations: {
|
|
9
|
+
productsRollup: {
|
|
10
|
+
type: `rollup`,
|
|
11
|
+
external: true,
|
|
12
|
+
dimensions: [CUBE.name, CUBE.supplierId],
|
|
13
|
+
indexes: {
|
|
14
|
+
categoryIndex: {
|
|
15
|
+
columns: [CUBE.supplierId],
|
|
16
|
+
},
|
|
17
|
+
},
|
|
18
|
+
},
|
|
19
|
+
|
|
20
|
+
combinedRollup: {
|
|
21
|
+
type: `rollupJoin`,
|
|
22
|
+
dimensions: [Suppliers.company, CUBE.name],
|
|
23
|
+
rollups: [Suppliers.suppliersRollup, CUBE.productsRollup],
|
|
24
|
+
external: true,
|
|
25
|
+
},
|
|
26
|
+
},
|
|
27
|
+
|
|
28
|
+
joins: {
|
|
29
|
+
Suppliers: {
|
|
30
|
+
sql: `${CUBE.supplierId} = ${Suppliers.id}`,
|
|
31
|
+
relationship: `belongsTo`,
|
|
32
|
+
},
|
|
33
|
+
},
|
|
34
|
+
|
|
35
|
+
dimensions: {
|
|
36
|
+
id: {
|
|
37
|
+
sql: `id`,
|
|
38
|
+
type: `number`,
|
|
39
|
+
primaryKey: true,
|
|
40
|
+
},
|
|
41
|
+
name: {
|
|
42
|
+
sql: `name`,
|
|
43
|
+
type: `string`,
|
|
44
|
+
},
|
|
45
|
+
supplierId: {
|
|
46
|
+
sql: `supplier_id`,
|
|
47
|
+
type: `number`,
|
|
48
|
+
},
|
|
49
|
+
},
|
|
50
|
+
|
|
51
|
+
dataSource: 'products',
|
|
52
|
+
});
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
cube(`Suppliers`, {
|
|
2
|
+
sql: `
|
|
3
|
+
SELECT 10 AS id, 'Fruits Inc' AS company
|
|
4
|
+
UNION ALL SELECT 20 AS id, 'Orchards Inc' AS company
|
|
5
|
+
`,
|
|
6
|
+
|
|
7
|
+
preAggregations: {
|
|
8
|
+
suppliersRollup: {
|
|
9
|
+
type: `rollup`,
|
|
10
|
+
external: true,
|
|
11
|
+
dimensions: [CUBE.id, CUBE.company],
|
|
12
|
+
indexes: {
|
|
13
|
+
categoryIndex: {
|
|
14
|
+
columns: [CUBE.id],
|
|
15
|
+
},
|
|
16
|
+
},
|
|
17
|
+
},
|
|
18
|
+
},
|
|
19
|
+
|
|
20
|
+
dimensions: {
|
|
21
|
+
id: {
|
|
22
|
+
sql: `id`,
|
|
23
|
+
type: `number`,
|
|
24
|
+
primaryKey: true,
|
|
25
|
+
},
|
|
26
|
+
|
|
27
|
+
company: {
|
|
28
|
+
sql: `company`,
|
|
29
|
+
type: `string`,
|
|
30
|
+
},
|
|
31
|
+
},
|
|
32
|
+
|
|
33
|
+
dataSource: 'suppliers',
|
|
34
|
+
});
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
version: "2.2"
|
|
2
|
+
|
|
3
|
+
services:
|
|
4
|
+
cube:
|
|
5
|
+
container_name: birdbox-cube
|
|
6
|
+
image: ${BIRDBOX_CUBEJS_REGISTRY_PATH}cubejs/cube:${BIRDBOX_CUBEJS_VERSION:-latest}
|
|
7
|
+
environment:
|
|
8
|
+
CUBEJS_DB_TYPE: postgres
|
|
9
|
+
|
|
10
|
+
CUBEJS_DB_HOST: host.docker.internal
|
|
11
|
+
CUBEJS_DB_PORT: ${CUBEJS_DB_PORT:-5432}
|
|
12
|
+
CUBEJS_DB_NAME: ${CUBEJS_DB_NAME:-test}
|
|
13
|
+
CUBEJS_DB_USER: ${CUBEJS_DB_USER:-test}
|
|
14
|
+
CUBEJS_DB_PASS: ${CUBEJS_DB_PASS:-test}
|
|
15
|
+
|
|
16
|
+
CUBEJS_DB_HOST2: host.docker.internal
|
|
17
|
+
CUBEJS_DB_PORT2: ${CUBEJS_DB_PORT2:-3306}
|
|
18
|
+
CUBEJS_DB_NAME2: ${CUBEJS_DB_NAME2:-mysql}
|
|
19
|
+
CUBEJS_DB_USER2: ${CUBEJS_DB_USER2:-root}
|
|
20
|
+
CUBEJS_DB_PASS2: ${CUBEJS_DB_PASS2:-Test1test}
|
|
21
|
+
|
|
22
|
+
CUBEJS_DEV_MODE: "true"
|
|
23
|
+
CUBEJS_WEB_SOCKETS: "true"
|
|
24
|
+
CUBEJS_API_SECRET: mysupersecret
|
|
25
|
+
volumes:
|
|
26
|
+
- ./multidb/cube.js:/cube/conf/cube.js
|
|
27
|
+
- ./multidb/schema:/cube/conf/schema
|
|
28
|
+
ports:
|
|
29
|
+
- "4000:4000"
|
|
30
|
+
restart: always
|
|
31
|
+
|
|
32
|
+
# Database instances, for troubleshooting.
|
|
33
|
+
# NOT required.
|
|
34
|
+
# Tests provide db instances via testcontainers, in both LOCAL and DOCKER modes.
|
|
35
|
+
|
|
36
|
+
db:
|
|
37
|
+
container_name: birdbox-db
|
|
38
|
+
image: postgres:13
|
|
39
|
+
environment:
|
|
40
|
+
- POSTGRES_PASSWORD=test
|
|
41
|
+
- POSTGRES_USER=test
|
|
42
|
+
- POSTGRES_DB=test
|
|
43
|
+
ports:
|
|
44
|
+
- "5432"
|
|
45
|
+
restart: always
|
|
46
|
+
healthcheck:
|
|
47
|
+
test: ["CMD-SHELL", "pg_isready -U test"]
|
|
48
|
+
interval: 10s
|
|
49
|
+
timeout: 5s
|
|
50
|
+
retries: 5
|
|
51
|
+
|
|
52
|
+
db2:
|
|
53
|
+
container_name: birdbox-db2
|
|
54
|
+
image: mysql:8.0
|
|
55
|
+
command: --default-authentication-plugin=mysql_native_password
|
|
56
|
+
environment:
|
|
57
|
+
- MYSQL_ROOT_PASSWORD=Test1test
|
|
58
|
+
ports:
|
|
59
|
+
- "3306:3306"
|
|
60
|
+
restart: always
|
|
61
|
+
healthcheck:
|
|
62
|
+
test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
|
|
63
|
+
interval: 10s
|
|
64
|
+
timeout: 5s
|
|
65
|
+
retries: 5
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Environment variables that cannot be hardcoded in code, and instead must be specified via the cli.
|
|
3
|
+
* Usually cloud db config & auth variables.
|
|
4
|
+
*/
|
|
5
|
+
export declare const REQUIRED_ENV_VARS: {
|
|
6
|
+
[key: string]: string[];
|
|
7
|
+
};
|
|
8
|
+
//# sourceMappingURL=REQUIRED_ENV_VARS.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"REQUIRED_ENV_VARS.d.ts","sourceRoot":"","sources":["../../src/REQUIRED_ENV_VARS.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,eAAO,MAAM,iBAAiB,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAgBvD,CAAC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.REQUIRED_ENV_VARS = void 0;
|
|
4
4
|
/**
|
|
5
|
-
*
|
|
5
|
+
* Environment variables that cannot be hardcoded in code, and instead must be specified via the cli.
|
|
6
|
+
* Usually cloud db config & auth variables.
|
|
6
7
|
*/
|
|
7
|
-
exports.
|
|
8
|
+
exports.REQUIRED_ENV_VARS = {
|
|
8
9
|
athena: [
|
|
9
10
|
'CUBEJS_AWS_KEY',
|
|
10
11
|
'CUBEJS_AWS_SECRET',
|
|
@@ -17,11 +18,8 @@ exports.REQ_ENV_VARS = {
|
|
|
17
18
|
'CUBEJS_DB_EXPORT_BUCKET',
|
|
18
19
|
'CUBEJS_DB_BQ_CREDENTIALS',
|
|
19
20
|
],
|
|
20
|
-
|
|
21
|
-
'CUBEJS_DB_USER',
|
|
22
|
-
'CUBEJS_DB_PASS',
|
|
23
|
-
'CUBEJS_DB_TYPE',
|
|
24
|
-
],
|
|
21
|
+
multidb: [],
|
|
25
22
|
questdb: [],
|
|
23
|
+
postgres: [],
|
|
26
24
|
};
|
|
27
|
-
//# sourceMappingURL=
|
|
25
|
+
//# sourceMappingURL=REQUIRED_ENV_VARS.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"REQUIRED_ENV_VARS.js","sourceRoot":"","sources":["../../src/REQUIRED_ENV_VARS.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACU,QAAA,iBAAiB,GAA8B;IAC1D,MAAM,EAAE;QACN,gBAAgB;QAChB,mBAAmB;QACnB,mBAAmB;QACnB,+BAA+B;QAC/B,yBAAyB;KAC1B;IACD,QAAQ,EAAE;QACR,yBAAyB;QACzB,yBAAyB;QACzB,0BAA0B;KAC3B;IACD,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,EAAE;CACb,CAAC"}
|
package/dist/src/birdbox.d.ts
CHANGED
|
@@ -18,6 +18,7 @@ export interface ContainerOptions {
|
|
|
18
18
|
* Birdbox options for local/cli mode.
|
|
19
19
|
*/
|
|
20
20
|
export interface LocalOptions extends ContainerOptions {
|
|
21
|
+
schemaDir?: string;
|
|
21
22
|
cubejsConfig?: string;
|
|
22
23
|
useCubejsServerBinary?: boolean;
|
|
23
24
|
}
|
|
@@ -53,9 +54,13 @@ export declare function startBirdBoxFromContainer(options: ContainerOptions): Pr
|
|
|
53
54
|
* Returns Birdbox in cli/local mode.
|
|
54
55
|
*/
|
|
55
56
|
export declare function startBirdBoxFromCli(options: LocalOptions): Promise<BirdBox>;
|
|
57
|
+
export interface BirdboxOptions {
|
|
58
|
+
schemaDir?: string;
|
|
59
|
+
cubejsConfig?: string;
|
|
60
|
+
}
|
|
56
61
|
/**
|
|
57
62
|
* Returns birdbox.
|
|
58
63
|
*/
|
|
59
|
-
export declare function getBirdbox(type: string, env: Env): Promise<BirdBox>;
|
|
64
|
+
export declare function getBirdbox(type: string, env: Env, options?: BirdboxOptions): Promise<BirdBox>;
|
|
60
65
|
export {};
|
|
61
66
|
//# sourceMappingURL=birdbox.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"birdbox.d.ts","sourceRoot":"","sources":["../../src/birdbox.ts"],"names":[],"mappings":"AAmBA;;GAEG;AACH,aAAK,GAAG;IACN,IAAI,WAAW;IACf,IAAI,SAAS;CACd;AAmBD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"birdbox.d.ts","sourceRoot":"","sources":["../../src/birdbox.ts"],"names":[],"mappings":"AAmBA;;GAEG;AACH,aAAK,GAAG;IACN,IAAI,WAAW;IACf,IAAI,SAAS;CACd;AAmBD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,YAAa,SAAQ,gBAAgB;IACpD,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,GAAG;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,uBAAuB,EAAE,MAAM,CAAC;IAChC,gCAAgC,EAAE,MAAM,CAAC;IACzC,qBAAqB,EAAE,MAAM,CAAC;IAC9B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB;AAwED;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,aAAa,EAAE;QACb,aAAa,EAAE,MAAM,CAAC;QACtB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC9B,CAAC;CACH;AAED;;GAEG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,OAAO,CAAC,CAqJlB;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,OAAO,CAAC,CA6JlB;AAED,MAAM,WAAW,cAAc;IAE7B,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,GAAG,EACR,OAAO,CAAC,EAAE,cAAc,oBAkGzB"}
|
package/dist/src/birdbox.js
CHANGED
|
@@ -12,7 +12,7 @@ const http_proxy_1 = __importDefault(require("http-proxy"));
|
|
|
12
12
|
const testcontainers_1 = require("testcontainers");
|
|
13
13
|
const shared_1 = require("@cubejs-backend/shared");
|
|
14
14
|
const testing_shared_1 = require("@cubejs-backend/testing-shared");
|
|
15
|
-
const
|
|
15
|
+
const REQUIRED_ENV_VARS_1 = require("./REQUIRED_ENV_VARS");
|
|
16
16
|
/**
|
|
17
17
|
* Logging options defined in CLI.
|
|
18
18
|
*/
|
|
@@ -27,13 +27,13 @@ var Log;
|
|
|
27
27
|
var Mode;
|
|
28
28
|
(function (Mode) {
|
|
29
29
|
Mode["CLI"] = "cli";
|
|
30
|
-
Mode["
|
|
30
|
+
Mode["LOCAL"] = "local";
|
|
31
31
|
Mode["DOCKER"] = "docker";
|
|
32
32
|
})(Mode || (Mode = {}));
|
|
33
33
|
/**
|
|
34
34
|
* List of permanent test data files.
|
|
35
35
|
*/
|
|
36
|
-
const
|
|
36
|
+
const FILES = [
|
|
37
37
|
'CAST.js',
|
|
38
38
|
'Customers.sql.js',
|
|
39
39
|
'ECommerce.sql.js',
|
|
@@ -42,7 +42,7 @@ const files = [
|
|
|
42
42
|
/**
|
|
43
43
|
* List of test schemas needs to be patched for certain datasource.
|
|
44
44
|
*/
|
|
45
|
-
const
|
|
45
|
+
const SCHEMAS = [
|
|
46
46
|
'Customers.js',
|
|
47
47
|
'ECommerce.js',
|
|
48
48
|
'Products.js',
|
|
@@ -50,18 +50,18 @@ const schemas = [
|
|
|
50
50
|
/**
|
|
51
51
|
* Test data files source folder.
|
|
52
52
|
*/
|
|
53
|
-
const
|
|
53
|
+
const SOURCE = path_1.default.join(process.cwd(), 'birdbox-fixtures', 'driver-test-data');
|
|
54
54
|
/**
|
|
55
55
|
* Test data files target source.
|
|
56
56
|
*/
|
|
57
|
-
const
|
|
57
|
+
const TARGET = path_1.default.join(process.cwd(), 'birdbox-fixtures', 'postgresql', 'schema');
|
|
58
58
|
/**
|
|
59
59
|
* Remove test data files from target directory.
|
|
60
60
|
*/
|
|
61
61
|
function clearTestData() {
|
|
62
|
-
|
|
63
|
-
if (fs_extra_1.default.existsSync(path_1.default.join(
|
|
64
|
-
fs_extra_1.default.removeSync(path_1.default.join(
|
|
62
|
+
FILES.concat(SCHEMAS).forEach((name) => {
|
|
63
|
+
if (fs_extra_1.default.existsSync(path_1.default.join(TARGET, name))) {
|
|
64
|
+
fs_extra_1.default.removeSync(path_1.default.join(TARGET, name));
|
|
65
65
|
}
|
|
66
66
|
});
|
|
67
67
|
}
|
|
@@ -70,11 +70,11 @@ function clearTestData() {
|
|
|
70
70
|
*/
|
|
71
71
|
function prepareTestData(type) {
|
|
72
72
|
clearTestData();
|
|
73
|
-
|
|
74
|
-
fs_extra_1.default.copySync(path_1.default.join(
|
|
73
|
+
FILES.forEach((name) => {
|
|
74
|
+
fs_extra_1.default.copySync(path_1.default.join(SOURCE, name), path_1.default.join(TARGET, name));
|
|
75
75
|
});
|
|
76
|
-
|
|
77
|
-
fs_extra_1.default.writeFileSync(path_1.default.join(
|
|
76
|
+
SCHEMAS.forEach((name) => {
|
|
77
|
+
fs_extra_1.default.writeFileSync(path_1.default.join(TARGET, name), fs_extra_1.default.readFileSync(path_1.default.join(SOURCE, name), 'utf8').replace('_type_', type));
|
|
78
78
|
});
|
|
79
79
|
}
|
|
80
80
|
/**
|
|
@@ -197,6 +197,9 @@ exports.startBirdBoxFromContainer = startBirdBoxFromContainer;
|
|
|
197
197
|
async function startBirdBoxFromCli(options) {
|
|
198
198
|
let db;
|
|
199
199
|
let cli;
|
|
200
|
+
if (!options.cubejsConfig) {
|
|
201
|
+
options.cubejsConfig = 'postgresql/single/cube.js';
|
|
202
|
+
}
|
|
200
203
|
if (options.loadScript) {
|
|
201
204
|
db = await testing_shared_1.PostgresDBRunner.startContainer({
|
|
202
205
|
volumes: [
|
|
@@ -237,10 +240,31 @@ async function startBirdBoxFromCli(options) {
|
|
|
237
240
|
if (fs_extra_1.default.existsSync(path_1.default.join(testDir, '.cubestore'))) {
|
|
238
241
|
fs_extra_1.default.removeSync(path_1.default.join(testDir, '.cubestore'));
|
|
239
242
|
}
|
|
240
|
-
|
|
243
|
+
if (options.schemaDir) {
|
|
244
|
+
fs_extra_1.default.copySync(path_1.default.join(process.cwd(), 'birdbox-fixtures', options.schemaDir), path_1.default.join(testDir, 'schema'));
|
|
245
|
+
}
|
|
241
246
|
if (options.cubejsConfig) {
|
|
242
|
-
fs_extra_1.default.copySync(path_1.default.join(process.cwd(), 'birdbox-fixtures',
|
|
247
|
+
fs_extra_1.default.copySync(path_1.default.join(process.cwd(), 'birdbox-fixtures', options.cubejsConfig), path_1.default.join(testDir, 'cube.js'));
|
|
243
248
|
}
|
|
249
|
+
const env = {
|
|
250
|
+
...process.env,
|
|
251
|
+
CUBEJS_DB_TYPE: options.type === 'postgresql'
|
|
252
|
+
? 'postgres'
|
|
253
|
+
: options.type,
|
|
254
|
+
CUBEJS_DEV_MODE: 'true',
|
|
255
|
+
CUBEJS_API_SECRET: 'mysupersecret',
|
|
256
|
+
CUBEJS_WEB_SOCKETS: 'true',
|
|
257
|
+
CUBEJS_PLAYGROUND_AUTH_SECRET: 'mysupersecret',
|
|
258
|
+
...options.env
|
|
259
|
+
? options.env
|
|
260
|
+
: {
|
|
261
|
+
CUBEJS_DB_HOST: db.getHost(),
|
|
262
|
+
CUBEJS_DB_PORT: `${db.getMappedPort(5432)}`,
|
|
263
|
+
CUBEJS_DB_NAME: 'test',
|
|
264
|
+
CUBEJS_DB_USER: 'test',
|
|
265
|
+
CUBEJS_DB_PASS: 'test',
|
|
266
|
+
}
|
|
267
|
+
};
|
|
244
268
|
try {
|
|
245
269
|
cli = child_process_1.spawn(options.useCubejsServerBinary
|
|
246
270
|
? path_1.default.resolve(process.cwd(), '../cubejs-server/bin/server')
|
|
@@ -255,25 +279,7 @@ async function startBirdBoxFromCli(options) {
|
|
|
255
279
|
options.log,
|
|
256
280
|
options.log,
|
|
257
281
|
],
|
|
258
|
-
env
|
|
259
|
-
...process.env,
|
|
260
|
-
CUBEJS_DB_TYPE: options.type === 'postgresql'
|
|
261
|
-
? 'postgres'
|
|
262
|
-
: options.type,
|
|
263
|
-
CUBEJS_DEV_MODE: 'true',
|
|
264
|
-
CUBEJS_API_SECRET: 'mysupersecret',
|
|
265
|
-
CUBEJS_WEB_SOCKETS: 'true',
|
|
266
|
-
CUBEJS_PLAYGROUND_AUTH_SECRET: 'mysupersecret',
|
|
267
|
-
...options.env
|
|
268
|
-
? options.env
|
|
269
|
-
: {
|
|
270
|
-
CUBEJS_DB_HOST: db.getHost(),
|
|
271
|
-
CUBEJS_DB_PORT: `${db.getMappedPort(5432)}`,
|
|
272
|
-
CUBEJS_DB_NAME: 'test',
|
|
273
|
-
CUBEJS_DB_USER: 'test',
|
|
274
|
-
CUBEJS_DB_PASS: 'test',
|
|
275
|
-
}
|
|
276
|
-
},
|
|
282
|
+
env,
|
|
277
283
|
});
|
|
278
284
|
if (cli.stdout) {
|
|
279
285
|
cli.stdout.on('data', (msg) => {
|
|
@@ -319,7 +325,11 @@ exports.startBirdBoxFromCli = startBirdBoxFromCli;
|
|
|
319
325
|
/**
|
|
320
326
|
* Returns birdbox.
|
|
321
327
|
*/
|
|
322
|
-
async function getBirdbox(type, env) {
|
|
328
|
+
async function getBirdbox(type, env, options) {
|
|
329
|
+
// default options
|
|
330
|
+
if (!options) {
|
|
331
|
+
options = {};
|
|
332
|
+
}
|
|
323
333
|
// extract mode
|
|
324
334
|
const args = yargs_1.default(process.argv.slice(2))
|
|
325
335
|
.exitProcess(false)
|
|
@@ -328,10 +338,10 @@ async function getBirdbox(type, env) {
|
|
|
328
338
|
describe: 'Determines Birdbox mode.',
|
|
329
339
|
choices: [
|
|
330
340
|
Mode.CLI,
|
|
331
|
-
Mode.
|
|
341
|
+
Mode.LOCAL,
|
|
332
342
|
Mode.DOCKER,
|
|
333
343
|
],
|
|
334
|
-
default: Mode.
|
|
344
|
+
default: Mode.LOCAL,
|
|
335
345
|
},
|
|
336
346
|
log: {
|
|
337
347
|
describe: 'Determines Birdbox logging.',
|
|
@@ -345,12 +355,14 @@ async function getBirdbox(type, env) {
|
|
|
345
355
|
.argv;
|
|
346
356
|
const { mode, log } = args;
|
|
347
357
|
// extract/assert env variables
|
|
348
|
-
if (
|
|
349
|
-
|
|
358
|
+
if (REQUIRED_ENV_VARS_1.REQUIRED_ENV_VARS[type] === undefined) {
|
|
359
|
+
if (log === Log.PIPE) {
|
|
360
|
+
process.stderr.write(`Error: list of required environment variables is missing for ${type}\n`);
|
|
361
|
+
}
|
|
350
362
|
process.exit(1);
|
|
351
363
|
}
|
|
352
364
|
else {
|
|
353
|
-
|
|
365
|
+
REQUIRED_ENV_VARS_1.REQUIRED_ENV_VARS[type].forEach((key) => {
|
|
354
366
|
if (process.env[key] === undefined) {
|
|
355
367
|
process.stderr.write(`Error: ${key} is required environment variable for ${type}\n`);
|
|
356
368
|
process.exit(1);
|
|
@@ -368,13 +380,14 @@ async function getBirdbox(type, env) {
|
|
|
368
380
|
try {
|
|
369
381
|
switch (mode) {
|
|
370
382
|
case Mode.CLI:
|
|
371
|
-
case Mode.
|
|
383
|
+
case Mode.LOCAL: {
|
|
372
384
|
birdbox = await startBirdBoxFromCli({
|
|
373
385
|
type,
|
|
374
386
|
env,
|
|
375
387
|
log,
|
|
376
|
-
cubejsConfig:
|
|
377
|
-
|
|
388
|
+
cubejsConfig: options.cubejsConfig,
|
|
389
|
+
schemaDir: options.schemaDir,
|
|
390
|
+
useCubejsServerBinary: mode === Mode.LOCAL,
|
|
378
391
|
});
|
|
379
392
|
break;
|
|
380
393
|
}
|
|
@@ -382,7 +395,7 @@ async function getBirdbox(type, env) {
|
|
|
382
395
|
birdbox = await startBirdBoxFromContainer({
|
|
383
396
|
type: type === 'postgres' ? 'postgresql' : type,
|
|
384
397
|
log,
|
|
385
|
-
env
|
|
398
|
+
env,
|
|
386
399
|
});
|
|
387
400
|
break;
|
|
388
401
|
}
|
|
@@ -394,7 +407,7 @@ async function getBirdbox(type, env) {
|
|
|
394
407
|
}
|
|
395
408
|
catch (e) {
|
|
396
409
|
clearTestData();
|
|
397
|
-
process.stderr.write(e);
|
|
410
|
+
process.stderr.write(e.toString());
|
|
398
411
|
process.exit(1);
|
|
399
412
|
}
|
|
400
413
|
return birdbox;
|
package/dist/src/birdbox.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"birdbox.js","sourceRoot":"","sources":["../../src/birdbox.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"birdbox.js","sourceRoot":"","sources":["../../src/birdbox.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cubejs-backend/testing",
|
|
3
|
-
"version": "0.29.
|
|
3
|
+
"version": "0.29.54",
|
|
4
4
|
"description": "Cube.js e2e tests",
|
|
5
5
|
"author": "Cube Dev, Inc.",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -36,12 +36,12 @@
|
|
|
36
36
|
"birdbox:local:postgresql-pre-aggregations:snapshot": "USE_LOCAL_CUBEJS_BINARY=true jest --verbose --updateSnapshot -i dist/test/cli-postgresql-pre-aggregations.test.js",
|
|
37
37
|
"cypress:install": "cypress install",
|
|
38
38
|
"cypress:birdbox": "node dist/test/bin/cypress-birdbox.js",
|
|
39
|
-
"birdbox:postgre": "jest --verbose -i dist/test/birdbox-postgre.test.js",
|
|
40
|
-
"birdbox:postgre:snapshot": "jest --verbose --updateSnapshot -i dist/test/birdbox-postgre.test.js",
|
|
41
39
|
"birdbox:athena": "jest --verbose -i dist/test/birdbox-athena.test.js",
|
|
42
40
|
"birdbox:athena:snapshot": "jest --verbose --updateSnapshot -i dist/test/birdbox-athena.test.js",
|
|
43
41
|
"birdbox:bigquery": "jest --verbose -i dist/test/birdbox-bigquery.test.js",
|
|
44
42
|
"birdbox:bigquery:snapshot": "jest --verbose --updateSnapshot -i dist/test/birdbox-bigquery.test.js",
|
|
43
|
+
"birdbox:multidb": "jest --verbose -i dist/test/birdbox-multidb.test.js",
|
|
44
|
+
"birdbox:multidb:snapshot": "jest --verbose --updateSnapshot -i dist/test/birdbox-multidb.test.js",
|
|
45
45
|
"driver:athena": "jest --verbose -i dist/test/driver-athena.test.js",
|
|
46
46
|
"driver:athena:snap": "jest --verbose --updateSnapshot -i dist/test/driver-athena.test.js",
|
|
47
47
|
"driver:bigquery": "jest --verbose -i dist/test/driver-bigquery.test.js",
|
|
@@ -58,10 +58,10 @@
|
|
|
58
58
|
"dependencies": {
|
|
59
59
|
"@cubejs-backend/dotenv": "^9.0.2",
|
|
60
60
|
"@cubejs-backend/query-orchestrator": "^0.29.51",
|
|
61
|
-
"@cubejs-backend/schema-compiler": "^0.29.
|
|
61
|
+
"@cubejs-backend/schema-compiler": "^0.29.54",
|
|
62
62
|
"@cubejs-backend/shared": "^0.29.51",
|
|
63
|
-
"@cubejs-backend/testing-shared": "^0.29.
|
|
64
|
-
"@cubejs-client/ws-transport": "^0.29.
|
|
63
|
+
"@cubejs-backend/testing-shared": "^0.29.54",
|
|
64
|
+
"@cubejs-client/ws-transport": "^0.29.54",
|
|
65
65
|
"dedent": "^0.7.0",
|
|
66
66
|
"fs-extra": "^8.1.0",
|
|
67
67
|
"http-proxy": "^1.18.1",
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"devDependencies": {
|
|
74
74
|
"@4tw/cypress-drag-drop": "^1.6.0",
|
|
75
75
|
"@cubejs-backend/linter": "^0.29.23",
|
|
76
|
-
"@cubejs-client/core": "^0.29.
|
|
76
|
+
"@cubejs-client/core": "^0.29.54",
|
|
77
77
|
"@jest/globals": "^26.6.2",
|
|
78
78
|
"@types/dedent": "^0.7.0",
|
|
79
79
|
"@types/http-proxy": "^1.17.5",
|
|
@@ -105,5 +105,5 @@
|
|
|
105
105
|
"eslintConfig": {
|
|
106
106
|
"extends": "../cubejs-linter"
|
|
107
107
|
},
|
|
108
|
-
"gitHead": "
|
|
108
|
+
"gitHead": "c5383fcfaaa088e6ca09cee3384da163d3ad6af5"
|
|
109
109
|
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"REQ_ENV_VARS.d.ts","sourceRoot":"","sources":["../../src/REQ_ENV_VARS.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,YAAY,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAmBlD,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"REQ_ENV_VARS.js","sourceRoot":"","sources":["../../src/REQ_ENV_VARS.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACU,QAAA,YAAY,GAA8B;IACrD,MAAM,EAAE;QACN,gBAAgB;QAChB,mBAAmB;QACnB,mBAAmB;QACnB,+BAA+B;QAC/B,yBAAyB;KAC1B;IACD,QAAQ,EAAE;QACR,yBAAyB;QACzB,yBAAyB;QACzB,0BAA0B;KAC3B;IACD,QAAQ,EAAE;QACR,gBAAgB;QAChB,gBAAgB;QAChB,gBAAgB;KACjB;IACD,OAAO,EAAE,EAAE;CACZ,CAAC"}
|