@elastic/synthetics 1.17.2 → 1.18.1
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/cli.js.map +1 -1
- package/dist/common_types.d.ts.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +1 -1
- package/dist/config.js.map +1 -1
- package/dist/core/globals.d.ts +1 -0
- package/dist/core/globals.d.ts.map +1 -1
- package/dist/core/globals.js +12 -1
- package/dist/core/globals.js.map +1 -1
- package/dist/core/logger.d.ts.map +1 -1
- package/dist/core/logger.js +2 -7
- package/dist/core/logger.js.map +1 -1
- package/dist/core/mfa.d.ts.map +1 -1
- package/dist/core/mfa.js +1 -1
- package/dist/core/runner.d.ts.map +1 -1
- package/dist/core/runner.js +1 -0
- package/dist/core/runner.js.map +1 -1
- package/dist/dsl/monitor.d.ts +4 -0
- package/dist/dsl/monitor.d.ts.map +1 -1
- package/dist/dsl/monitor.js +6 -0
- package/dist/dsl/monitor.js.map +1 -1
- package/dist/formatter/javascript.d.ts.map +1 -1
- package/dist/formatter/javascript.js.map +1 -1
- package/dist/generator/utils.d.ts +1 -1
- package/dist/helpers.d.ts.map +1 -1
- package/dist/helpers.js.map +1 -1
- package/dist/plugins/tracing.js.map +1 -1
- package/dist/push/bundler.d.ts +2 -5
- package/dist/push/bundler.d.ts.map +1 -1
- package/dist/push/bundler.js +15 -30
- package/dist/push/bundler.js.map +1 -1
- package/dist/push/index.d.ts.map +1 -1
- package/dist/push/index.js +38 -15
- package/dist/push/index.js.map +1 -1
- package/dist/push/kibana_api.d.ts +2 -1
- package/dist/push/kibana_api.d.ts.map +1 -1
- package/dist/push/kibana_api.js +6 -4
- package/dist/push/kibana_api.js.map +1 -1
- package/dist/push/monitor.d.ts +5 -1
- package/dist/push/monitor.d.ts.map +1 -1
- package/dist/push/monitor.js +14 -2
- package/dist/push/monitor.js.map +1 -1
- package/dist/push/request.d.ts +2 -2
- package/dist/push/request.d.ts.map +1 -1
- package/dist/push/request.js +7 -6
- package/dist/push/request.js.map +1 -1
- package/dist/push/run-local.d.ts +27 -0
- package/dist/push/run-local.d.ts.map +1 -0
- package/dist/push/run-local.js +132 -0
- package/dist/push/run-local.js.map +1 -0
- package/dist/push/utils.d.ts +6 -1
- package/dist/push/utils.d.ts.map +1 -1
- package/dist/push/utils.js +61 -6
- package/dist/push/utils.js.map +1 -1
- package/dist/reporters/base.d.ts.map +1 -1
- package/dist/reporters/base.js.map +1 -1
- package/dist/reporters/build_kite_cli.d.ts.map +1 -1
- package/dist/reporters/build_kite_cli.js.map +1 -1
- package/dist/reporters/json.d.ts +1 -1
- package/dist/reporters/json.d.ts.map +1 -1
- package/dist/reporters/json.js +6 -2
- package/dist/reporters/json.js.map +1 -1
- package/dist/reporters/junit.d.ts.map +1 -1
- package/dist/reporters/junit.js.map +1 -1
- package/package.json +13 -10
- package/src/cli.ts +8 -3
- package/src/common_types.ts +1 -1
- package/src/config.ts +3 -1
- package/src/core/globals.ts +12 -0
- package/src/core/logger.ts +2 -8
- package/src/core/mfa.ts +11 -11
- package/src/core/runner.ts +1 -0
- package/src/dsl/monitor.ts +7 -0
- package/src/formatter/javascript.ts +3 -1
- package/src/helpers.ts +3 -3
- package/src/loader.ts +1 -1
- package/src/plugins/tracing.ts +1 -1
- package/src/push/bundler.ts +16 -36
- package/src/push/index.ts +59 -24
- package/src/push/kibana_api.ts +7 -3
- package/src/push/monitor.ts +18 -5
- package/src/push/request.ts +26 -7
- package/src/push/run-local.ts +155 -0
- package/src/push/utils.ts +87 -9
- package/src/reporters/base.ts +8 -4
- package/src/reporters/build_kite_cli.ts +7 -6
- package/src/reporters/json.ts +10 -14
- package/src/reporters/junit.ts +4 -10
package/dist/push/index.js
CHANGED
|
@@ -34,7 +34,8 @@ const helpers_1 = require("../helpers");
|
|
|
34
34
|
const config_1 = require("../config");
|
|
35
35
|
const kibana_api_1 = require("./kibana_api");
|
|
36
36
|
const utils_1 = require("./utils");
|
|
37
|
-
const
|
|
37
|
+
const run_local_1 = require("./run-local");
|
|
38
|
+
const globals_1 = require("../core/globals");
|
|
38
39
|
async function push(monitors, options) {
|
|
39
40
|
if (parseInt(process.env.CHUNK_SIZE) > 250) {
|
|
40
41
|
throw (0, helpers_1.error)('Invalid CHUNK_SIZE. CHUNK_SIZE must be less than or equal to 250');
|
|
@@ -52,32 +53,50 @@ async function push(monitors, options) {
|
|
|
52
53
|
}
|
|
53
54
|
const { monitors: remote } = await (0, kibana_api_1.bulkGetMonitors)(options);
|
|
54
55
|
(0, helpers_1.progress)(`preparing ${monitors.length} monitors`);
|
|
55
|
-
const schemas = await (0, monitor_1.buildMonitorSchema)(monitors, true);
|
|
56
|
+
const { schemas, sizes } = await (0, monitor_1.buildMonitorSchema)(monitors, true);
|
|
56
57
|
const local = (0, monitor_1.getLocalMonitors)(schemas);
|
|
57
58
|
const { newIDs, changedIDs, removedIDs, unchangedIDs } = (0, monitor_1.diffMonitors)(local, remote);
|
|
58
59
|
(0, utils_1.logDiff)(newIDs, changedIDs, removedIDs, unchangedIDs);
|
|
60
|
+
if ((0, globals_1.inDebugMode)()) {
|
|
61
|
+
(0, utils_1.logGroups)(sizes, newIDs, changedIDs, removedIDs, unchangedIDs);
|
|
62
|
+
// show bundle size for the whole project
|
|
63
|
+
let totalSize = 0;
|
|
64
|
+
for (const value of sizes.values()) {
|
|
65
|
+
totalSize += value;
|
|
66
|
+
}
|
|
67
|
+
(0, helpers_1.progress)(`total size of the ${sizes.size} monitors payload is ` +
|
|
68
|
+
(0, utils_1.printBytes)(totalSize));
|
|
69
|
+
}
|
|
70
|
+
if (options.dryRun) {
|
|
71
|
+
(0, helpers_1.progress)('Running browser monitors in dry run mode');
|
|
72
|
+
await (0, run_local_1.runLocal)(schemas);
|
|
73
|
+
(0, helpers_1.progress)('Dry run completed');
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
59
76
|
const updatedMonitors = new Set([...changedIDs, ...newIDs]);
|
|
60
77
|
if (updatedMonitors.size > 0) {
|
|
61
78
|
const updatedMonSchemas = schemas.filter(s => updatedMonitors.has(s.id));
|
|
62
|
-
const
|
|
63
|
-
|
|
64
|
-
|
|
79
|
+
const batches = (0, utils_1.getSizedBatches)(updatedMonSchemas, sizes, kibana_api_1.MAX_PAYLOAD_SIZE_KB, kibana_api_1.BATCH_SIZE);
|
|
80
|
+
if (batches.length > 1) {
|
|
81
|
+
(0, helpers_1.progress)(`Monitors will be pushed as ${batches.length} batches.`);
|
|
82
|
+
}
|
|
83
|
+
for (const batch of batches) {
|
|
84
|
+
await (0, helpers_1.liveProgress)((0, kibana_api_1.bulkPutMonitors)(options, batch), `creating or updating ${batch.length} monitors`);
|
|
65
85
|
}
|
|
66
86
|
}
|
|
67
87
|
if (removedIDs.size > 0) {
|
|
68
|
-
(0, logger_1.log)(`deleting monitor ids: ${Array.from(removedIDs.keys()).join(', ')}`);
|
|
69
88
|
if (updatedMonitors.size === 0 && unchangedIDs.size === 0) {
|
|
70
89
|
await confirmDelete(`Pushing without any monitors will delete all monitors associated with the project.\n Do you want to continue?`, options.yes);
|
|
71
90
|
}
|
|
72
91
|
else {
|
|
73
92
|
await confirmDelete(`Deleting ${removedIDs.size} monitors. Do you want to continue?`, options.yes);
|
|
74
93
|
}
|
|
75
|
-
const
|
|
76
|
-
for (const
|
|
77
|
-
await (0, helpers_1.liveProgress)((0, kibana_api_1.bulkDeleteMonitors)(options,
|
|
94
|
+
const batches = (0, utils_1.getBatches)(Array.from(removedIDs), kibana_api_1.BATCH_SIZE);
|
|
95
|
+
for (const batch of batches) {
|
|
96
|
+
await (0, helpers_1.liveProgress)((0, kibana_api_1.bulkDeleteMonitors)(options, batch), `deleting ${batch.length} monitors`);
|
|
78
97
|
}
|
|
79
98
|
}
|
|
80
|
-
(0, helpers_1.done)(`Pushed: ${(0, colors_1.
|
|
99
|
+
(0, helpers_1.done)(`Pushed: ${(0, colors_1.underline)((0, helpers_1.getMonitorManagementURL)(options.url))} `);
|
|
81
100
|
}
|
|
82
101
|
exports.push = push;
|
|
83
102
|
async function confirmDelete(message, skip) {
|
|
@@ -225,19 +244,23 @@ async function pushLegacy(monitors, options) {
|
|
|
225
244
|
throw (0, helpers_1.error)(`Aborted: Lightweight monitors are not supported in ${options.kibanaVersion}. Please upgrade to 8.5.0 or above.`);
|
|
226
245
|
}
|
|
227
246
|
let schemas = [];
|
|
247
|
+
let sizes = new Map();
|
|
228
248
|
if (monitors.length > 0) {
|
|
229
249
|
(0, helpers_1.progress)(`preparing ${monitors.length} monitors`);
|
|
230
|
-
schemas = await (0, monitor_1.buildMonitorSchema)(monitors, false);
|
|
231
|
-
const
|
|
232
|
-
|
|
233
|
-
|
|
250
|
+
({ schemas, sizes } = await (0, monitor_1.buildMonitorSchema)(monitors, false));
|
|
251
|
+
const batches = (0, utils_1.getSizedBatches)(schemas, sizes, kibana_api_1.MAX_PAYLOAD_SIZE_KB, 10);
|
|
252
|
+
if (batches.length > 1) {
|
|
253
|
+
(0, helpers_1.progress)(`Monitors will be pushed as ${batches.length} batches.`);
|
|
254
|
+
}
|
|
255
|
+
for (const batch of batches) {
|
|
256
|
+
await (0, helpers_1.liveProgress)((0, kibana_api_1.createMonitorsLegacy)({ schemas: batch, keepStale: true, options }), `creating or updating ${batch.length} monitors`);
|
|
234
257
|
}
|
|
235
258
|
}
|
|
236
259
|
else {
|
|
237
260
|
await confirmDelete(`Pushing without any monitors will delete all monitors associated with the project.\n Do you want to continue?`, options.yes);
|
|
238
261
|
}
|
|
239
262
|
await (0, helpers_1.liveProgress)((0, kibana_api_1.createMonitorsLegacy)({ schemas, keepStale: false, options }), `deleting all stale monitors`);
|
|
240
|
-
(0, helpers_1.done)(`Pushed: ${(0, colors_1.
|
|
263
|
+
(0, helpers_1.done)(`Pushed: ${(0, colors_1.underline)((0, helpers_1.getMonitorManagementURL)(options.url))}`);
|
|
241
264
|
}
|
|
242
265
|
exports.pushLegacy = pushLegacy;
|
|
243
266
|
// prints warning if any of the monitors has throttling settings enabled during push
|
package/dist/push/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,0CAAkD;AAClD,uCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,8 @@
|
|
|
25
25
|
import { PushOptions } from '../common_types';
|
|
26
26
|
import { MonitorHashID, MonitorSchema } from './monitor';
|
|
27
27
|
import { APIMonitorError } from './request';
|
|
28
|
-
export declare const
|
|
28
|
+
export declare const BATCH_SIZE: number;
|
|
29
|
+
export declare const MAX_PAYLOAD_SIZE_KB: number;
|
|
29
30
|
export type PutResponse = {
|
|
30
31
|
createdMonitors: string[];
|
|
31
32
|
updatedMonitors: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kibana_api.d.ts","sourceRoot":"","sources":["../../src/push/kibana_api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACzD,OAAO,EAML,eAAe,EAChB,MAAM,WAAW,CAAC;AAInB,eAAO,MAAM,UAAU,QAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"kibana_api.d.ts","sourceRoot":"","sources":["../../src/push/kibana_api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACzD,OAAO,EAML,eAAe,EAChB,MAAM,WAAW,CAAC;AAInB,eAAO,MAAM,UAAU,QAA0C,CAAC;AAClE,eAAO,MAAM,mBAAmB,QAAY,CAAC;AAE7C,MAAM,MAAM,WAAW,GAAG;IACxB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,cAAc,EAAE,eAAe,EAAE,CAAC;CACnC,CAAC;AAEF,wBAAsB,eAAe,CACnC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,aAAa,EAAE,wBAgBzB;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAsB,eAAe,CACnC,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,WAAW,CAAC,CAkBtB;AAmBD,MAAM,MAAM,cAAc,GAAG;IAC3B,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAEF,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAAE,2BAQrB;AAQD,wBAAsB,UAAU,CAAC,OAAO,EAAE,WAAW,mBAQpD;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B,CAAC;AAEF,wBAAsB,oBAAoB,CAAC,EACzC,OAAO,EACP,SAAS,EACT,OAAO,GACR,EAAE;IACD,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,WAAW,CAAC;CACtB,iBAoCA"}
|
package/dist/push/kibana_api.js
CHANGED
|
@@ -24,15 +24,17 @@
|
|
|
24
24
|
*
|
|
25
25
|
*/
|
|
26
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
|
-
exports.createMonitorsLegacy = exports.getVersion = exports.bulkDeleteMonitors = exports.bulkGetMonitors = exports.bulkPutMonitors = exports.
|
|
27
|
+
exports.createMonitorsLegacy = exports.getVersion = exports.bulkDeleteMonitors = exports.bulkGetMonitors = exports.bulkPutMonitors = exports.MAX_PAYLOAD_SIZE_KB = exports.BATCH_SIZE = void 0;
|
|
28
28
|
const helpers_1 = require("../helpers");
|
|
29
29
|
const request_1 = require("./request");
|
|
30
30
|
const utils_1 = require("./utils");
|
|
31
|
-
// Default
|
|
32
|
-
exports.
|
|
31
|
+
// Default batch size for bulk put / delete
|
|
32
|
+
exports.BATCH_SIZE = parseInt(process.env.CHUNK_SIZE) || 250;
|
|
33
|
+
exports.MAX_PAYLOAD_SIZE_KB = 50 * 1000; // 50 MB in KB
|
|
33
34
|
async function bulkPutMonitors(options, schemas) {
|
|
35
|
+
const url = (0, utils_1.generateURL)(options, 'bulk_update') + '/_bulk_update';
|
|
34
36
|
const resp = await (0, request_1.sendReqAndHandleError)({
|
|
35
|
-
url
|
|
37
|
+
url,
|
|
36
38
|
method: 'PUT',
|
|
37
39
|
auth: options.auth,
|
|
38
40
|
body: JSON.stringify({ monitors: schemas }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kibana_api.js","sourceRoot":"","sources":["../../src/push/kibana_api.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAGH,wCAA6C;AAE7C,uCAOmB;AACnB,mCAAsC;AAEtC,2CAA2C;AAC9B,QAAA,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"kibana_api.js","sourceRoot":"","sources":["../../src/push/kibana_api.ts"],"names":[],"mappings":"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"}
|
package/dist/push/monitor.d.ts
CHANGED
|
@@ -29,6 +29,7 @@ export type MonitorSchema = Omit<MonitorConfig, 'locations'> & {
|
|
|
29
29
|
content?: string;
|
|
30
30
|
filter?: Monitor['filter'];
|
|
31
31
|
hash?: string;
|
|
32
|
+
size?: number;
|
|
32
33
|
};
|
|
33
34
|
export type MonitorHashID = {
|
|
34
35
|
journey_id?: string;
|
|
@@ -42,7 +43,10 @@ declare class RemoteDiffResult {
|
|
|
42
43
|
}
|
|
43
44
|
export declare function diffMonitors(local: MonitorHashID[], remote: MonitorHashID[]): RemoteDiffResult;
|
|
44
45
|
export declare function getLocalMonitors(schemas: MonitorSchema[]): MonitorHashID[];
|
|
45
|
-
export declare function buildMonitorSchema(monitors: Monitor[], isV2: boolean): Promise<
|
|
46
|
+
export declare function buildMonitorSchema(monitors: Monitor[], isV2: boolean): Promise<{
|
|
47
|
+
schemas: MonitorSchema[];
|
|
48
|
+
sizes: Map<string, number>;
|
|
49
|
+
}>;
|
|
46
50
|
export declare function createLightweightMonitors(workDir: string, options: PushOptions): Promise<Monitor[]>;
|
|
47
51
|
export declare function buildMonitorFromYaml(config: MonitorConfig, options: PushOptions): Monitor;
|
|
48
52
|
export declare const parseAlertConfig: (config: MonitorConfig, gConfig?: AlertConfig) => {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAUH,OAAO,EACL,WAAW,EAEX,OAAO,EACP,aAAa,EACd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAUH,OAAO,EACL,WAAW,EAEX,OAAO,EACP,aAAa,EACd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAQ9C,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,GAAG;IAC7D,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAIF,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAOF,cAAM,gBAAgB;IAEpB,MAAM,cAAqB;IAE3B,UAAU,cAAqB;IAE/B,UAAU,cAAqB;IAE/B,YAAY,cAAqB;CAClC;AAED,wBAAgB,YAAY,CAC1B,KAAK,EAAE,aAAa,EAAE,EACtB,MAAM,EAAE,aAAa,EAAE,GACtB,gBAAgB,CAiClB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,mBASxD;AAED,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO;;;GAkD1E;AAED,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,WAAW,sBAsFrB;AAGD,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,WAAW,WAsCrB;AAUD,eAAO,MAAM,gBAAgB,WACnB,aAAa,YACX,WAAW,OAatB,CAAC;AAEF,eAAO,MAAM,WAAW,WACd,aAAa,YACX,OAAO,MAAM,EAAE,MAAM,CAAC,OAejC,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,QAAQ,GAAG,KAAK,EACrB,MAAM,EAAE,aAAa,EACrB,WAAW,CAAC,EAAE,WAAW,GACxB;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CA4BtB;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,sEAoC7C"}
|
package/dist/push/monitor.js
CHANGED
|
@@ -40,6 +40,8 @@ const monitor_1 = require("../dsl/monitor");
|
|
|
40
40
|
const utils_1 = require("./utils");
|
|
41
41
|
// Allowed extensions for lightweight monitor files
|
|
42
42
|
const ALLOWED_LW_EXTENSIONS = ['.yml', '.yaml'];
|
|
43
|
+
// 1500kB Max Gzipped limit for bundled monitor code to be pushed as Kibana project monitors.
|
|
44
|
+
const SIZE_LIMIT_KB = 1500;
|
|
43
45
|
function translateLocation(locations) {
|
|
44
46
|
if (!locations)
|
|
45
47
|
return [];
|
|
@@ -110,6 +112,7 @@ async function buildMonitorSchema(monitors, isV2) {
|
|
|
110
112
|
await (0, promises_1.mkdir)(bundlePath, { recursive: true });
|
|
111
113
|
const bundler = new bundler_1.Bundler();
|
|
112
114
|
const schemas = [];
|
|
115
|
+
const sizes = new Map();
|
|
113
116
|
for (const monitor of monitors) {
|
|
114
117
|
const { source, config, filter, type } = monitor;
|
|
115
118
|
const schema = {
|
|
@@ -122,6 +125,15 @@ async function buildMonitorSchema(monitors, isV2) {
|
|
|
122
125
|
monitor.setContent(content);
|
|
123
126
|
Object.assign(schema, { content, filter });
|
|
124
127
|
}
|
|
128
|
+
const size = monitor.size();
|
|
129
|
+
const sizeKB = Math.round(size / 1000);
|
|
130
|
+
if (sizeKB > SIZE_LIMIT_KB) {
|
|
131
|
+
let outer = (0, colors_1.bold)(`Aborted: Bundled code ${sizeKB}kB exceeds the recommended ${SIZE_LIMIT_KB}kB limit. Please check the dependencies imported.\n`);
|
|
132
|
+
const inner = `* ${config.id} - ${source.file}:${source.line}:${source.column}\n`;
|
|
133
|
+
outer += (0, helpers_1.indent)(inner);
|
|
134
|
+
throw (0, colors_1.red)(outer);
|
|
135
|
+
}
|
|
136
|
+
sizes.set(config.id, size);
|
|
125
137
|
/**
|
|
126
138
|
* Generate hash only after the bundled content is created
|
|
127
139
|
* to capture code changes in imported files
|
|
@@ -132,7 +144,7 @@ async function buildMonitorSchema(monitors, isV2) {
|
|
|
132
144
|
schemas.push(schema);
|
|
133
145
|
}
|
|
134
146
|
await (0, promises_1.rm)(bundlePath, { recursive: true });
|
|
135
|
-
return schemas;
|
|
147
|
+
return { schemas, sizes };
|
|
136
148
|
}
|
|
137
149
|
exports.buildMonitorSchema = buildMonitorSchema;
|
|
138
150
|
async function createLightweightMonitors(workDir, options) {
|
|
@@ -238,7 +250,7 @@ function buildMonitorFromYaml(config, options) {
|
|
|
238
250
|
alert: alertConfig,
|
|
239
251
|
});
|
|
240
252
|
/**
|
|
241
|
-
* Params support is only available for
|
|
253
|
+
* Params support is only available for lightweight monitors
|
|
242
254
|
* post 8.7.2 stack
|
|
243
255
|
*/
|
|
244
256
|
if ((0, utils_1.isParamOptionSupported)(options.kibanaVersion)) {
|
package/dist/push/monitor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":"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"}
|
package/dist/push/request.d.ts
CHANGED
|
@@ -31,7 +31,7 @@ export type APIRequestOptions = {
|
|
|
31
31
|
};
|
|
32
32
|
export declare function sendRequest(options: APIRequestOptions): Promise<Dispatcher.ResponseData>;
|
|
33
33
|
export declare function sendReqAndHandleError<T>(options: APIRequestOptions): Promise<T>;
|
|
34
|
-
export declare function handleError(statusCode: number, url: string, body: Dispatcher.ResponseData['body']): Promise<Dispatcher.ResponseData['body']>;
|
|
34
|
+
export declare function handleError(statusCode: number, url: string, body: Dispatcher.ResponseData['body'], extraMessage?: string): Promise<Dispatcher.ResponseData['body']>;
|
|
35
35
|
export declare function ok(statusCode: number): boolean;
|
|
36
36
|
export type APIMonitorError = {
|
|
37
37
|
id?: string;
|
|
@@ -39,7 +39,7 @@ export type APIMonitorError = {
|
|
|
39
39
|
details: string;
|
|
40
40
|
};
|
|
41
41
|
export declare function formatNotFoundError(url: string, message: string): string;
|
|
42
|
-
export declare function formatAPIError(
|
|
42
|
+
export declare function formatAPIError(statusCode: number, error: string, message: string, extraMessage?: string): string;
|
|
43
43
|
export declare function formatFailedMonitors(errors: APIMonitorError[]): string;
|
|
44
44
|
export declare function formatStaleMonitors(errors: APIMonitorError[]): string;
|
|
45
45
|
//# sourceMappingURL=request.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/push/request.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAOzC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,wBAAsB,WAAW,CAAC,OAAO,EAAE,iBAAiB,oCAc3D;AAED,wBAAsB,qBAAqB,CAAC,CAAC,EAC3C,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/push/request.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAOzC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,wBAAsB,WAAW,CAAC,OAAO,EAAE,iBAAiB,oCAc3D;AAED,wBAAsB,qBAAqB,CAAC,CAAC,EAC3C,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,CAAC,CAAC,CAWZ;AAUD,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,EACrC,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAyB1C;AAED,wBAAgB,EAAE,CAAC,UAAU,EAAE,MAAM,WAEpC;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAM/D;AAED,wBAAgB,cAAc,CAC5B,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,YAAY,SAAK,UAUlB;AAcD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,UAG7D;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,eAAe,EAAE,UAG5D"}
|
package/dist/push/request.js
CHANGED
|
@@ -48,13 +48,13 @@ async function sendRequest(options) {
|
|
|
48
48
|
exports.sendRequest = sendRequest;
|
|
49
49
|
async function sendReqAndHandleError(options) {
|
|
50
50
|
const { statusCode, body } = await sendRequest(options);
|
|
51
|
-
return (await handleError(statusCode, options.url, body)).json();
|
|
51
|
+
return (await handleError(statusCode, options.url, body, statusCode === 413 ? `${options.body?.length} bytes sent` : '')).json();
|
|
52
52
|
}
|
|
53
53
|
exports.sendReqAndHandleError = sendReqAndHandleError;
|
|
54
54
|
// Handle bad status code errors from Kibana API and format the
|
|
55
55
|
// error message to be displayed to the user.
|
|
56
56
|
// returns the response stream if no error is found
|
|
57
|
-
async function handleError(statusCode, url, body) {
|
|
57
|
+
async function handleError(statusCode, url, body, extraMessage) {
|
|
58
58
|
if (statusCode === 404) {
|
|
59
59
|
throw formatNotFoundError(url, await body.text());
|
|
60
60
|
}
|
|
@@ -65,9 +65,9 @@ async function handleError(statusCode, url, body) {
|
|
|
65
65
|
parsed = JSON.parse(resp);
|
|
66
66
|
}
|
|
67
67
|
catch (e) {
|
|
68
|
-
throw formatAPIError(statusCode, 'unexpected error', e.message);
|
|
68
|
+
throw formatAPIError(statusCode, 'unexpected error', e.message, extraMessage);
|
|
69
69
|
}
|
|
70
|
-
throw formatAPIError(statusCode, parsed.error, parsed.message);
|
|
70
|
+
throw formatAPIError(statusCode, parsed.error, parsed.message, extraMessage);
|
|
71
71
|
}
|
|
72
72
|
return body;
|
|
73
73
|
}
|
|
@@ -80,11 +80,12 @@ function formatNotFoundError(url, message) {
|
|
|
80
80
|
return (0, colors_1.red)((0, colors_1.bold)(`${helpers_1.symbols['failed']} Please check your kibana url: ${url} and try again - 404:${message}`));
|
|
81
81
|
}
|
|
82
82
|
exports.formatNotFoundError = formatNotFoundError;
|
|
83
|
-
function formatAPIError(
|
|
83
|
+
function formatAPIError(statusCode, error, message, extraMessage = '') {
|
|
84
84
|
let outer = (0, colors_1.bold)(`${helpers_1.symbols['failed']} Error\n`);
|
|
85
|
-
let inner = (0, colors_1.bold)(`${helpers_1.symbols['failed']} monitor creation failed - ${
|
|
85
|
+
let inner = (0, colors_1.bold)(`${helpers_1.symbols['failed']} monitor creation failed - ${statusCode}:${error}\n`);
|
|
86
86
|
inner += (0, helpers_1.indent)(message, ' ');
|
|
87
87
|
outer += (0, helpers_1.indent)(inner);
|
|
88
|
+
outer += extraMessage ? (0, helpers_1.indent)(extraMessage, ' ') : '';
|
|
88
89
|
return (0, colors_1.red)(outer);
|
|
89
90
|
}
|
|
90
91
|
exports.formatAPIError = formatAPIError;
|
package/dist/push/request.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/push/request.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,yCAAiD;AAEjD,mCAAiC;AACjC,wCAA6C;AAE7C,uDAAuD;AACvD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAS3C,KAAK,UAAU,WAAW,CAAC,OAA0B;IAC1D,OAAO,MAAM,IAAA,gBAAO,EAAC,OAAO,CAAC,GAAG,EAAE;QAChC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,OAAO,EAAE;YACP,aAAa,EAAE,UAAU,OAAO,CAAC,IAAI,EAAE;YACvC,cAAc,EAAE,kBAAkB;YAClC,YAAY,EAAE,sBAAsB,OAAO,EAAE;YAC7C,UAAU,EAAE,MAAM;YAClB,2BAA2B,EAAE,oBAAoB;SAClD;QACD,qDAAqD;QACrD,cAAc,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;KAC9B,CAAC,CAAC;AACL,CAAC;AAdD,kCAcC;AAEM,KAAK,UAAU,qBAAqB,CACzC,OAA0B;IAE1B,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/push/request.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* MIT License
|
|
3
|
+
*
|
|
4
|
+
* Copyright (c) 2020-present, Elastic NV
|
|
5
|
+
*
|
|
6
|
+
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
7
|
+
* of this software and associated documentation files (the "Software"), to deal
|
|
8
|
+
* in the Software without restriction, including without limitation the rights
|
|
9
|
+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
10
|
+
* copies of the Software, and to permit persons to whom the Software is
|
|
11
|
+
* furnished to do so, subject to the following conditions:
|
|
12
|
+
*
|
|
13
|
+
* The above copyright notice and this permission notice shall be included in
|
|
14
|
+
* all copies or substantial portions of the Software.
|
|
15
|
+
*
|
|
16
|
+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
17
|
+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
18
|
+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
19
|
+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
20
|
+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
21
|
+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
22
|
+
* THE SOFTWARE.
|
|
23
|
+
*
|
|
24
|
+
*/
|
|
25
|
+
import { MonitorSchema } from './monitor';
|
|
26
|
+
export declare function runLocal(schemas: MonitorSchema[]): Promise<void>;
|
|
27
|
+
//# sourceMappingURL=run-local.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-local.d.ts","sourceRoot":"","sources":["../../src/push/run-local.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAUH,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AA+F1C,wBAAsB,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,iBA0BtD"}
|
|
@@ -0,0 +1,132 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* MIT License
|
|
4
|
+
*
|
|
5
|
+
* Copyright (c) 2020-present, Elastic NV
|
|
6
|
+
*
|
|
7
|
+
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
8
|
+
* of this software and associated documentation files (the "Software"), to deal
|
|
9
|
+
* in the Software without restriction, including without limitation the rights
|
|
10
|
+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
11
|
+
* copies of the Software, and to permit persons to whom the Software is
|
|
12
|
+
* furnished to do so, subject to the following conditions:
|
|
13
|
+
*
|
|
14
|
+
* The above copyright notice and this permission notice shall be included in
|
|
15
|
+
* all copies or substantial portions of the Software.
|
|
16
|
+
*
|
|
17
|
+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
18
|
+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
19
|
+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
20
|
+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
21
|
+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
22
|
+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
23
|
+
* THE SOFTWARE.
|
|
24
|
+
*
|
|
25
|
+
*/
|
|
26
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
|
+
exports.runLocal = void 0;
|
|
28
|
+
const child_process_1 = require("child_process");
|
|
29
|
+
const promises_1 = require("fs/promises");
|
|
30
|
+
const fs_1 = require("fs");
|
|
31
|
+
const os_1 = require("os");
|
|
32
|
+
const unzip_stream_1 = require("unzip-stream");
|
|
33
|
+
const colors_1 = require("kleur/colors");
|
|
34
|
+
const path_1 = require("path");
|
|
35
|
+
const url_1 = require("url");
|
|
36
|
+
async function unzipFile(zipPath, destination) {
|
|
37
|
+
return new Promise((resolve, reject) => {
|
|
38
|
+
(0, fs_1.createReadStream)(zipPath)
|
|
39
|
+
.pipe((0, unzip_stream_1.Extract)({ path: destination }))
|
|
40
|
+
.on('close', resolve)
|
|
41
|
+
.on('error', err => reject(new Error(`failed to extract zip ${zipPath} : ${err.message}`)));
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
async function runNpmInstall(directory) {
|
|
45
|
+
return new Promise((resolve, reject) => {
|
|
46
|
+
const flags = [
|
|
47
|
+
'--no-audit',
|
|
48
|
+
'--no-update-notifier',
|
|
49
|
+
'--no-fund',
|
|
50
|
+
'--package-lock=false',
|
|
51
|
+
'--progress=false', // no need to display progress
|
|
52
|
+
];
|
|
53
|
+
const npmInstall = (0, child_process_1.spawn)('npm', ['install', ...flags], {
|
|
54
|
+
cwd: directory,
|
|
55
|
+
stdio: 'ignore',
|
|
56
|
+
});
|
|
57
|
+
npmInstall.on('close', code => {
|
|
58
|
+
if (code === 0) {
|
|
59
|
+
resolve();
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
reject(new Error(`npm install failed with exit code ${code}`));
|
|
63
|
+
}
|
|
64
|
+
});
|
|
65
|
+
npmInstall.on('error', err => reject(new Error(`failed to setup: ${err.message}`)));
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
async function runTest(directory, schema) {
|
|
69
|
+
return new Promise((resolve, reject) => {
|
|
70
|
+
const runTest = (0, child_process_1.spawn)('npx', [
|
|
71
|
+
'@elastic/synthetics',
|
|
72
|
+
'.',
|
|
73
|
+
'--playwright-options',
|
|
74
|
+
JSON.stringify(schema.playwrightOptions),
|
|
75
|
+
'--params',
|
|
76
|
+
JSON.stringify(schema.params),
|
|
77
|
+
], {
|
|
78
|
+
cwd: directory,
|
|
79
|
+
stdio: 'inherit',
|
|
80
|
+
});
|
|
81
|
+
runTest.on('close', resolve);
|
|
82
|
+
runTest.on('error', err => {
|
|
83
|
+
reject(new Error(`Failed to execute @elastic/synthetics : ${err.message}`));
|
|
84
|
+
});
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
async function writePkgJSON(dir, synthPath) {
|
|
88
|
+
const packageJsonContent = {
|
|
89
|
+
name: 'project-journey',
|
|
90
|
+
private: 'true',
|
|
91
|
+
dependencies: {
|
|
92
|
+
'@elastic/synthetics': (0, url_1.pathToFileURL)(synthPath),
|
|
93
|
+
},
|
|
94
|
+
};
|
|
95
|
+
await (0, promises_1.writeFile)((0, path_1.join)(dir, 'package.json'), JSON.stringify(packageJsonContent, null, 2), 'utf-8');
|
|
96
|
+
}
|
|
97
|
+
async function extract(schema, zipPath, unzipPath) {
|
|
98
|
+
if (schema.type !== 'browser') {
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
101
|
+
const content = schema.content;
|
|
102
|
+
await (0, promises_1.writeFile)(zipPath, content, 'base64');
|
|
103
|
+
await unzipFile(zipPath, unzipPath);
|
|
104
|
+
}
|
|
105
|
+
async function runLocal(schemas) {
|
|
106
|
+
// lookup installed bin path of a node module
|
|
107
|
+
const resolvedPath = (0, child_process_1.execFileSync)('which', ['elastic-synthetics'], {
|
|
108
|
+
encoding: 'utf8',
|
|
109
|
+
}).trim();
|
|
110
|
+
const synthPath = resolvedPath.replace((0, path_1.join)('bin', 'elastic-synthetics'), (0, path_1.join)('lib', 'node_modules', '@elastic/synthetics'));
|
|
111
|
+
const rand = Date.now();
|
|
112
|
+
const zipPath = (0, path_1.join)((0, os_1.tmpdir)(), `synthetics-zip-${rand}.zip`);
|
|
113
|
+
const unzipPath = (0, path_1.join)((0, os_1.tmpdir)(), `synthetics-unzip-${rand}`);
|
|
114
|
+
try {
|
|
115
|
+
for (const schema of schemas) {
|
|
116
|
+
await extract(schema, zipPath, unzipPath);
|
|
117
|
+
}
|
|
118
|
+
await writePkgJSON(unzipPath, synthPath);
|
|
119
|
+
await runNpmInstall(unzipPath);
|
|
120
|
+
// TODO: figure out a way to collect all params and Playwright options
|
|
121
|
+
await runTest(unzipPath, schemas[0]);
|
|
122
|
+
}
|
|
123
|
+
catch (e) {
|
|
124
|
+
throw (0, colors_1.red)(`Aborted: ${e.message}`);
|
|
125
|
+
}
|
|
126
|
+
finally {
|
|
127
|
+
await (0, promises_1.rm)(zipPath, { recursive: true, force: true });
|
|
128
|
+
await (0, promises_1.rm)(unzipPath, { recursive: true, force: true });
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
exports.runLocal = runLocal;
|
|
132
|
+
//# sourceMappingURL=run-local.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-local.js","sourceRoot":"","sources":["../../src/push/run-local.ts"],"names":[],"mappings":"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"}
|
package/dist/push/utils.d.ts
CHANGED
|
@@ -25,7 +25,12 @@
|
|
|
25
25
|
import { PushOptions } from '../common_types';
|
|
26
26
|
import { Monitor } from '../dsl/monitor';
|
|
27
27
|
export declare function logDiff<T extends Set<string>>(newIDs: T, changedIDs: T, removedIDs: T, unchangedIDs: T): void;
|
|
28
|
-
export declare function
|
|
28
|
+
export declare function logGroups<T extends Set<string>>(sizes: Map<string, number>, newIDs: T, changedIDs: T, removedIDs: T, unchangedIDs: T): void;
|
|
29
|
+
export declare function printBytes(bytes: number): string;
|
|
30
|
+
export declare function getBatches(arr: string[], size: number): string[][];
|
|
31
|
+
export declare function getSizedBatches<T extends {
|
|
32
|
+
id?: string;
|
|
33
|
+
}>(arr: Array<T>, sizes: Map<string, number>, maxBatchSizeKB: number, maxBatchItems: number): Array<T[]>;
|
|
29
34
|
type Operation = 'status' | 'bulk_get' | 'bulk_update' | 'bulk_delete' | 'legacy' | 'location';
|
|
30
35
|
export declare function generateURL(options: PushOptions, operation: Operation): string;
|
|
31
36
|
/**
|