@datadog/datadog-ci 2.30.0 → 2.31.0
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/README.md +3 -3
- package/dist/commands/deployment/constants.d.ts +1 -0
- package/dist/commands/deployment/constants.js +2 -1
- package/dist/commands/deployment/constants.js.map +1 -1
- package/dist/commands/deployment/mark.d.ts +1 -0
- package/dist/commands/deployment/mark.js +10 -0
- package/dist/commands/deployment/mark.js.map +1 -1
- package/dist/commands/junit/api.js +4 -4
- package/dist/commands/junit/api.js.map +1 -1
- package/dist/commands/junit/interfaces.d.ts +2 -2
- package/dist/commands/junit/renderer.d.ts +1 -0
- package/dist/commands/junit/renderer.js +5 -1
- package/dist/commands/junit/renderer.js.map +1 -1
- package/dist/commands/junit/upload.d.ts +4 -2
- package/dist/commands/junit/upload.js +32 -14
- package/dist/commands/junit/upload.js.map +1 -1
- package/dist/commands/lambda/constants.d.ts +0 -5
- package/dist/commands/lambda/constants.js +0 -11
- package/dist/commands/lambda/constants.js.map +1 -1
- package/dist/commands/lambda/functions/commons.d.ts +1 -1
- package/dist/commands/measure/cli.js +5 -0
- package/dist/commands/measure/cli.js.map +1 -0
- package/dist/commands/{metric/metric.d.ts → measure/measure.d.ts} +4 -3
- package/dist/commands/{metric/metric.js → measure/measure.js} +35 -23
- package/dist/commands/measure/measure.js.map +1 -0
- package/dist/commands/react-native/xcode.js +1 -1
- package/dist/commands/react-native/xcode.js.map +1 -1
- package/dist/commands/sarif/renderer.js +2 -0
- package/dist/commands/sarif/renderer.js.map +1 -1
- package/dist/commands/sbom/upload.js +2 -1
- package/dist/commands/sbom/upload.js.map +1 -1
- package/dist/commands/synthetics/run-tests-command.d.ts +2 -0
- package/dist/commands/synthetics/run-tests-command.js +15 -2
- package/dist/commands/synthetics/run-tests-command.js.map +1 -1
- package/dist/commands/synthetics/run-tests-lib.js +8 -5
- package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
- package/dist/commands/synthetics/utils/public.d.ts +2 -0
- package/dist/commands/synthetics/utils/public.js +9 -7
- package/dist/commands/synthetics/utils/public.js.map +1 -1
- package/package.json +2 -5
- package/dist/commands/metric/cli.js +0 -5
- package/dist/commands/metric/cli.js.map +0 -1
- package/dist/commands/metric/metric.js.map +0 -1
- /package/dist/commands/{metric → measure}/cli.d.ts +0 -0
|
@@ -12,15 +12,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.
|
|
15
|
+
exports.MeasureCommand = exports.parseMeasures = void 0;
|
|
16
16
|
const chalk_1 = __importDefault(require("chalk"));
|
|
17
17
|
const clipanion_1 = require("clipanion");
|
|
18
18
|
const ci_1 = require("../../helpers/ci");
|
|
19
19
|
const retry_1 = require("../../helpers/retry");
|
|
20
20
|
const utils_1 = require("../../helpers/utils");
|
|
21
|
-
const
|
|
21
|
+
const parseMeasures = (measures) => measures.reduce((acc, keyValue) => {
|
|
22
22
|
if (!keyValue.includes(':')) {
|
|
23
|
-
throw new Error(`invalid
|
|
23
|
+
throw new Error(`invalid measures key value pair "${keyValue}"`);
|
|
24
24
|
}
|
|
25
25
|
const [key, value] = keyValue.split(':', 2);
|
|
26
26
|
const floatVal = parseFloat(value);
|
|
@@ -29,12 +29,13 @@ const parseMetrics = (metrics) => metrics.reduce((acc, keyValue) => {
|
|
|
29
29
|
}
|
|
30
30
|
return Object.assign(Object.assign({}, acc), { [key]: floatVal });
|
|
31
31
|
}, {});
|
|
32
|
-
exports.
|
|
33
|
-
class
|
|
32
|
+
exports.parseMeasures = parseMeasures;
|
|
33
|
+
class MeasureCommand extends clipanion_1.Command {
|
|
34
34
|
constructor() {
|
|
35
35
|
super(...arguments);
|
|
36
36
|
this.level = clipanion_1.Option.String('--level');
|
|
37
|
-
this.metrics = clipanion_1.Option.Array('--metrics');
|
|
37
|
+
this.metrics = clipanion_1.Option.Array('--metrics', { hidden: true });
|
|
38
|
+
this.measures = clipanion_1.Option.Array('--measures');
|
|
38
39
|
this.noFail = clipanion_1.Option.Boolean('--no-fail');
|
|
39
40
|
this.config = {
|
|
40
41
|
apiKey: process.env.DATADOG_API_KEY || process.env.DD_API_KEY,
|
|
@@ -42,29 +43,37 @@ class MetricCommand extends clipanion_1.Command {
|
|
|
42
43
|
}
|
|
43
44
|
execute() {
|
|
44
45
|
return __awaiter(this, void 0, void 0, function* () {
|
|
46
|
+
console.log(this.path);
|
|
47
|
+
if (this.path[0] === 'metric') {
|
|
48
|
+
this.context.stdout.write(chalk_1.default.yellow(`[WARN] The "metric" command is deprecated. Please use the "measure" command instead.\n`));
|
|
49
|
+
}
|
|
45
50
|
if (this.level !== 'pipeline' && this.level !== 'job') {
|
|
46
51
|
this.context.stderr.write(`${chalk_1.default.red.bold('[ERROR]')} Level must be one of [pipeline, job]\n`);
|
|
47
52
|
return 1;
|
|
48
53
|
}
|
|
49
|
-
if (!this.metrics || this.metrics.length === 0) {
|
|
50
|
-
this.context.stderr.write(`${chalk_1.default.red.bold('[ERROR]')} --
|
|
54
|
+
if ((!this.measures || this.measures.length === 0) && (!this.metrics || this.metrics.length === 0)) {
|
|
55
|
+
this.context.stderr.write(`${chalk_1.default.red.bold('[ERROR]')} --measures is required\n`);
|
|
51
56
|
return 1;
|
|
52
57
|
}
|
|
58
|
+
if (this.metrics) {
|
|
59
|
+
this.context.stdout.write(`${chalk_1.default.yellow.yellow(`[WARN] The "--metrics" flag is deprecated. Please use "--measures" flag instead.\n`)}`);
|
|
60
|
+
}
|
|
61
|
+
const rawMeasures = (this.measures || this.metrics);
|
|
53
62
|
try {
|
|
54
|
-
const
|
|
63
|
+
const measures = (0, exports.parseMeasures)(rawMeasures);
|
|
55
64
|
const { provider, ciEnv } = (0, ci_1.getCIEnv)();
|
|
56
65
|
// For Buddy only the pipeline level is supported as there is no way to identify the job from the runner.
|
|
57
66
|
if (provider === 'buddy' && this.level === 'job') {
|
|
58
67
|
this.context.stderr.write(`${chalk_1.default.red.bold('[ERROR]')} Cannot use level "job" for ${ci_1.PROVIDER_TO_DISPLAY_NAME[provider]}.`);
|
|
59
68
|
return 1;
|
|
60
69
|
}
|
|
61
|
-
const exitStatus = yield this.
|
|
70
|
+
const exitStatus = yield this.sendMeasures(ciEnv, this.level === 'pipeline' ? 0 : 1, provider, measures);
|
|
62
71
|
if (exitStatus !== 0 && this.noFail) {
|
|
63
|
-
this.context.stderr.write(`${chalk_1.default.yellow.bold('[WARNING]')} sending
|
|
72
|
+
this.context.stderr.write(`${chalk_1.default.yellow.bold('[WARNING]')} sending measures failed but continuing due to --no-fail\n`);
|
|
64
73
|
return 0;
|
|
65
74
|
}
|
|
66
75
|
else if (exitStatus === 0) {
|
|
67
|
-
this.context.stdout.write('
|
|
76
|
+
this.context.stdout.write('Measures sent\n');
|
|
68
77
|
}
|
|
69
78
|
return exitStatus;
|
|
70
79
|
}
|
|
@@ -74,7 +83,7 @@ class MetricCommand extends clipanion_1.Command {
|
|
|
74
83
|
}
|
|
75
84
|
});
|
|
76
85
|
}
|
|
77
|
-
|
|
86
|
+
sendMeasures(ciEnv, level, provider, measures) {
|
|
78
87
|
return __awaiter(this, void 0, void 0, function* () {
|
|
79
88
|
if (!this.config.apiKey) {
|
|
80
89
|
this.context.stdout.write(`Neither ${chalk_1.default.red.bold('DATADOG_API_KEY')} nor ${chalk_1.default.red.bold('DD_API_KEY')} is in your environment.\n`);
|
|
@@ -89,7 +98,7 @@ class MetricCommand extends clipanion_1.Command {
|
|
|
89
98
|
attributes: {
|
|
90
99
|
ci_env: ciEnv,
|
|
91
100
|
ci_level: level,
|
|
92
|
-
metrics,
|
|
101
|
+
metrics: measures,
|
|
93
102
|
provider,
|
|
94
103
|
},
|
|
95
104
|
type: 'ci_custom_metric',
|
|
@@ -101,31 +110,34 @@ class MetricCommand extends clipanion_1.Command {
|
|
|
101
110
|
try {
|
|
102
111
|
yield (0, retry_1.retryRequest)(doRequest, {
|
|
103
112
|
onRetry: (e, attempt) => {
|
|
104
|
-
this.context.stderr.write(chalk_1.default.yellow(`[attempt ${attempt}] Could not send
|
|
113
|
+
this.context.stderr.write(chalk_1.default.yellow(`[attempt ${attempt}] Could not send measures. Retrying...: ${e.message}\n`));
|
|
105
114
|
},
|
|
106
115
|
retries: 5,
|
|
107
116
|
});
|
|
108
117
|
}
|
|
109
118
|
catch (error) {
|
|
110
|
-
this.context.stderr.write(`${chalk_1.default.red.bold('[ERROR]')} Could not send
|
|
119
|
+
this.context.stderr.write(`${chalk_1.default.red.bold('[ERROR]')} Could not send measures: ${error.message}\n`);
|
|
111
120
|
return 1;
|
|
112
121
|
}
|
|
113
122
|
return 0;
|
|
114
123
|
});
|
|
115
124
|
}
|
|
116
125
|
}
|
|
117
|
-
exports.
|
|
118
|
-
|
|
119
|
-
|
|
126
|
+
exports.MeasureCommand = MeasureCommand;
|
|
127
|
+
MeasureCommand.paths = [['measure'], ['metric']];
|
|
128
|
+
MeasureCommand.usage = clipanion_1.Command.Usage({
|
|
120
129
|
category: 'CI Visibility',
|
|
121
|
-
description: 'Add
|
|
130
|
+
description: 'Add measures to a CI Pipeline trace pipeline or job span in Datadog.',
|
|
122
131
|
details: `
|
|
123
132
|
This command when run from a supported CI provider sends an arbitrary set of key:value
|
|
124
133
|
numeric tags to Datadog to include in the CI Visibility traces.
|
|
125
134
|
`,
|
|
126
135
|
examples: [
|
|
127
|
-
['Add a binary size to the current pipeline', 'datadog-ci
|
|
128
|
-
[
|
|
136
|
+
['Add a binary size to the current pipeline', 'datadog-ci measure --level pipeline --measures binary.size:500'],
|
|
137
|
+
[
|
|
138
|
+
'Tag the current CI job with a command runtime',
|
|
139
|
+
'datadog-ci measure --level job --measures command.runtime:67.1',
|
|
140
|
+
],
|
|
129
141
|
],
|
|
130
142
|
});
|
|
131
|
-
//# sourceMappingURL=
|
|
143
|
+
//# sourceMappingURL=measure.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"measure.js","sourceRoot":"","sources":["../../../src/commands/measure/measure.ts"],"names":[],"mappings":"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"}
|
|
@@ -211,7 +211,7 @@ class XCodeCommand extends clipanion_1.Command {
|
|
|
211
211
|
* Since RN 0.70, Hermes is enabled even if it is empty.
|
|
212
212
|
*/
|
|
213
213
|
if (process.env.USE_HERMES) {
|
|
214
|
-
return
|
|
214
|
+
return process.env.USE_HERMES.toLowerCase() !== 'false';
|
|
215
215
|
}
|
|
216
216
|
/**
|
|
217
217
|
* Check if hermes pod is present in pods.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xcode.js","sourceRoot":"","sources":["../../../src/commands/react-native/xcode.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"xcode.js","sourceRoot":"","sources":["../../../src/commands/react-native/xcode.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.renderFilesNotFound = exports.renderCommandInfo = exports.renderUpload = exports.renderDryRunUpload = exports.renderSuccessfulCommand = exports.renderRetriedUpload = exports.renderFailedUpload = exports.renderInvalidFile = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const chalk_1 = __importDefault(require("chalk"));
|
|
9
|
+
const utils_1 = require("../junit/utils");
|
|
9
10
|
const ICONS = {
|
|
10
11
|
FAILED: '❌',
|
|
11
12
|
SUCCESS: '✅',
|
|
@@ -34,6 +35,7 @@ exports.renderRetriedUpload = renderRetriedUpload;
|
|
|
34
35
|
const renderSuccessfulCommand = (fileCount, duration, spanTags, service, env) => {
|
|
35
36
|
let fullStr = '';
|
|
36
37
|
fullStr += chalk_1.default.green(`${ICONS.SUCCESS} Uploaded ${fileCount} files in ${duration} seconds.\n`);
|
|
38
|
+
fullStr += chalk_1.default.green(`${ICONS.INFO} Results available on ${(0, utils_1.getBaseUrl)()}ci/code-analysis\n`);
|
|
37
39
|
fullStr += chalk_1.default.green('=================================================================================================\n');
|
|
38
40
|
return fullStr;
|
|
39
41
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sarif/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AAEvB,kDAAyB;
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sarif/renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ const process_1 = __importDefault(require("process"));
|
|
|
18
18
|
const chalk_1 = __importDefault(require("chalk"));
|
|
19
19
|
const clipanion_1 = require("clipanion");
|
|
20
20
|
const tags_1 = require("../../helpers/tags");
|
|
21
|
+
const utils_1 = require("../junit/utils");
|
|
21
22
|
const api_1 = require("./api");
|
|
22
23
|
const payload_1 = require("./payload");
|
|
23
24
|
const validation_1 = require("./validation");
|
|
@@ -99,7 +100,7 @@ class UploadSbomCommand extends clipanion_1.Command {
|
|
|
99
100
|
return 1;
|
|
100
101
|
}
|
|
101
102
|
}
|
|
102
|
-
this.context.stdout.write(
|
|
103
|
+
this.context.stdout.write(`Upload finished, results available on ${(0, utils_1.getBaseUrl)()}ci/code-analysis\n`);
|
|
103
104
|
return 0;
|
|
104
105
|
});
|
|
105
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,10 +12,12 @@ export declare class RunTestsCommand extends Command {
|
|
|
12
12
|
private apiKey;
|
|
13
13
|
private appKey;
|
|
14
14
|
private datadogSite;
|
|
15
|
+
private deviceIds;
|
|
15
16
|
private failOnCriticalErrors;
|
|
16
17
|
private failOnMissingTests;
|
|
17
18
|
private failOnTimeout;
|
|
18
19
|
private files;
|
|
20
|
+
private mobileApplicationVersion;
|
|
19
21
|
private mobileApplicationVersionFilePath;
|
|
20
22
|
private pollingTimeout;
|
|
21
23
|
private publicIds;
|
|
@@ -83,6 +83,9 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
83
83
|
this.apiKey = clipanion_1.Option.String('--apiKey', { description: 'The API key used to query the Datadog API.' });
|
|
84
84
|
this.appKey = clipanion_1.Option.String('--appKey', { description: 'The application key used to query the Datadog API.' });
|
|
85
85
|
this.datadogSite = clipanion_1.Option.String('--datadogSite', { description: 'The Datadog instance to which request is sent.' });
|
|
86
|
+
this.deviceIds = clipanion_1.Option.Array('--deviceIds', {
|
|
87
|
+
description: 'Override the mobile device(s) to run your mobile test.',
|
|
88
|
+
});
|
|
86
89
|
this.failOnCriticalErrors = clipanion_1.Option.Boolean('--failOnCriticalErrors', {
|
|
87
90
|
description: 'A boolean flag that fails the CI job if no tests were triggered, or results could not be fetched from Datadog.',
|
|
88
91
|
});
|
|
@@ -95,6 +98,9 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
95
98
|
this.files = clipanion_1.Option.Array('-f,--files', {
|
|
96
99
|
description: `Glob pattern to detect Synthetic test ${$2('configuration files')}}.`,
|
|
97
100
|
});
|
|
101
|
+
this.mobileApplicationVersion = clipanion_1.Option.String('--mobileApplicationVersion', {
|
|
102
|
+
description: 'Override the default mobile application version to test a different version within Datadog.',
|
|
103
|
+
});
|
|
98
104
|
this.mobileApplicationVersionFilePath = clipanion_1.Option.String('--mobileApp,--mobileApplicationVersionFilePath', {
|
|
99
105
|
description: 'Override the application version for all Synthetic mobile application tests.',
|
|
100
106
|
});
|
|
@@ -162,7 +168,7 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
162
168
|
});
|
|
163
169
|
}
|
|
164
170
|
resolveConfig() {
|
|
165
|
-
var _a, _b, _c;
|
|
171
|
+
var _a, _b, _c, _d;
|
|
166
172
|
return __awaiter(this, void 0, void 0, function* () {
|
|
167
173
|
// Defaults < file < ENV < CLI
|
|
168
174
|
// Override with config file variables (e.g. datadog-ci.json)
|
|
@@ -185,6 +191,11 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
185
191
|
locations: (_a = process.env.DATADOG_SYNTHETICS_LOCATIONS) === null || _a === void 0 ? void 0 : _a.split(';'),
|
|
186
192
|
subdomain: process.env.DATADOG_SUBDOMAIN,
|
|
187
193
|
}));
|
|
194
|
+
// Override with OVERRIDE ENV variables
|
|
195
|
+
this.config.global = (0, deep_extend_1.default)(this.config.global, (0, utils_1.removeUndefinedValues)({
|
|
196
|
+
deviceIds: (_b = process.env.DATADOG_SYNTHETICS_OVERRIDE_DEVICE_IDS) === null || _b === void 0 ? void 0 : _b.split(';'),
|
|
197
|
+
mobileApplicationVersion: process.env.DATADOG_SYNTHETICS_OVERRIDE_MOBILE_APPLICATION_VERSION,
|
|
198
|
+
}));
|
|
188
199
|
// Override with CLI parameters
|
|
189
200
|
this.config = (0, deep_extend_1.default)(this.config, (0, utils_1.removeUndefinedValues)({
|
|
190
201
|
apiKey: this.apiKey,
|
|
@@ -203,9 +214,11 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
203
214
|
}));
|
|
204
215
|
// Override with Global CLI parameters
|
|
205
216
|
this.config.global = (0, deep_extend_1.default)(this.config.global, (0, utils_1.removeUndefinedValues)({
|
|
217
|
+
deviceIds: this.deviceIds,
|
|
218
|
+
mobileApplicationVersion: this.mobileApplicationVersion,
|
|
206
219
|
mobileApplicationVersionFilePath: this.mobileApplicationVersionFilePath,
|
|
207
220
|
variables: (0, public_1.parseVariablesFromCli)(this.variableStrings, (log) => { var _a; return (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.log(log); }),
|
|
208
|
-
pollingTimeout: (
|
|
221
|
+
pollingTimeout: (_d = (_c = this.pollingTimeout) !== null && _c !== void 0 ? _c : this.config.global.pollingTimeout) !== null && _d !== void 0 ? _d : this.config.pollingTimeout,
|
|
209
222
|
}));
|
|
210
223
|
if (typeof this.config.files === 'string') {
|
|
211
224
|
this.reporter.log('[DEPRECATED] "files" should be an array of string instead of a string.\n');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-tests-command.js","sourceRoot":"","sources":["../../../src/commands/synthetics/run-tests-command.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"run-tests-command.js","sourceRoot":"","sources":["../../../src/commands/synthetics/run-tests-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -141,11 +141,14 @@ const getTestsList = (api, config, reporter, suites = []) => __awaiter(void 0, v
|
|
|
141
141
|
// {} < global < ENV < test file
|
|
142
142
|
(Object.assign(Object.assign(Object.assign({}, config.global), configFromEnvironment), test.config));
|
|
143
143
|
const testsToTrigger = suites
|
|
144
|
-
.map((suite) => suite.content.tests.map((test) =>
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
144
|
+
.map((suite) => suite.content.tests.map((test) => {
|
|
145
|
+
var _a;
|
|
146
|
+
return ({
|
|
147
|
+
config: overrideTestConfig(test),
|
|
148
|
+
id: (_a = (0, public_1.normalizePublicId)(test.id)) !== null && _a !== void 0 ? _a : '',
|
|
149
|
+
suite: suite.name,
|
|
150
|
+
});
|
|
151
|
+
}))
|
|
149
152
|
.reduce((acc, suiteTests) => acc.concat(suiteTests), []);
|
|
150
153
|
return testsToTrigger;
|
|
151
154
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-tests-lib.js","sourceRoot":"","sources":["../../../src/commands/synthetics/run-tests-lib.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAiD;AAEjD,+BAA+D;AAC/D,qCAA+C;AAgB/C,iDAAsE;AACtE,6CAA+C;AAC/C,2DAAgF;AAChF,qCAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"run-tests-lib.js","sourceRoot":"","sources":["../../../src/commands/synthetics/run-tests-lib.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { APIHelper } from '../api';
|
|
|
2
2
|
import { CiError } from '../errors';
|
|
3
3
|
import { APIHelperConfig, BrowserServerResult, ExecutionRule, MainReporter, Operator, Reporter, Result, ResultDisplayInfo, ResultSkippedBySelectiveRerun, RunTestsCommandConfig, ServerResult, Suite, Summary, SyntheticsCIConfig, SyntheticsOrgSettings, Test, TestPayload, Trigger, TriggerConfig, UserConfigOverride } from '../interfaces';
|
|
4
4
|
import { Tunnel } from '../tunnel';
|
|
5
|
+
export declare const PUBLIC_ID_REGEX: RegExp;
|
|
5
6
|
export declare const readableOperation: {
|
|
6
7
|
[key in Operator]: string;
|
|
7
8
|
};
|
|
@@ -24,6 +25,7 @@ export declare const getResultOutcome: (result: Result) => ResultOutcome;
|
|
|
24
25
|
export declare const getSuites: (GLOB: string, reporter: MainReporter) => Promise<Suite[]>;
|
|
25
26
|
export declare const getFilePathRelativeToRepo: (filePath: string) => Promise<string>;
|
|
26
27
|
export declare const wait: (duration: number) => Promise<unknown>;
|
|
28
|
+
export declare const normalizePublicId: (id: string) => string | undefined;
|
|
27
29
|
export declare const getOrgSettings: (reporter: MainReporter, config: SyntheticsCIConfig) => Promise<SyntheticsOrgSettings | undefined>;
|
|
28
30
|
export declare const isResultSkippedBySelectiveRerun: (result: Result) => result is ResultSkippedBySelectiveRerun;
|
|
29
31
|
export declare const waitForResults: (api: APIHelper, trigger: Trigger, tests: Test[], options: ResultDisplayInfo['options'], reporter: MainReporter, tunnel?: Tunnel) => Promise<Result[]>;
|
|
@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
35
35
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
36
|
};
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
-
exports.reportCiError = exports.pluralize = exports.getDatadogHost = exports.toExitCode = exports.getExitReason = exports.reportExitLogs = exports.renderResults = exports.sortResultsByOutcome = exports.getResultUrl = exports.getBatchUrl = exports.getAppBaseURL = exports.parseVariablesFromCli = exports.retry = exports.fetchTest = exports.runTests = exports.getTestsToTrigger = exports.isDeviceIdSet = exports.getTestAndOverrideConfig = exports.getReporter = exports.getResultDuration = exports.createInitialSummary = exports.waitForResults = exports.isResultSkippedBySelectiveRerun = exports.getOrgSettings = exports.wait = exports.getFilePathRelativeToRepo = exports.getSuites = exports.getResultOutcome = exports.PASSED_RESULT_OUTCOMES = exports.hasResultPassed = exports.isTestSupportedByTunnel = exports.getStrictestExecutionRule = exports.getExecutionRule = exports.setCiTriggerApp = exports.getOverriddenConfig = exports.ciTriggerApp = exports.readableOperation = void 0;
|
|
38
|
+
exports.reportCiError = exports.pluralize = exports.getDatadogHost = exports.toExitCode = exports.getExitReason = exports.reportExitLogs = exports.renderResults = exports.sortResultsByOutcome = exports.getResultUrl = exports.getBatchUrl = exports.getAppBaseURL = exports.parseVariablesFromCli = exports.retry = exports.fetchTest = exports.runTests = exports.getTestsToTrigger = exports.isDeviceIdSet = exports.getTestAndOverrideConfig = exports.getReporter = exports.getResultDuration = exports.createInitialSummary = exports.waitForResults = exports.isResultSkippedBySelectiveRerun = exports.getOrgSettings = exports.normalizePublicId = exports.wait = exports.getFilePathRelativeToRepo = exports.getSuites = exports.getResultOutcome = exports.PASSED_RESULT_OUTCOMES = exports.hasResultPassed = exports.isTestSupportedByTunnel = exports.getStrictestExecutionRule = exports.getExecutionRule = exports.setCiTriggerApp = exports.getOverriddenConfig = exports.ciTriggerApp = exports.readableOperation = exports.PUBLIC_ID_REGEX = void 0;
|
|
39
39
|
const child_process_1 = require("child_process");
|
|
40
40
|
const fs = __importStar(require("fs"));
|
|
41
41
|
const path = __importStar(require("path"));
|
|
@@ -55,8 +55,8 @@ const mobile_1 = require("../mobile");
|
|
|
55
55
|
const run_tests_command_1 = require("../run-tests-command");
|
|
56
56
|
const internal_1 = require("./internal");
|
|
57
57
|
const POLLING_INTERVAL = 5000; // In ms
|
|
58
|
-
const PUBLIC_ID_REGEX = /\b[a-z0-9]{3}-[a-z0-9]{3}-[a-z0-9]{3}\b/;
|
|
59
58
|
const TEMPLATE_REGEX = /{{\s*([^{}]*?)\s*}}/g;
|
|
59
|
+
exports.PUBLIC_ID_REGEX = /\b[a-z0-9]{3}-[a-z0-9]{3}-[a-z0-9]{3}\b/;
|
|
60
60
|
exports.readableOperation = {
|
|
61
61
|
[interfaces_1.Operator.contains]: 'should contain',
|
|
62
62
|
[interfaces_1.Operator.doesNotContain]: 'should not contain',
|
|
@@ -231,6 +231,8 @@ const getBatch = (api, trigger) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
231
231
|
}
|
|
232
232
|
});
|
|
233
233
|
const getTestByPublicId = (id, tests) => tests.find((t) => t.public_id === id);
|
|
234
|
+
const normalizePublicId = (id) => { var _a; return (_a = id.match(exports.PUBLIC_ID_REGEX)) === null || _a === void 0 ? void 0 : _a[0]; };
|
|
235
|
+
exports.normalizePublicId = normalizePublicId;
|
|
234
236
|
const getPollResultMap = (api, resultIds) => __awaiter(void 0, void 0, void 0, function* () {
|
|
235
237
|
var _c;
|
|
236
238
|
try {
|
|
@@ -497,8 +499,8 @@ const getTest = (api, { id, suite }) => __awaiter(void 0, void 0, void 0, functi
|
|
|
497
499
|
});
|
|
498
500
|
// XXX: We shouldn't export functions that take an `APIHelper` because the `utils` module is exported while `api` is not.
|
|
499
501
|
const getTestAndOverrideConfig = (api, { config, id, suite }, reporter, summary, isTunnelEnabled) => __awaiter(void 0, void 0, void 0, function* () {
|
|
500
|
-
var _e, _f
|
|
501
|
-
const normalizedId = (
|
|
502
|
+
var _e, _f;
|
|
503
|
+
const normalizedId = (0, exports.normalizePublicId)(id);
|
|
502
504
|
if (!normalizedId) {
|
|
503
505
|
throw new errors_1.CriticalError('INVALID_CONFIG', `No valid public ID found in: \`${id}\``);
|
|
504
506
|
}
|
|
@@ -509,7 +511,7 @@ const getTestAndOverrideConfig = (api, { config, id, suite }, reporter, summary,
|
|
|
509
511
|
}
|
|
510
512
|
const { test } = testResult;
|
|
511
513
|
const overriddenConfig = (0, exports.getOverriddenConfig)(test, normalizedId, reporter, config);
|
|
512
|
-
const testExecutionRule = (
|
|
514
|
+
const testExecutionRule = (_f = (_e = test === null || test === void 0 ? void 0 : test.options) === null || _e === void 0 ? void 0 : _e.ci) === null || _f === void 0 ? void 0 : _f.executionRule;
|
|
513
515
|
const executionRule = overriddenConfig.executionRule || testExecutionRule || interfaces_1.ExecutionRule.BLOCKING;
|
|
514
516
|
reporter.testTrigger(test, normalizedId, executionRule, config);
|
|
515
517
|
if (executionRule === interfaces_1.ExecutionRule.SKIPPED) {
|
|
@@ -595,7 +597,7 @@ const getTestsToTrigger = (api, triggerConfigs, reporter, triggerFromSearch, fai
|
|
|
595
597
|
exports.getTestsToTrigger = getTestsToTrigger;
|
|
596
598
|
// XXX: We shouldn't export functions that take an `APIHelper` because the `utils` module is exported while `api` is not.
|
|
597
599
|
const runTests = (api, testsToTrigger, selectiveRerun = false) => __awaiter(void 0, void 0, void 0, function* () {
|
|
598
|
-
var
|
|
600
|
+
var _g;
|
|
599
601
|
const payload = {
|
|
600
602
|
tests: testsToTrigger,
|
|
601
603
|
options: {
|
|
@@ -616,7 +618,7 @@ const runTests = (api, testsToTrigger, selectiveRerun = false) => __awaiter(void
|
|
|
616
618
|
const errorMessage = (0, api_1.formatBackendErrors)(e);
|
|
617
619
|
const testIds = testsToTrigger.map((t) => t.public_id).join(',');
|
|
618
620
|
// Rewrite error message
|
|
619
|
-
throw new api_1.EndpointError(`[${testIds}] Failed to trigger tests: ${errorMessage}\n`, (
|
|
621
|
+
throw new api_1.EndpointError(`[${testIds}] Failed to trigger tests: ${errorMessage}\n`, (_g = e.response) === null || _g === void 0 ? void 0 : _g.status);
|
|
620
622
|
}
|
|
621
623
|
});
|
|
622
624
|
exports.runTests = runTests;
|