@datadog/datadog-ci 2.35.0 → 2.37.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/dist/commands/junit/upload.js +12 -1
- package/dist/commands/junit/upload.js.map +1 -1
- package/dist/commands/react-native/xcode.js +3 -0
- package/dist/commands/react-native/xcode.js.map +1 -1
- package/dist/commands/synthetics/api.d.ts +7 -4
- package/dist/commands/synthetics/api.js +19 -11
- package/dist/commands/synthetics/api.js.map +1 -1
- package/dist/commands/synthetics/compatibility.d.ts +3 -1
- package/dist/commands/synthetics/compatibility.js +20 -2
- package/dist/commands/synthetics/compatibility.js.map +1 -1
- package/dist/commands/synthetics/errors.d.ts +1 -1
- package/dist/commands/synthetics/errors.js +4 -0
- package/dist/commands/synthetics/errors.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +53 -1
- package/dist/commands/synthetics/interfaces.js.map +1 -1
- package/dist/commands/synthetics/mobile.d.ts +17 -25
- package/dist/commands/synthetics/mobile.js +141 -64
- package/dist/commands/synthetics/mobile.js.map +1 -1
- package/dist/commands/synthetics/reporters/constants.d.ts +6 -0
- package/dist/commands/synthetics/reporters/constants.js +14 -0
- package/dist/commands/synthetics/reporters/constants.js.map +1 -0
- package/dist/commands/synthetics/reporters/default.d.ts +1 -1
- package/dist/commands/synthetics/reporters/default.js +15 -21
- package/dist/commands/synthetics/reporters/default.js.map +1 -1
- package/dist/commands/synthetics/reporters/mobile/app-upload.d.ts +15 -0
- package/dist/commands/synthetics/reporters/mobile/app-upload.js +54 -0
- package/dist/commands/synthetics/reporters/mobile/app-upload.js.map +1 -0
- package/dist/commands/synthetics/run-tests-command.js +30 -10
- package/dist/commands/synthetics/run-tests-command.js.map +1 -1
- package/dist/commands/synthetics/run-tests-lib.js +2 -2
- package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
- package/dist/commands/synthetics/test.js +5 -2
- package/dist/commands/synthetics/test.js.map +1 -1
- package/dist/commands/synthetics/upload-application-command.js +12 -3
- package/dist/commands/synthetics/upload-application-command.js.map +1 -1
- package/dist/commands/synthetics/utils/internal.d.ts +4 -2
- package/dist/commands/synthetics/utils/internal.js +19 -4
- package/dist/commands/synthetics/utils/internal.js.map +1 -1
- package/dist/commands/synthetics/utils/public.d.ts +3 -14
- package/dist/commands/synthetics/utils/public.js +20 -30
- package/dist/commands/synthetics/utils/public.js.map +1 -1
- package/package.json +2 -2
|
@@ -47,6 +47,7 @@ const errors_1 = require("./errors");
|
|
|
47
47
|
const default_1 = require("./reporters/default");
|
|
48
48
|
const junit_1 = require("./reporters/junit");
|
|
49
49
|
const run_tests_lib_1 = require("./run-tests-lib");
|
|
50
|
+
const internal_1 = require("./utils/internal");
|
|
50
51
|
const public_1 = require("./utils/public");
|
|
51
52
|
exports.MAX_TESTS_TO_TRIGGER = 100;
|
|
52
53
|
exports.DEFAULT_POLLING_TIMEOUT = 30 * 60 * 1000;
|
|
@@ -62,12 +63,14 @@ exports.DEFAULT_COMMAND_CONFIG = {
|
|
|
62
63
|
// TODO SYNTH-12989: Clean up deprecated `global` in favor of `defaultTestOverrides`
|
|
63
64
|
global: {},
|
|
64
65
|
defaultTestOverrides: {},
|
|
66
|
+
jUnitReport: '',
|
|
65
67
|
locations: [],
|
|
66
68
|
pollingTimeout: exports.DEFAULT_POLLING_TIMEOUT,
|
|
67
69
|
proxy: { protocol: 'http' },
|
|
68
70
|
publicIds: [],
|
|
69
71
|
selectiveRerun: false,
|
|
70
72
|
subdomain: 'app',
|
|
73
|
+
testSearchQuery: '',
|
|
71
74
|
tunnel: false,
|
|
72
75
|
variableStrings: [],
|
|
73
76
|
};
|
|
@@ -129,11 +132,6 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
129
132
|
}
|
|
130
133
|
execute() {
|
|
131
134
|
return __awaiter(this, void 0, void 0, function* () {
|
|
132
|
-
const reporters = [new default_1.DefaultReporter(this)];
|
|
133
|
-
this.reporter = (0, public_1.getReporter)(reporters);
|
|
134
|
-
if (this.jUnitReport) {
|
|
135
|
-
reporters.push(new junit_1.JUnitReporter(this));
|
|
136
|
-
}
|
|
137
135
|
try {
|
|
138
136
|
yield this.resolveConfig();
|
|
139
137
|
}
|
|
@@ -143,6 +141,15 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
143
141
|
}
|
|
144
142
|
return 1;
|
|
145
143
|
}
|
|
144
|
+
const reporters = [new default_1.DefaultReporter(this)];
|
|
145
|
+
this.reporter = (0, public_1.getReporter)(reporters);
|
|
146
|
+
if (this.config.jUnitReport) {
|
|
147
|
+
reporters.push(new junit_1.JUnitReporter({
|
|
148
|
+
context: this.context,
|
|
149
|
+
jUnitReport: this.config.jUnitReport,
|
|
150
|
+
runName: this.runName,
|
|
151
|
+
}));
|
|
152
|
+
}
|
|
146
153
|
const startTime = Date.now();
|
|
147
154
|
if (this.config.tunnel) {
|
|
148
155
|
this.reporter.log('You are using tunnel option, the chosen location(s) will be overridden by a location in your account region.\n');
|
|
@@ -171,13 +178,15 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
171
178
|
});
|
|
172
179
|
}
|
|
173
180
|
resolveConfig() {
|
|
174
|
-
var _a, _b, _c, _d, _e;
|
|
181
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
175
182
|
return __awaiter(this, void 0, void 0, function* () {
|
|
176
183
|
// Defaults < file < ENV < CLI
|
|
177
184
|
// Override with config file variables (e.g. datadog-ci.json)
|
|
178
185
|
try {
|
|
186
|
+
// Override Config Path with ENV variables
|
|
187
|
+
const overrideConfigPath = (_b = (_a = this.configPath) !== null && _a !== void 0 ? _a : process.env.DATADOG_SYNTHETICS_CONFIG_PATH) !== null && _b !== void 0 ? _b : 'datadog-ci.json';
|
|
179
188
|
this.config = yield (0, utils_1.resolveConfigFromFile)(this.config, {
|
|
180
|
-
configPath:
|
|
189
|
+
configPath: overrideConfigPath,
|
|
181
190
|
defaultConfigPaths: [this.config.configPath],
|
|
182
191
|
});
|
|
183
192
|
}
|
|
@@ -192,13 +201,23 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
192
201
|
this.config = (0, deep_extend_1.default)(this.config, (0, utils_1.removeUndefinedValues)({
|
|
193
202
|
apiKey: process.env.DATADOG_API_KEY,
|
|
194
203
|
appKey: process.env.DATADOG_APP_KEY,
|
|
204
|
+
configPath: process.env.DATADOG_SYNTHETICS_CONFIG_PATH,
|
|
195
205
|
datadogSite: process.env.DATADOG_SITE,
|
|
196
|
-
|
|
206
|
+
failOnCriticalErrors: (0, internal_1.toBoolean)(process.env.DATADOG_SYNTHETICS_FAIL_ON_CRITICAL_ERRORS),
|
|
207
|
+
failOnMissingTests: (0, internal_1.toBoolean)(process.env.DATADOG_SYNTHETICS_FAIL_ON_MISSING_TESTS),
|
|
208
|
+
failOnTimeout: (0, internal_1.toBoolean)(process.env.DATADOG_SYNTHETICS_FAIL_ON_TIMEOUT),
|
|
209
|
+
files: (_c = process.env.DATADOG_SYNTHETICS_FILES) === null || _c === void 0 ? void 0 : _c.split(';'),
|
|
210
|
+
jUnitReport: process.env.DATADOG_SYNTHETICS_JUNIT_REPORT,
|
|
211
|
+
locations: (_d = process.env.DATADOG_SYNTHETICS_LOCATIONS) === null || _d === void 0 ? void 0 : _d.split(';'),
|
|
212
|
+
publicIds: (_e = process.env.DATADOG_SYNTHETICS_PUBLIC_IDS) === null || _e === void 0 ? void 0 : _e.split(';'),
|
|
213
|
+
selectiveRerun: (0, internal_1.toBoolean)(process.env.DATADOG_SYNTHETICS_SELECTIVE_RERUN),
|
|
197
214
|
subdomain: process.env.DATADOG_SUBDOMAIN,
|
|
215
|
+
testSearchQuery: process.env.DATADOG_SYNTHETICS_TEST_SEARCH_QUERY,
|
|
216
|
+
tunnel: (0, internal_1.toBoolean)(process.env.DATADOG_SYNTHETICS_TUNNEL),
|
|
198
217
|
}));
|
|
199
218
|
// Override with OVERRIDE ENV variables
|
|
200
219
|
this.config.defaultTestOverrides = (0, deep_extend_1.default)(this.config.defaultTestOverrides, (0, utils_1.removeUndefinedValues)({
|
|
201
|
-
deviceIds: (
|
|
220
|
+
deviceIds: (_f = process.env.DATADOG_SYNTHETICS_OVERRIDE_DEVICE_IDS) === null || _f === void 0 ? void 0 : _f.split(';'),
|
|
202
221
|
mobileApplicationVersion: process.env.DATADOG_SYNTHETICS_OVERRIDE_MOBILE_APPLICATION_VERSION,
|
|
203
222
|
}));
|
|
204
223
|
// Override with CLI parameters
|
|
@@ -211,6 +230,7 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
211
230
|
failOnMissingTests: this.failOnMissingTests,
|
|
212
231
|
failOnTimeout: this.failOnTimeout,
|
|
213
232
|
files: this.files,
|
|
233
|
+
jUnitReport: this.jUnitReport,
|
|
214
234
|
publicIds: this.publicIds,
|
|
215
235
|
selectiveRerun: this.selectiveRerun,
|
|
216
236
|
subdomain: this.subdomain,
|
|
@@ -223,7 +243,7 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
223
243
|
mobileApplicationVersion: this.mobileApplicationVersion,
|
|
224
244
|
mobileApplicationVersionFilePath: this.mobileApplicationVersionFilePath,
|
|
225
245
|
variables: (0, public_1.parseVariablesFromCli)(this.variableStrings, (log) => this.reporter.log(log)),
|
|
226
|
-
pollingTimeout: (
|
|
246
|
+
pollingTimeout: (_j = (_g = this.pollingTimeout) !== null && _g !== void 0 ? _g : (_h = this.config.defaultTestOverrides) === null || _h === void 0 ? void 0 : _h.pollingTimeout) !== null && _j !== void 0 ? _j : this.config.pollingTimeout,
|
|
227
247
|
}));
|
|
228
248
|
if (typeof this.config.files === 'string') {
|
|
229
249
|
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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"}
|
|
@@ -90,7 +90,7 @@ const executeTests = (reporter, config, suites) => __awaiter(void 0, void 0, voi
|
|
|
90
90
|
throw new errors_1.CriticalError('TRIGGER_TESTS_FAILED', error.message);
|
|
91
91
|
}
|
|
92
92
|
try {
|
|
93
|
-
const maxPollingTimeout = Math.max(...triggerConfigs.map((t) => t.
|
|
93
|
+
const maxPollingTimeout = Math.max(...triggerConfigs.map((t) => { var _a; return ((_a = t.testOverrides) === null || _a === void 0 ? void 0 : _a.pollingTimeout) || config.pollingTimeout; }));
|
|
94
94
|
const { datadogSite, failOnCriticalErrors, failOnTimeout, subdomain } = config;
|
|
95
95
|
const results = yield (0, public_1.waitForResults)(api, trigger, tests, { datadogSite, failOnCriticalErrors, failOnTimeout, subdomain, maxPollingTimeout }, reporter, tunnel);
|
|
96
96
|
return {
|
|
@@ -128,7 +128,7 @@ const getTriggerConfigs = (api, config, reporter, suites) => __awaiter(void 0, v
|
|
|
128
128
|
const triggerConfigs = testIdsToTrigger.map((id) => {
|
|
129
129
|
const testFromSearchQuery = testsFromSearchQuery.find((test) => test.id === id);
|
|
130
130
|
const testFromTestConfigs = testsFromTestConfigs.find((test) => test.id === id);
|
|
131
|
-
return Object.assign(Object.assign(Object.assign({ id }, testFromSearchQuery), testFromTestConfigs), {
|
|
131
|
+
return Object.assign(Object.assign(Object.assign({ id }, testFromSearchQuery), testFromTestConfigs), { testOverrides: Object.assign(Object.assign(Object.assign({}, defaultTestConfigOverrides), testConfigOverridesFromEnv), testFromTestConfigs === null || testFromTestConfigs === void 0 ? void 0 : testFromTestConfigs.testOverrides) });
|
|
132
132
|
});
|
|
133
133
|
return triggerConfigs;
|
|
134
134
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-tests-lib.js","sourceRoot":"","sources":["../../../src/commands/synthetics/run-tests-lib.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"run-tests-lib.js","sourceRoot":"","sources":["../../../src/commands/synthetics/run-tests-lib.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,17 +15,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.getTest = exports.getTestsFromSearchQuery = exports.getTestConfigs = void 0;
|
|
16
16
|
const chalk_1 = __importDefault(require("chalk"));
|
|
17
17
|
const api_1 = require("./api");
|
|
18
|
+
const compatibility_1 = require("./compatibility");
|
|
18
19
|
const public_1 = require("./utils/public");
|
|
19
20
|
const getTestConfigs = (config, reporter, suites = []) => __awaiter(void 0, void 0, void 0, function* () {
|
|
20
21
|
const suitesFromFiles = (yield Promise.all(config.files.map((glob) => (0, public_1.getSuites)(glob, reporter))))
|
|
21
22
|
.reduce((acc, val) => acc.concat(val), [])
|
|
22
23
|
.filter((suite) => !!suite.content.tests);
|
|
23
24
|
suites.push(...suitesFromFiles);
|
|
25
|
+
(0, compatibility_1.warnIfDeprecatedConfigUsed)(suites, reporter);
|
|
24
26
|
const testConfigs = suites
|
|
25
27
|
.map((suite) => suite.content.tests.map((test) => {
|
|
26
28
|
var _a;
|
|
27
29
|
return ({
|
|
28
|
-
|
|
30
|
+
// TODO SYNTH-12989: Clean up deprecated `config` in favor of `testOverrides`
|
|
31
|
+
testOverrides: (0, compatibility_1.replaceConfigWithTestOverrides)(test.config, test.testOverrides),
|
|
29
32
|
id: (_a = (0, public_1.normalizePublicId)(test.id)) !== null && _a !== void 0 ? _a : '',
|
|
30
33
|
suite: suite.name,
|
|
31
34
|
});
|
|
@@ -42,7 +45,7 @@ const getTestsFromSearchQuery = (api, config) => __awaiter(void 0, void 0, void
|
|
|
42
45
|
}
|
|
43
46
|
const testSearchResults = yield api.searchTests(testSearchQuery);
|
|
44
47
|
return testSearchResults.tests.map((test) => ({
|
|
45
|
-
|
|
48
|
+
testOverrides: defaultTestOverrides !== null && defaultTestOverrides !== void 0 ? defaultTestOverrides : {},
|
|
46
49
|
id: test.public_id,
|
|
47
50
|
suite: `Query: ${testSearchQuery}`,
|
|
48
51
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../src/commands/synthetics/test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,+BAAoF;
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../src/commands/synthetics/test.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,8 @@ const utils_1 = require("../../helpers/utils");
|
|
|
21
21
|
const api_1 = require("./api");
|
|
22
22
|
const errors_1 = require("./errors");
|
|
23
23
|
const mobile_1 = require("./mobile");
|
|
24
|
+
const app_upload_1 = require("./reporters/mobile/app-upload");
|
|
25
|
+
const internal_1 = require("./utils/internal");
|
|
24
26
|
exports.DEFAULT_UPLOAD_COMMAND_CONFIG = {
|
|
25
27
|
apiKey: '',
|
|
26
28
|
appKey: '',
|
|
@@ -65,9 +67,9 @@ class UploadApplicationCommand extends clipanion_1.Command {
|
|
|
65
67
|
this.logger.error(`Error: invalid config`);
|
|
66
68
|
return 1;
|
|
67
69
|
}
|
|
70
|
+
const appUploadReporter = new app_upload_1.AppUploadReporter(this.context);
|
|
68
71
|
try {
|
|
69
|
-
|
|
70
|
-
this.logger.info(`Created new version ${version.version_name}, with version ID: ${version.id}`);
|
|
72
|
+
yield (0, mobile_1.uploadMobileApplicationVersion)(this.config, appUploadReporter);
|
|
71
73
|
}
|
|
72
74
|
catch (error) {
|
|
73
75
|
if (error instanceof errors_1.CiError || error instanceof api_1.EndpointError || error instanceof errors_1.CriticalError) {
|
|
@@ -78,11 +80,14 @@ class UploadApplicationCommand extends clipanion_1.Command {
|
|
|
78
80
|
});
|
|
79
81
|
}
|
|
80
82
|
resolveConfig() {
|
|
83
|
+
var _a, _b;
|
|
81
84
|
return __awaiter(this, void 0, void 0, function* () {
|
|
82
85
|
// Defaults < file < ENV < CLI
|
|
83
86
|
try {
|
|
87
|
+
// Override Config Path with ENV variables
|
|
88
|
+
const overrideConfigPath = (_b = (_a = this.configPath) !== null && _a !== void 0 ? _a : process.env.DATADOG_SYNTHETICS_CONFIG_PATH) !== null && _b !== void 0 ? _b : 'datadog-ci.json';
|
|
84
89
|
this.config = yield (0, utils_1.resolveConfigFromFile)(this.config, {
|
|
85
|
-
configPath:
|
|
90
|
+
configPath: overrideConfigPath,
|
|
86
91
|
defaultConfigPaths: [this.config.configPath],
|
|
87
92
|
});
|
|
88
93
|
}
|
|
@@ -94,7 +99,11 @@ class UploadApplicationCommand extends clipanion_1.Command {
|
|
|
94
99
|
this.config = (0, deep_extend_1.default)(this.config, (0, utils_1.removeUndefinedValues)({
|
|
95
100
|
apiKey: process.env.DATADOG_API_KEY,
|
|
96
101
|
appKey: process.env.DATADOG_APP_KEY,
|
|
102
|
+
configPath: process.env.DATADOG_SYNTHETICS_CONFIG_PATH,
|
|
97
103
|
datadogSite: process.env.DATADOG_SITE,
|
|
104
|
+
mobileApplicationId: process.env.DATADOG_SYNTHETICS_MOBILE_APPLICATION_ID,
|
|
105
|
+
versionName: process.env.DATADOG_SYNTHETICS_VERSION_NAME,
|
|
106
|
+
latest: (0, internal_1.toBoolean)(process.env.DATADOG_SYNTHETICS_LATEST),
|
|
98
107
|
}));
|
|
99
108
|
// Override with CLI parameters
|
|
100
109
|
this.config = (0, deep_extend_1.default)(this.config, (0, utils_1.removeUndefinedValues)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-application-command.js","sourceRoot":"","sources":["../../../src/commands/synthetics/upload-application-command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yCAAyC;AACzC,8DAAoC;AACpC,kEAAwC;AAExC,iDAAqD;AACrD,+CAAgF;AAEhF,+BAAmC;AACnC,qCAA+C;AAE/C,qCAAuD;
|
|
1
|
+
{"version":3,"file":"upload-application-command.js","sourceRoot":"","sources":["../../../src/commands/synthetics/upload-application-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import { BaseResult, ExecutionRule, Result, ResultInBatch, ResultInBatchSkippedBySelectiveRerun, Test, UserConfigOverride } from '../interfaces';
|
|
2
|
-
export declare const getOverriddenExecutionRule: (test?: Test,
|
|
1
|
+
import { BaseResult, ExecutionRule, MobileTestWithOverride, Result, ResultInBatch, ResultInBatchSkippedBySelectiveRerun, Test, TestNotFound, TestSkipped, TestWithOverride, UserConfigOverride } from '../interfaces';
|
|
2
|
+
export declare const getOverriddenExecutionRule: (test?: Test, testOverrides?: UserConfigOverride) => ExecutionRule | undefined;
|
|
3
3
|
export declare const hasResult: (result: Result) => result is BaseResult;
|
|
4
4
|
export declare const isResultInBatchSkippedBySelectiveRerun: (result: ResultInBatch) => result is ResultInBatchSkippedBySelectiveRerun;
|
|
5
|
+
export declare const isMobileTestWithOverride: (item: TestNotFound | TestSkipped | TestWithOverride) => item is MobileTestWithOverride;
|
|
5
6
|
export declare const getResultIdOrLinkedResultId: (result: ResultInBatch) => string;
|
|
7
|
+
export declare const toBoolean: (env: string | undefined) => boolean | undefined;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getResultIdOrLinkedResultId = exports.isResultInBatchSkippedBySelectiveRerun = exports.hasResult = exports.getOverriddenExecutionRule = void 0;
|
|
3
|
+
exports.toBoolean = exports.getResultIdOrLinkedResultId = exports.isMobileTestWithOverride = exports.isResultInBatchSkippedBySelectiveRerun = exports.hasResult = exports.getOverriddenExecutionRule = void 0;
|
|
4
4
|
const public_1 = require("./public");
|
|
5
|
-
const getOverriddenExecutionRule = (test,
|
|
5
|
+
const getOverriddenExecutionRule = (test, testOverrides) => {
|
|
6
6
|
var _a, _b;
|
|
7
|
-
if (
|
|
8
|
-
return (0, public_1.getStrictestExecutionRule)(
|
|
7
|
+
if (testOverrides === null || testOverrides === void 0 ? void 0 : testOverrides.executionRule) {
|
|
8
|
+
return (0, public_1.getStrictestExecutionRule)(testOverrides.executionRule, (_b = (_a = test === null || test === void 0 ? void 0 : test.options) === null || _a === void 0 ? void 0 : _a.ci) === null || _b === void 0 ? void 0 : _b.executionRule);
|
|
9
9
|
}
|
|
10
10
|
};
|
|
11
11
|
exports.getOverriddenExecutionRule = getOverriddenExecutionRule;
|
|
@@ -18,6 +18,8 @@ const isResultInBatchSkippedBySelectiveRerun = (result) => {
|
|
|
18
18
|
return ((_a = result.selective_rerun) === null || _a === void 0 ? void 0 : _a.decision) === 'skip';
|
|
19
19
|
};
|
|
20
20
|
exports.isResultInBatchSkippedBySelectiveRerun = isResultInBatchSkippedBySelectiveRerun;
|
|
21
|
+
const isMobileTestWithOverride = (item) => 'test' in item && item.test.type === 'mobile' && !!item.test.options && !!item.test.options.mobileApplication;
|
|
22
|
+
exports.isMobileTestWithOverride = isMobileTestWithOverride;
|
|
21
23
|
const getResultIdOrLinkedResultId = (result) => {
|
|
22
24
|
if ((0, exports.isResultInBatchSkippedBySelectiveRerun)(result)) {
|
|
23
25
|
return result.selective_rerun.linked_result_id;
|
|
@@ -25,4 +27,17 @@ const getResultIdOrLinkedResultId = (result) => {
|
|
|
25
27
|
return result.result_id;
|
|
26
28
|
};
|
|
27
29
|
exports.getResultIdOrLinkedResultId = getResultIdOrLinkedResultId;
|
|
30
|
+
const toBoolean = (env) => {
|
|
31
|
+
if (env === undefined) {
|
|
32
|
+
return undefined;
|
|
33
|
+
}
|
|
34
|
+
if (env.toLowerCase() === 'true' || env === '1') {
|
|
35
|
+
return true;
|
|
36
|
+
}
|
|
37
|
+
if (env.toLowerCase() === 'false' || env === '0') {
|
|
38
|
+
return false;
|
|
39
|
+
}
|
|
40
|
+
return undefined;
|
|
41
|
+
};
|
|
42
|
+
exports.toBoolean = toBoolean;
|
|
28
43
|
//# sourceMappingURL=internal.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/utils/internal.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/utils/internal.ts"],"names":[],"mappings":";;;AAcA,qCAAmF;AAE5E,MAAM,0BAA0B,GAAG,CACxC,IAAW,EACX,aAAkC,EACP,EAAE;;IAC7B,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,aAAa,EAAE;QAChC,OAAO,IAAA,kCAAyB,EAAC,aAAa,CAAC,aAAa,EAAE,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,EAAE,0CAAE,aAAa,CAAC,CAAA;KAChG;AACH,CAAC,CAAA;AAPY,QAAA,0BAA0B,8BAOtC;AAEM,MAAM,SAAS,GAAG,CAAC,MAAc,EAAwB,EAAE;IAChE,OAAO,CAAC,IAAA,wCAA+B,EAAC,MAAM,CAAC,CAAA;AACjD,CAAC,CAAA;AAFY,QAAA,SAAS,aAErB;AAEM,MAAM,sCAAsC,GAAG,CACpD,MAAqB,EAC2B,EAAE;;IAClD,OAAO,CAAA,MAAA,MAAM,CAAC,eAAe,0CAAE,QAAQ,MAAK,MAAM,CAAA;AACpD,CAAC,CAAA;AAJY,QAAA,sCAAsC,0CAIlD;AAEM,MAAM,wBAAwB,GAAG,CACtC,IAAmD,EACnB,EAAE,CAClC,MAAM,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAA;AAHlG,QAAA,wBAAwB,4BAG0E;AAExG,MAAM,2BAA2B,GAAG,CAAC,MAAqB,EAAU,EAAE;IAC3E,IAAI,IAAA,8CAAsC,EAAC,MAAM,CAAC,EAAE;QAClD,OAAO,MAAM,CAAC,eAAe,CAAC,gBAAgB,CAAA;KAC/C;IAED,OAAO,MAAM,CAAC,SAAS,CAAA;AACzB,CAAC,CAAA;AANY,QAAA,2BAA2B,+BAMvC;AAEM,MAAM,SAAS,GAAG,CAAC,GAAuB,EAAuB,EAAE;IACxE,IAAI,GAAG,KAAK,SAAS,EAAE;QACrB,OAAO,SAAS,CAAA;KACjB;IAED,IAAI,GAAG,CAAC,WAAW,EAAE,KAAK,MAAM,IAAI,GAAG,KAAK,GAAG,EAAE;QAC/C,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,GAAG,CAAC,WAAW,EAAE,KAAK,OAAO,IAAI,GAAG,KAAK,GAAG,EAAE;QAChD,OAAO,KAAK,CAAA;KACb;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAdY,QAAA,SAAS,aAcrB"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { APIHelper } from '../api';
|
|
2
2
|
import { CiError } from '../errors';
|
|
3
|
-
import { APIHelperConfig, BrowserServerResult, ExecutionRule, MainReporter, Operator, Reporter, Result, ResultDisplayInfo, ResultSkippedBySelectiveRerun, RunTestsCommandConfig, ServerResult, Suite, Summary, SyntheticsCIConfig, SyntheticsOrgSettings, Test, TestPayload, Trigger, TriggerConfig, UserConfigOverride } from '../interfaces';
|
|
3
|
+
import { APIHelperConfig, BrowserServerResult, ExecutionRule, MainReporter, Operator, Reporter, Result, ResultDisplayInfo, ResultSkippedBySelectiveRerun, RunTestsCommandConfig, ServerResult, Suite, Summary, SyntheticsCIConfig, SyntheticsOrgSettings, Test, TestNotFound, TestPayload, TestSkipped, TestWithOverride, Trigger, TriggerConfig, UserConfigOverride } from '../interfaces';
|
|
4
4
|
import { Tunnel } from '../tunnel';
|
|
5
5
|
export declare const PUBLIC_ID_REGEX: RegExp;
|
|
6
6
|
export declare const readableOperation: {
|
|
7
7
|
[key in Operator]: string;
|
|
8
8
|
};
|
|
9
9
|
export declare let ciTriggerApp: string;
|
|
10
|
-
export declare const getOverriddenConfig: (test: Test, publicId: string, reporter: MainReporter,
|
|
10
|
+
export declare const getOverriddenConfig: (test: Test, publicId: string, reporter: MainReporter, testOverrides?: UserConfigOverride) => TestPayload;
|
|
11
11
|
export declare const getTestOverridesCount: (testOverrides: UserConfigOverride) => number;
|
|
12
12
|
export declare const setCiTriggerApp: (source: string) => void;
|
|
13
13
|
export declare const getExecutionRule: (test?: Test, configOverride?: UserConfigOverride) => ExecutionRule;
|
|
@@ -34,17 +34,7 @@ export type InitialSummary = Omit<Summary, 'batchId'>;
|
|
|
34
34
|
export declare const createInitialSummary: () => InitialSummary;
|
|
35
35
|
export declare const getResultDuration: (result: ServerResult) => number;
|
|
36
36
|
export declare const getReporter: (reporters: Reporter[]) => MainReporter;
|
|
37
|
-
|
|
38
|
-
errorMessage: string;
|
|
39
|
-
};
|
|
40
|
-
type Skipped = {
|
|
41
|
-
overriddenConfig: TestPayload;
|
|
42
|
-
};
|
|
43
|
-
type TestWithOverride = {
|
|
44
|
-
test: Test;
|
|
45
|
-
overriddenConfig: TestPayload;
|
|
46
|
-
};
|
|
47
|
-
export declare const getTestAndOverrideConfig: (api: APIHelper, { config, id, suite }: TriggerConfig, reporter: MainReporter, summary: InitialSummary, isTunnelEnabled?: boolean) => Promise<NotFound | Skipped | TestWithOverride>;
|
|
37
|
+
export declare const getTestAndOverrideConfig: (api: APIHelper, { config, testOverrides, id, suite }: TriggerConfig, reporter: MainReporter, summary: InitialSummary, isTunnelEnabled?: boolean) => Promise<TestNotFound | TestSkipped | TestWithOverride>;
|
|
48
38
|
export declare const isDeviceIdSet: (result: ServerResult) => result is Required<BrowserServerResult>;
|
|
49
39
|
export declare const getTestsToTrigger: (api: APIHelper, triggerConfigs: TriggerConfig[], reporter: MainReporter, triggerFromSearch?: boolean, failOnMissingTests?: boolean, isTunnelEnabled?: boolean) => Promise<{
|
|
50
40
|
tests: Test[];
|
|
@@ -92,4 +82,3 @@ export declare const getDatadogHost: (hostConfig: {
|
|
|
92
82
|
}) => string;
|
|
93
83
|
export declare const pluralize: (word: string, count: number) => string;
|
|
94
84
|
export declare const reportCiError: (error: CiError, reporter: MainReporter) => void;
|
|
95
|
-
export {};
|
|
@@ -49,6 +49,7 @@ const tags_1 = require("../../../helpers/tags");
|
|
|
49
49
|
const utils_1 = require("../../../helpers/utils");
|
|
50
50
|
const api_1 = require("../api");
|
|
51
51
|
const batch_1 = require("../batch");
|
|
52
|
+
const compatibility_1 = require("../compatibility");
|
|
52
53
|
const errors_1 = require("../errors");
|
|
53
54
|
const interfaces_1 = require("../interfaces");
|
|
54
55
|
const mobile_1 = require("../mobile");
|
|
@@ -75,18 +76,18 @@ exports.readableOperation = {
|
|
|
75
76
|
};
|
|
76
77
|
const template = (st, context) => st.replace(TEMPLATE_REGEX, (match, p1) => (p1 in context ? context[p1] : match));
|
|
77
78
|
exports.ciTriggerApp = process_1.default.env.DATADOG_SYNTHETICS_CI_TRIGGER_APP || 'npm_package';
|
|
78
|
-
const getOverriddenConfig = (test, publicId, reporter,
|
|
79
|
+
const getOverriddenConfig = (test, publicId, reporter, testOverrides) => {
|
|
79
80
|
let overriddenConfig = {
|
|
80
81
|
public_id: publicId,
|
|
81
82
|
};
|
|
82
|
-
if (!
|
|
83
|
+
if (!testOverrides || !Object.keys(testOverrides).length) {
|
|
83
84
|
return overriddenConfig;
|
|
84
85
|
}
|
|
85
|
-
const executionRule = (0, internal_1.getOverriddenExecutionRule)(test,
|
|
86
|
+
const executionRule = (0, internal_1.getOverriddenExecutionRule)(test, testOverrides);
|
|
86
87
|
if (executionRule) {
|
|
87
88
|
overriddenConfig.executionRule = executionRule;
|
|
88
89
|
}
|
|
89
|
-
overriddenConfig = Object.assign(Object.assign({}, overriddenConfig), (0, utils_1.pick)(
|
|
90
|
+
overriddenConfig = Object.assign(Object.assign({}, overriddenConfig), (0, utils_1.pick)(testOverrides, [
|
|
90
91
|
'allowInsecureCertificates',
|
|
91
92
|
'basicAuth',
|
|
92
93
|
'body',
|
|
@@ -105,8 +106,8 @@ const getOverriddenConfig = (test, publicId, reporter, config) => {
|
|
|
105
106
|
'tunnel',
|
|
106
107
|
'variables',
|
|
107
108
|
]));
|
|
108
|
-
if ((test.type === 'browser' || test.subtype === 'http') &&
|
|
109
|
-
overriddenConfig.startUrl = template(
|
|
109
|
+
if ((test.type === 'browser' || test.subtype === 'http') && testOverrides.startUrl) {
|
|
110
|
+
overriddenConfig.startUrl = template(testOverrides.startUrl, Object.assign({}, process_1.default.env));
|
|
110
111
|
}
|
|
111
112
|
return overriddenConfig;
|
|
112
113
|
};
|
|
@@ -350,10 +351,10 @@ const getReporter = (reporters) => ({
|
|
|
350
351
|
}
|
|
351
352
|
}
|
|
352
353
|
},
|
|
353
|
-
testTrigger: (test, testId, executionRule,
|
|
354
|
+
testTrigger: (test, testId, executionRule, testOverrides) => {
|
|
354
355
|
for (const reporter of reporters) {
|
|
355
356
|
if (typeof reporter.testTrigger === 'function') {
|
|
356
|
-
reporter.testTrigger(test, testId, executionRule,
|
|
357
|
+
reporter.testTrigger(test, testId, executionRule, testOverrides);
|
|
357
358
|
}
|
|
358
359
|
}
|
|
359
360
|
},
|
|
@@ -374,22 +375,26 @@ const getReporter = (reporters) => ({
|
|
|
374
375
|
});
|
|
375
376
|
exports.getReporter = getReporter;
|
|
376
377
|
// XXX: We shouldn't export functions that take an `APIHelper` because the `utils` module is exported while `api` is not.
|
|
377
|
-
const getTestAndOverrideConfig = (api,
|
|
378
|
+
const getTestAndOverrideConfig = (api,
|
|
379
|
+
// TODO SYNTH-12989: Clean up deprecated `config` in favor of `testOverrides`
|
|
380
|
+
{ config, testOverrides, id, suite }, reporter, summary, isTunnelEnabled) => __awaiter(void 0, void 0, void 0, function* () {
|
|
378
381
|
var _b, _c;
|
|
379
382
|
const normalizedId = (0, exports.normalizePublicId)(id);
|
|
380
383
|
if (!normalizedId) {
|
|
381
384
|
throw new errors_1.CriticalError('INVALID_CONFIG', `No valid public ID found in: \`${id}\``);
|
|
382
385
|
}
|
|
383
|
-
|
|
386
|
+
// TODO SYNTH-12989: Clean up deprecated `config` in favor of `testOverrides`
|
|
387
|
+
testOverrides = (0, compatibility_1.replaceConfigWithTestOverrides)(config, testOverrides);
|
|
388
|
+
const testResult = yield (0, test_1.getTest)(api, { id: normalizedId, suite });
|
|
384
389
|
if ('errorMessage' in testResult) {
|
|
385
390
|
summary.testsNotFound.add(normalizedId);
|
|
386
391
|
return { errorMessage: testResult.errorMessage };
|
|
387
392
|
}
|
|
388
393
|
const { test } = testResult;
|
|
389
|
-
const overriddenConfig = (0, exports.getOverriddenConfig)(test, normalizedId, reporter,
|
|
394
|
+
const overriddenConfig = (0, exports.getOverriddenConfig)(test, normalizedId, reporter, testOverrides);
|
|
390
395
|
const testExecutionRule = (_c = (_b = test === null || test === void 0 ? void 0 : test.options) === null || _b === void 0 ? void 0 : _b.ci) === null || _c === void 0 ? void 0 : _c.executionRule;
|
|
391
396
|
const executionRule = overriddenConfig.executionRule || testExecutionRule || interfaces_1.ExecutionRule.BLOCKING;
|
|
392
|
-
reporter.testTrigger(test, normalizedId, executionRule,
|
|
397
|
+
reporter.testTrigger(test, normalizedId, executionRule, testOverrides);
|
|
393
398
|
if (executionRule === interfaces_1.ExecutionRule.SKIPPED) {
|
|
394
399
|
summary.skipped++;
|
|
395
400
|
return { overriddenConfig };
|
|
@@ -416,6 +421,8 @@ exports.isDeviceIdSet = isDeviceIdSet;
|
|
|
416
421
|
// XXX: We shouldn't export functions that take an `APIHelper` because the `utils` module is exported while `api` is not.
|
|
417
422
|
const getTestsToTrigger = (api, triggerConfigs, reporter, triggerFromSearch, failOnMissingTests, isTunnelEnabled) => __awaiter(void 0, void 0, void 0, function* () {
|
|
418
423
|
const errorMessages = [];
|
|
424
|
+
// TODO SYNTH-12989: Clean up deprecated `config` in favor of `testOverrides`
|
|
425
|
+
triggerConfigs = triggerConfigs.map((triggerConfig) => (Object.assign(Object.assign({}, triggerConfig), { testOverrides: (0, compatibility_1.replaceConfigWithTestOverrides)(triggerConfig.config, triggerConfig.testOverrides) })));
|
|
419
426
|
// When too many tests are triggered, if fetched from a search query: simply trim them and show a warning,
|
|
420
427
|
// otherwise: retrieve them and fail later if still exceeding without skipped/missing tests.
|
|
421
428
|
if (triggerFromSearch && triggerConfigs.length > run_tests_command_1.MAX_TESTS_TO_TRIGGER) {
|
|
@@ -426,24 +433,7 @@ const getTestsToTrigger = (api, triggerConfigs, reporter, triggerFromSearch, fai
|
|
|
426
433
|
}
|
|
427
434
|
const initialSummary = (0, exports.createInitialSummary)();
|
|
428
435
|
const testsAndConfigsOverride = yield Promise.all(triggerConfigs.map((triggerConfig) => (0, exports.getTestAndOverrideConfig)(api, triggerConfig, reporter, initialSummary, isTunnelEnabled)));
|
|
429
|
-
|
|
430
|
-
const uploadedApplicationByPath = {};
|
|
431
|
-
for (const item of testsAndConfigsOverride) {
|
|
432
|
-
// Ignore not found and skipped tests.
|
|
433
|
-
if ('errorMessage' in item || !('test' in item)) {
|
|
434
|
-
continue;
|
|
435
|
-
}
|
|
436
|
-
const { test, overriddenConfig } = item;
|
|
437
|
-
if (test.type === 'mobile') {
|
|
438
|
-
const { config: userConfigOverride } = triggerConfigs.find(({ id }) => id === test.public_id);
|
|
439
|
-
try {
|
|
440
|
-
yield (0, mobile_1.uploadApplicationAndOverrideConfig)(api, test, userConfigOverride, overriddenConfig, uploadedApplicationByPath);
|
|
441
|
-
}
|
|
442
|
-
catch (e) {
|
|
443
|
-
throw new errors_1.CriticalError('UPLOAD_MOBILE_APPLICATION_TESTS_FAILED', e.message);
|
|
444
|
-
}
|
|
445
|
-
}
|
|
446
|
-
}
|
|
436
|
+
yield (0, mobile_1.uploadMobileApplicationsAndUpdateOverrideConfigs)(api, triggerConfigs, testsAndConfigsOverride.filter(internal_1.isMobileTestWithOverride));
|
|
447
437
|
const overriddenTestsToTrigger = [];
|
|
448
438
|
const waitedTests = [];
|
|
449
439
|
testsAndConfigsOverride.forEach((item) => {
|