@datadog/datadog-ci 2.39.0 → 2.40.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 +1 -1
- package/dist/commands/deployment/constants.d.ts +1 -1
- package/dist/commands/deployment/constants.js +1 -1
- package/dist/commands/deployment/constants.js.map +1 -1
- package/dist/commands/measure/measure.js +0 -5
- package/dist/commands/measure/measure.js.map +1 -1
- package/dist/commands/synthetics/batch.d.ts +1 -1
- package/dist/commands/synthetics/batch.js +2 -2
- package/dist/commands/synthetics/batch.js.map +1 -1
- package/dist/commands/synthetics/compatibility.d.ts +6 -4
- package/dist/commands/synthetics/compatibility.js +37 -10
- package/dist/commands/synthetics/compatibility.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +9 -4
- package/dist/commands/synthetics/interfaces.js.map +1 -1
- package/dist/commands/synthetics/mobile.js +1 -1
- package/dist/commands/synthetics/mobile.js.map +1 -1
- package/dist/commands/synthetics/run-tests-command.d.ts +6 -2
- package/dist/commands/synthetics/run-tests-command.js +48 -21
- package/dist/commands/synthetics/run-tests-command.js.map +1 -1
- package/dist/commands/synthetics/run-tests-lib.js +10 -4
- package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
- package/dist/commands/synthetics/test.js +1 -0
- package/dist/commands/synthetics/test.js.map +1 -1
- package/dist/commands/synthetics/utils/internal.js +2 -1
- package/dist/commands/synthetics/utils/internal.js.map +1 -1
- package/dist/commands/synthetics/utils/public.d.ts +1 -1
- package/dist/commands/synthetics/utils/public.js +23 -3
- package/dist/commands/synthetics/utils/public.js.map +1 -1
- package/dist/commands/tag/tag.js +0 -5
- package/dist/commands/tag/tag.js.map +1 -1
- package/dist/commands/trace/api.d.ts +2 -2
- package/dist/commands/trace/api.js +7 -9
- package/dist/commands/trace/api.js.map +1 -1
- package/dist/commands/trace/interfaces.d.ts +7 -13
- package/dist/commands/trace/interfaces.js +11 -4
- package/dist/commands/trace/interfaces.js.map +1 -1
- package/dist/commands/trace/trace.d.ts +2 -3
- package/dist/commands/trace/trace.js +50 -98
- package/dist/commands/trace/trace.js.map +1 -1
- package/dist/helpers/ci.d.ts +2 -1
- package/dist/helpers/ci.js +55 -13
- package/dist/helpers/ci.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -137,7 +137,7 @@ curl -L --fail "https://github.com/DataDog/datadog-ci/releases/latest/download/d
|
|
|
137
137
|
#### Windows
|
|
138
138
|
|
|
139
139
|
```sh
|
|
140
|
-
Invoke-WebRequest -Uri "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_win-x64
|
|
140
|
+
Invoke-WebRequest -Uri "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_win-x64" -OutFile "datadog-ci.exe"
|
|
141
141
|
```
|
|
142
142
|
|
|
143
143
|
Then, you can run `datadog-ci` commands normally:
|
|
@@ -5,4 +5,4 @@ export declare const REVISION_TAG: string;
|
|
|
5
5
|
export declare const SERVICE_TAG: string;
|
|
6
6
|
export declare const IS_ROLLBACK_TAG: string;
|
|
7
7
|
export declare const CUSTOM_TAGS_TAG: string;
|
|
8
|
-
export declare const CONTAINS_DEPLOYMENT_TAG = "ci.contains_deployment:true";
|
|
8
|
+
export declare const CONTAINS_DEPLOYMENT_TAG = "ci.pipeline.contains_deployment:true";
|
|
@@ -8,5 +8,5 @@ exports.REVISION_TAG = exports.CD_VIS_PREFIX + 'revision:';
|
|
|
8
8
|
exports.SERVICE_TAG = exports.CD_VIS_PREFIX + 'service:';
|
|
9
9
|
exports.IS_ROLLBACK_TAG = exports.CD_VIS_PREFIX + 'is_rollback:true';
|
|
10
10
|
exports.CUSTOM_TAGS_TAG = exports.CD_VIS_PREFIX + 'custom_tags:';
|
|
11
|
-
exports.CONTAINS_DEPLOYMENT_TAG = 'ci.contains_deployment:true';
|
|
11
|
+
exports.CONTAINS_DEPLOYMENT_TAG = 'ci.pipeline.contains_deployment:true';
|
|
12
12
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/commands/deployment/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAG,wBAAwB,CAAA;AACxC,QAAA,iBAAiB,GAAG,qBAAa,GAAG,oBAAoB,CAAA;AACxD,QAAA,OAAO,GAAG,qBAAa,GAAG,MAAM,CAAA;AAChC,QAAA,YAAY,GAAG,qBAAa,GAAG,WAAW,CAAA;AAC1C,QAAA,WAAW,GAAG,qBAAa,GAAG,UAAU,CAAA;AACxC,QAAA,eAAe,GAAG,qBAAa,GAAG,kBAAkB,CAAA;AACpD,QAAA,eAAe,GAAG,qBAAa,GAAG,cAAc,CAAA;AAChD,QAAA,uBAAuB,GAAG,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/commands/deployment/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAG,wBAAwB,CAAA;AACxC,QAAA,iBAAiB,GAAG,qBAAa,GAAG,oBAAoB,CAAA;AACxD,QAAA,OAAO,GAAG,qBAAa,GAAG,MAAM,CAAA;AAChC,QAAA,YAAY,GAAG,qBAAa,GAAG,WAAW,CAAA;AAC1C,QAAA,WAAW,GAAG,qBAAa,GAAG,UAAU,CAAA;AACxC,QAAA,eAAe,GAAG,qBAAa,GAAG,kBAAkB,CAAA;AACpD,QAAA,eAAe,GAAG,qBAAa,GAAG,cAAc,CAAA;AAChD,QAAA,uBAAuB,GAAG,sCAAsC,CAAA"}
|
|
@@ -61,11 +61,6 @@ class MeasureCommand extends clipanion_1.Command {
|
|
|
61
61
|
try {
|
|
62
62
|
const measures = (0, exports.parseMeasures)(rawMeasures);
|
|
63
63
|
const { provider, ciEnv } = (0, ci_1.getCIEnv)();
|
|
64
|
-
// For Buddy only the pipeline level is supported as there is no way to identify the job from the runner.
|
|
65
|
-
if (provider === 'buddy' && this.level === 'job') {
|
|
66
|
-
this.context.stderr.write(`${chalk_1.default.red.bold('[ERROR]')} Cannot use level "job" for ${ci_1.PROVIDER_TO_DISPLAY_NAME[provider]}.`);
|
|
67
|
-
return 1;
|
|
68
|
-
}
|
|
69
64
|
const exitStatus = yield this.sendMeasures(ciEnv, this.level === 'pipeline' ? 0 : 1, provider, measures);
|
|
70
65
|
if (exitStatus !== 0 && this.noFail) {
|
|
71
66
|
this.context.stderr.write(`${chalk_1.default.yellow.bold('[WARNING]')} sending measures failed but continuing due to --no-fail\n`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"measure.js","sourceRoot":"","sources":["../../../src/commands/measure/measure.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,kDAAyB;AACzB,yCAAyC;AAEzC,yCAAmE;AACnE,+CAAgD;AAChD,+CAAwE;AAEjE,MAAM,aAAa,GAAG,CAAC,QAAkB,EAAE,EAAE,CAClD,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;IAChC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,oCAAoC,QAAQ,GAAG,CAAC,CAAA;KACjE;IAED,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IAC3C,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;IAClC,IAAI,KAAK,CAAC,QAAQ,CAAC,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;KACxC;IAED,uCACK,GAAG,KACN,CAAC,GAAG,CAAC,EAAE,QAAQ,IAChB;AACH,CAAC,EAAE,EAAE,CAAC,CAAA;AAhBK,QAAA,aAAa,iBAgBlB;AAER,MAAa,cAAe,SAAQ,mBAAO;IAA3C;;QAmBU,UAAK,GAAG,kBAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAChC,YAAO,GAAG,kBAAM,CAAC,KAAK,CAAC,WAAW,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAA;QACnD,aAAQ,GAAG,kBAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QACrC,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAEpC,WAAM,GAAG;YACf,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU;SAC9D,CAAA;
|
|
1
|
+
{"version":3,"file":"measure.js","sourceRoot":"","sources":["../../../src/commands/measure/measure.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { APIHelper } from './api';
|
|
2
2
|
import { MainReporter, Result, ResultDisplayInfo } from './interfaces';
|
|
3
|
-
export declare const waitForBatchToFinish: (api: APIHelper, batchId: string,
|
|
3
|
+
export declare const waitForBatchToFinish: (api: APIHelper, batchId: string, batchTimeout: number, resultDisplayInfo: ResultDisplayInfo, reporter: MainReporter) => Promise<Result[]>;
|
|
@@ -19,8 +19,8 @@ const errors_1 = require("./errors");
|
|
|
19
19
|
const internal_1 = require("./utils/internal");
|
|
20
20
|
const public_1 = require("./utils/public");
|
|
21
21
|
const POLLING_INTERVAL = 5000; // In ms
|
|
22
|
-
const waitForBatchToFinish = (api, batchId,
|
|
23
|
-
const safeDeadline = Date.now() +
|
|
22
|
+
const waitForBatchToFinish = (api, batchId, batchTimeout, resultDisplayInfo, reporter) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23
|
+
const safeDeadline = Date.now() + batchTimeout + 3 * POLLING_INTERVAL;
|
|
24
24
|
const emittedResultIds = new Set();
|
|
25
25
|
let oldIncompleteResultIds = new Set();
|
|
26
26
|
while (true) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch.js","sourceRoot":"","sources":["../../../src/commands/synthetics/batch.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8DAAoC;AAEpC,+BAAmE;AACnE,qCAAiD;AAWjD,+CAAgH;AAChH,2CAAmE;AAEnE,MAAM,gBAAgB,GAAG,IAAI,CAAA,CAAC,QAAQ;AAE/B,MAAM,oBAAoB,GAAG,CAClC,GAAc,EACd,OAAe,EACf,
|
|
1
|
+
{"version":3,"file":"batch.js","sourceRoot":"","sources":["../../../src/commands/synthetics/batch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { MainReporter, RunTestsCommandConfig, Suite, UserConfigOverride } from './interfaces';
|
|
2
|
-
export declare const replaceGlobalWithDefaultTestOverrides: (config: RunTestsCommandConfig, reporter
|
|
3
|
-
export declare const replaceConfigWithTestOverrides: (config
|
|
4
|
-
export declare const
|
|
5
|
-
export declare const
|
|
2
|
+
export declare const replaceGlobalWithDefaultTestOverrides: (config: RunTestsCommandConfig, reporter: MainReporter, warnDeprecatedGlobal?: boolean) => RunTestsCommandConfig;
|
|
3
|
+
export declare const replaceConfigWithTestOverrides: (config: UserConfigOverride | undefined, testOverrides: UserConfigOverride | undefined) => UserConfigOverride;
|
|
4
|
+
export declare const replacePollingTimeoutWithBatchTimeout: (config: RunTestsCommandConfig, reporter: MainReporter, warnDeprecatedPollingTimeout?: boolean, batchTimeoutCliParam?: number, pollingTimeoutCliParam?: number) => number | undefined;
|
|
5
|
+
export declare const warnIfDeprecatedConfigUsed: (suites: Suite[], reporter: MainReporter) => void;
|
|
6
|
+
export declare const warnIfDeprecatedPollingTimeoutUsed: (suites: Suite[], reporter: MainReporter) => void;
|
|
7
|
+
export declare const moveLocationsToTestOverrides: (config: RunTestsCommandConfig, reporter: MainReporter, warnDeprecatedLocations?: boolean) => RunTestsCommandConfig;
|
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.moveLocationsToTestOverrides = exports.warnIfDeprecatedConfigUsed = exports.replaceConfigWithTestOverrides = exports.replaceGlobalWithDefaultTestOverrides = void 0;
|
|
3
|
+
exports.moveLocationsToTestOverrides = exports.warnIfDeprecatedPollingTimeoutUsed = exports.warnIfDeprecatedConfigUsed = exports.replacePollingTimeoutWithBatchTimeout = exports.replaceConfigWithTestOverrides = exports.replaceGlobalWithDefaultTestOverrides = void 0;
|
|
4
|
+
const run_tests_command_1 = require("./run-tests-command");
|
|
4
5
|
const replaceGlobalWithDefaultTestOverrides = (config, reporter, warnDeprecatedGlobal = false) => {
|
|
5
6
|
var _a, _b;
|
|
6
7
|
// The user is able to put both if they don't use the library in TS or use configuration files.
|
|
7
8
|
const isGlobalUsed = Object.keys((_a = config.global) !== null && _a !== void 0 ? _a : {}).length !== 0;
|
|
8
9
|
const isDefaultTestOverridesUsed = Object.keys((_b = config.defaultTestOverrides) !== null && _b !== void 0 ? _b : {}).length !== 0;
|
|
9
10
|
if (isGlobalUsed && warnDeprecatedGlobal) {
|
|
10
|
-
reporter
|
|
11
|
+
reporter.error("The 'global' property is deprecated. Please use 'defaultTestOverrides' instead.\nIf both 'global' and 'defaultTestOverrides' properties exist, 'defaultTestOverrides' is used!\n");
|
|
11
12
|
}
|
|
12
|
-
// If
|
|
13
|
-
if (
|
|
13
|
+
// If the user hasn't migrated and is still using `global`, use `global`
|
|
14
|
+
if (!isDefaultTestOverridesUsed && isGlobalUsed) {
|
|
14
15
|
return Object.assign(Object.assign({}, config), { defaultTestOverrides: Object.assign({}, config.global) });
|
|
15
16
|
}
|
|
16
17
|
return config;
|
|
@@ -19,30 +20,56 @@ exports.replaceGlobalWithDefaultTestOverrides = replaceGlobalWithDefaultTestOver
|
|
|
19
20
|
const replaceConfigWithTestOverrides = (config, testOverrides) => {
|
|
20
21
|
const isConfigUsed = Object.keys(config !== null && config !== void 0 ? config : {}).length !== 0;
|
|
21
22
|
const isTestOverridesUsed = Object.keys(testOverrides !== null && testOverrides !== void 0 ? testOverrides : {}).length !== 0;
|
|
22
|
-
// If
|
|
23
|
-
if (
|
|
23
|
+
// If the user hasn't migrated and is still using `config` in test files, use `config`
|
|
24
|
+
if (!isTestOverridesUsed && isConfigUsed) {
|
|
24
25
|
return config !== null && config !== void 0 ? config : {};
|
|
25
26
|
}
|
|
26
27
|
return testOverrides !== null && testOverrides !== void 0 ? testOverrides : {};
|
|
27
28
|
};
|
|
28
29
|
exports.replaceConfigWithTestOverrides = replaceConfigWithTestOverrides;
|
|
30
|
+
const replacePollingTimeoutWithBatchTimeout = (config, reporter, warnDeprecatedPollingTimeout = false, batchTimeoutCliParam, pollingTimeoutCliParam) => {
|
|
31
|
+
var _a, _b;
|
|
32
|
+
// At this point, `global` should already have been moved to `defaultTestOverrides`
|
|
33
|
+
const pollingTimeout = (_b = pollingTimeoutCliParam !== null && pollingTimeoutCliParam !== void 0 ? pollingTimeoutCliParam : (_a = config.defaultTestOverrides) === null || _a === void 0 ? void 0 : _a.pollingTimeout) !== null && _b !== void 0 ? _b : config.pollingTimeout;
|
|
34
|
+
const isPollingTimeoutUsed = pollingTimeout !== undefined && pollingTimeout !== run_tests_command_1.DEFAULT_POLLING_TIMEOUT;
|
|
35
|
+
if (isPollingTimeoutUsed && warnDeprecatedPollingTimeout) {
|
|
36
|
+
reporter.error("The 'pollingTimeout' property is deprecated. Please use 'batchTimeout' instead.\nIf both 'pollingTimeout' and 'batchTimeout' properties exist, 'batchTimeout' is used!\n");
|
|
37
|
+
}
|
|
38
|
+
const batchTimeout = batchTimeoutCliParam !== null && batchTimeoutCliParam !== void 0 ? batchTimeoutCliParam : config.batchTimeout;
|
|
39
|
+
const isBatchTimeoutUsed = batchTimeout !== run_tests_command_1.DEFAULT_BATCH_TIMEOUT;
|
|
40
|
+
// If the user hasn't migrated and is still using `pollingTimeout`, use `pollingTimeout`
|
|
41
|
+
if (!isBatchTimeoutUsed && isPollingTimeoutUsed) {
|
|
42
|
+
return pollingTimeout;
|
|
43
|
+
}
|
|
44
|
+
return batchTimeout;
|
|
45
|
+
};
|
|
46
|
+
exports.replacePollingTimeoutWithBatchTimeout = replacePollingTimeoutWithBatchTimeout;
|
|
29
47
|
const warnIfDeprecatedConfigUsed = (suites, reporter) => {
|
|
30
48
|
// TODO SYNTH-12989: Clean up deprecated `config` in favor of `testOverrides`
|
|
31
49
|
const isUsingConfig = suites.some((suite) => suite.content.tests.some((test) => { var _a; return Object.keys((_a = test.config) !== null && _a !== void 0 ? _a : {}).length > 0; }));
|
|
32
50
|
if (isUsingConfig) {
|
|
33
|
-
reporter
|
|
51
|
+
reporter.error("The 'config' property is deprecated. Please use 'testOverrides' instead.\nIf both 'config' and 'testOverrides' properties exist, 'testOverrides' is used!\n");
|
|
34
52
|
}
|
|
35
53
|
};
|
|
36
54
|
exports.warnIfDeprecatedConfigUsed = warnIfDeprecatedConfigUsed;
|
|
55
|
+
const warnIfDeprecatedPollingTimeoutUsed = (suites, reporter) => {
|
|
56
|
+
// TODO SYNTH-12989: Clean up deprecated `pollingTimeout` in favor of `batchTimeout`
|
|
57
|
+
const isUsingPollingTimeout = suites.some((suite) => suite.content.tests.some((test) => { var _a, _b; return ((_a = test.config) === null || _a === void 0 ? void 0 : _a.pollingTimeout) !== undefined || ((_b = test.testOverrides) === null || _b === void 0 ? void 0 : _b.pollingTimeout) !== undefined; }));
|
|
58
|
+
if (isUsingPollingTimeout) {
|
|
59
|
+
reporter.error("The 'pollingTimeout' property is deprecated. Please use 'batchTimeout' in the global configuration file or '--batchTimeout' instead.\nIf both 'pollingTimeout' and 'batchTimeout' properties exist, 'batchTimeout' is used!\n");
|
|
60
|
+
}
|
|
61
|
+
};
|
|
62
|
+
exports.warnIfDeprecatedPollingTimeoutUsed = warnIfDeprecatedPollingTimeoutUsed;
|
|
37
63
|
const moveLocationsToTestOverrides = (config, reporter, warnDeprecatedLocations = false) => {
|
|
38
64
|
var _a, _b, _c;
|
|
39
65
|
const isLocationsUsedInRoot = ((_a = config.locations) !== null && _a !== void 0 ? _a : []).length !== 0;
|
|
66
|
+
// At this point, `global` should already have been moved to `defaultTestOverrides`
|
|
40
67
|
const isLocationsUsedInDefaultTestOverrides = ((_c = (_b = config.defaultTestOverrides) === null || _b === void 0 ? void 0 : _b.locations) !== null && _c !== void 0 ? _c : []).length !== 0;
|
|
41
68
|
if (isLocationsUsedInRoot && warnDeprecatedLocations) {
|
|
42
|
-
reporter
|
|
69
|
+
reporter.error("The 'locations' property should not be used at the root level of the global configuration file. Please put it in 'defaultTestOverrides' instead.\n If 'locations' exists in both places, only the one in 'defaultTestOverrides' is used!\n");
|
|
43
70
|
}
|
|
44
|
-
// If
|
|
45
|
-
if (
|
|
71
|
+
// If the user hasn't migrated and is still using `locations` at the root level, move it in the `defaultTestOverrides`
|
|
72
|
+
if (!isLocationsUsedInDefaultTestOverrides && isLocationsUsedInRoot) {
|
|
46
73
|
return Object.assign(Object.assign({}, config), { defaultTestOverrides: Object.assign(Object.assign({}, config.defaultTestOverrides), { locations: config.locations }) });
|
|
47
74
|
}
|
|
48
75
|
return config;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compatibility.js","sourceRoot":"","sources":["../../../src/commands/synthetics/compatibility.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"compatibility.js","sourceRoot":"","sources":["../../../src/commands/synthetics/compatibility.ts"],"names":[],"mappings":"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"}
|
|
@@ -83,10 +83,10 @@ export type PollResultMap = {
|
|
|
83
83
|
export type ResultDisplayInfo = {
|
|
84
84
|
getLocation: (datacenterId: string, test: Test) => string;
|
|
85
85
|
options: {
|
|
86
|
+
batchTimeout: number;
|
|
86
87
|
datadogSite: string;
|
|
87
88
|
failOnCriticalErrors?: boolean;
|
|
88
89
|
failOnTimeout?: boolean;
|
|
89
|
-
maxPollingTimeout: number;
|
|
90
90
|
subdomain: string;
|
|
91
91
|
};
|
|
92
92
|
tests: Test[];
|
|
@@ -288,6 +288,7 @@ export interface LocationsMapping {
|
|
|
288
288
|
export interface Trigger {
|
|
289
289
|
batch_id: string;
|
|
290
290
|
locations: Location[];
|
|
291
|
+
selective_rerun_rate_limited?: boolean;
|
|
291
292
|
}
|
|
292
293
|
export interface RetryConfig {
|
|
293
294
|
count: number;
|
|
@@ -315,6 +316,7 @@ export interface BaseConfigOverride {
|
|
|
315
316
|
[key: string]: string;
|
|
316
317
|
};
|
|
317
318
|
locations?: string[];
|
|
319
|
+
/** @deprecated This property is deprecated, please use `batchTimeout` in the global configuration file or `--batchTimeout` instead. */
|
|
318
320
|
pollingTimeout?: number;
|
|
319
321
|
resourceUrlSubstitutionRegexes?: string[];
|
|
320
322
|
retry?: RetryConfig;
|
|
@@ -335,6 +337,7 @@ export interface ServerConfigOverride extends BaseConfigOverride {
|
|
|
335
337
|
appExtractedMetadata?: MobileAppExtractedMetadata;
|
|
336
338
|
}
|
|
337
339
|
export interface BatchOptions {
|
|
340
|
+
batch_timeout?: number;
|
|
338
341
|
selective_rerun?: boolean;
|
|
339
342
|
}
|
|
340
343
|
export interface Payload {
|
|
@@ -420,7 +423,9 @@ export interface APIHelperConfig {
|
|
|
420
423
|
export interface SyntheticsCIConfig extends APIHelperConfig {
|
|
421
424
|
}
|
|
422
425
|
export interface RunTestsCommandConfig extends SyntheticsCIConfig {
|
|
426
|
+
batchTimeout?: number;
|
|
423
427
|
configPath: string;
|
|
428
|
+
defaultTestOverrides?: UserConfigOverride;
|
|
424
429
|
failOnCriticalErrors: boolean;
|
|
425
430
|
failOnMissingTests: boolean;
|
|
426
431
|
failOnTimeout: boolean;
|
|
@@ -428,11 +433,11 @@ export interface RunTestsCommandConfig extends SyntheticsCIConfig {
|
|
|
428
433
|
/** @deprecated This property is deprecated, please use `defaultTestOverrides` instead. */
|
|
429
434
|
global?: UserConfigOverride;
|
|
430
435
|
jUnitReport?: string;
|
|
431
|
-
defaultTestOverrides
|
|
432
|
-
/** @deprecated This property should only be used inside of `defaultTestOverrides`. */
|
|
436
|
+
/** @deprecated This property should only be used inside of `defaultTestOverrides` or `testOverrides`. */
|
|
433
437
|
locations?: string[];
|
|
434
438
|
mobileApplicationVersionFilePath?: string;
|
|
435
|
-
|
|
439
|
+
/** @deprecated This property is deprecated, please use `batchTimeout` in the global configuration file or `--batchTimeout` instead. */
|
|
440
|
+
pollingTimeout?: number;
|
|
436
441
|
publicIds: string[];
|
|
437
442
|
selectiveRerun: boolean;
|
|
438
443
|
subdomain: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/commands/synthetics/interfaces.ts"],"names":[],"mappings":";;;AA2RA,IAAY,QAeX;AAfD,WAAY,QAAQ;IAClB,iCAAqB,CAAA;IACrB,6CAAiC,CAAA;IACjC,qBAAS,CAAA;IACT,2BAAe,CAAA;IACf,yCAA6B,CAAA;IAC7B,yCAA6B,CAAA;IAC7B,iCAAqB,CAAA;IACrB,+CAAmC,CAAA;IACnC,iCAAqB,CAAA;IACrB,+CAAmC,CAAA;IACnC,+BAAmB,CAAA;IACnB,yCAA6B,CAAA;IAC7B,mDAAuC,CAAA;IACvC,6CAAiC,CAAA;AACnC,CAAC,EAfW,QAAQ,wBAAR,QAAQ,QAenB;
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/commands/synthetics/interfaces.ts"],"names":[],"mappings":";;;AA2RA,IAAY,QAeX;AAfD,WAAY,QAAQ;IAClB,iCAAqB,CAAA;IACrB,6CAAiC,CAAA;IACjC,qBAAS,CAAA;IACT,2BAAe,CAAA;IACf,yCAA6B,CAAA;IAC7B,yCAA6B,CAAA;IAC7B,iCAAqB,CAAA;IACrB,+CAAmC,CAAA;IACnC,iCAAqB,CAAA;IACrB,+CAAmC,CAAA;IACnC,+BAAmB,CAAA;IACnB,yCAA6B,CAAA;IAC7B,mDAAuC,CAAA;IACvC,6CAAiC,CAAA;AACnC,CAAC,EAfW,QAAQ,wBAAR,QAAQ,QAenB;AA2HD,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,sCAAqB,CAAA;IACrB,8CAA6B,CAAA;IAC7B,oCAAmB,CAAA;AACrB,CAAC,EAJW,aAAa,6BAAb,aAAa,QAIxB"}
|
|
@@ -206,7 +206,7 @@ const uploadMobileApplicationVersion = (config, appUploadReporter) => __awaiter(
|
|
|
206
206
|
throw new errors_1.CiError('MISSING_MOBILE_APPLICATION_ID', 'Mobile application id is required.');
|
|
207
207
|
}
|
|
208
208
|
if (!config.versionName) {
|
|
209
|
-
throw new errors_1.CiError('MISSING_MOBILE_VERSION_NAME', 'Version name is required');
|
|
209
|
+
throw new errors_1.CiError('MISSING_MOBILE_VERSION_NAME', 'Version name is required.');
|
|
210
210
|
}
|
|
211
211
|
config.latest = (_l = config.latest) !== null && _l !== void 0 ? _l : false;
|
|
212
212
|
const newVersionParams = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mobile.js","sourceRoot":"","sources":["../../../src/commands/synthetics/mobile.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mobile.js","sourceRoot":"","sources":["../../../src/commands/synthetics/mobile.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { Command } from 'clipanion';
|
|
2
2
|
import { RunTestsCommandConfig } from './interfaces';
|
|
3
3
|
export declare const MAX_TESTS_TO_TRIGGER = 100;
|
|
4
|
+
export declare const DEFAULT_BATCH_TIMEOUT: number;
|
|
5
|
+
/** @deprecated Please use `DEFAULT_BATCH_TIMEOUT` instead. */
|
|
4
6
|
export declare const DEFAULT_POLLING_TIMEOUT: number;
|
|
5
7
|
export declare const DEFAULT_COMMAND_CONFIG: RunTestsCommandConfig;
|
|
6
8
|
export declare class RunTestsCommand extends Command {
|
|
@@ -11,8 +13,9 @@ export declare class RunTestsCommand extends Command {
|
|
|
11
13
|
runName: string | undefined;
|
|
12
14
|
private apiKey;
|
|
13
15
|
private appKey;
|
|
16
|
+
private batchTimeout;
|
|
14
17
|
private datadogSite;
|
|
15
|
-
/** @deprecated This is deprecated, please use `--override deviceIds="dev1;dev2;..."` instead. */
|
|
18
|
+
/** @deprecated This CLI parameter is deprecated, please use `--override deviceIds="dev1;dev2;..."` instead. */
|
|
16
19
|
private deviceIds;
|
|
17
20
|
private failOnCriticalErrors;
|
|
18
21
|
private failOnMissingTests;
|
|
@@ -21,13 +24,14 @@ export declare class RunTestsCommand extends Command {
|
|
|
21
24
|
private mobileApplicationVersion;
|
|
22
25
|
private mobileApplicationVersionFilePath;
|
|
23
26
|
private overrides;
|
|
27
|
+
/** @deprecated This CLI parameter is deprecated, please use `--batchTimeout` instead. */
|
|
24
28
|
private pollingTimeout;
|
|
25
29
|
private publicIds;
|
|
26
30
|
private selectiveRerun;
|
|
27
31
|
private subdomain;
|
|
28
32
|
private testSearchQuery;
|
|
29
33
|
private tunnel;
|
|
30
|
-
/** @deprecated This is deprecated, please use `--override variables.NAME=VALUE` instead. */
|
|
34
|
+
/** @deprecated This CLI parameter is deprecated, please use `--override variables.NAME=VALUE` instead. */
|
|
31
35
|
private variableStrings;
|
|
32
36
|
private reporter;
|
|
33
37
|
private config;
|
|
@@ -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.RunTestsCommand = exports.DEFAULT_COMMAND_CONFIG = exports.DEFAULT_POLLING_TIMEOUT = exports.MAX_TESTS_TO_TRIGGER = void 0;
|
|
38
|
+
exports.RunTestsCommand = exports.DEFAULT_COMMAND_CONFIG = exports.DEFAULT_POLLING_TIMEOUT = exports.DEFAULT_BATCH_TIMEOUT = exports.MAX_TESTS_TO_TRIGGER = void 0;
|
|
39
39
|
const clipanion_1 = require("clipanion");
|
|
40
40
|
const deep_extend_1 = __importDefault(require("deep-extend"));
|
|
41
41
|
const terminal_link_1 = __importDefault(require("terminal-link"));
|
|
@@ -50,22 +50,26 @@ const run_tests_lib_1 = require("./run-tests-lib");
|
|
|
50
50
|
const internal_1 = require("./utils/internal");
|
|
51
51
|
const public_1 = require("./utils/public");
|
|
52
52
|
exports.MAX_TESTS_TO_TRIGGER = 100;
|
|
53
|
-
exports.
|
|
53
|
+
exports.DEFAULT_BATCH_TIMEOUT = 30 * 60 * 1000;
|
|
54
|
+
/** @deprecated Please use `DEFAULT_BATCH_TIMEOUT` instead. */
|
|
55
|
+
exports.DEFAULT_POLLING_TIMEOUT = exports.DEFAULT_BATCH_TIMEOUT;
|
|
54
56
|
exports.DEFAULT_COMMAND_CONFIG = {
|
|
55
57
|
apiKey: '',
|
|
56
58
|
appKey: '',
|
|
59
|
+
batchTimeout: exports.DEFAULT_BATCH_TIMEOUT,
|
|
57
60
|
configPath: 'datadog-ci.json',
|
|
58
61
|
datadogSite: 'datadoghq.com',
|
|
62
|
+
defaultTestOverrides: {},
|
|
59
63
|
failOnCriticalErrors: false,
|
|
60
64
|
failOnMissingTests: false,
|
|
61
65
|
failOnTimeout: true,
|
|
62
66
|
files: ['{,!(node_modules)/**/}*.synthetics.json'],
|
|
63
67
|
// TODO SYNTH-12989: Clean up deprecated `global` in favor of `defaultTestOverrides`
|
|
64
68
|
global: {},
|
|
65
|
-
defaultTestOverrides: {},
|
|
66
69
|
jUnitReport: '',
|
|
67
|
-
// TODO SYNTH-12989: Clean up `locations` that should only be part of
|
|
70
|
+
// TODO SYNTH-12989: Clean up `locations` that should only be part of test overrides
|
|
68
71
|
locations: [],
|
|
72
|
+
// TODO SYNTH-12989: Clean up deprecated `pollingTimeout` in favor of `batchTimeout`
|
|
69
73
|
pollingTimeout: exports.DEFAULT_POLLING_TIMEOUT,
|
|
70
74
|
proxy: { protocol: 'http' },
|
|
71
75
|
publicIds: [],
|
|
@@ -90,11 +94,15 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
90
94
|
});
|
|
91
95
|
this.apiKey = clipanion_1.Option.String('--apiKey', { description: 'The API key used to query the Datadog API.' });
|
|
92
96
|
this.appKey = clipanion_1.Option.String('--appKey', { description: 'The application key used to query the Datadog API.' });
|
|
97
|
+
this.batchTimeout = clipanion_1.Option.String('--batchTimeout', {
|
|
98
|
+
description: 'The duration (in milliseconds) after which `datadog-ci` stops waiting for test results. The default is 30 minutes. At the CI level, test results completed after this duration are considered failed.',
|
|
99
|
+
validator: validation.isInteger(),
|
|
100
|
+
});
|
|
93
101
|
this.datadogSite = clipanion_1.Option.String('--datadogSite', { description: 'The Datadog instance to which request is sent.' });
|
|
94
102
|
// TODO SYNTH-12989: Clean up deprecated `--deviceIds` in favor of `--override deviceIds="dev1;dev2;..."`
|
|
95
|
-
/** @deprecated This is deprecated, please use `--override deviceIds="dev1;dev2;..."` instead. */
|
|
103
|
+
/** @deprecated This CLI parameter is deprecated, please use `--override deviceIds="dev1;dev2;..."` instead. */
|
|
96
104
|
this.deviceIds = clipanion_1.Option.Array('--deviceIds', {
|
|
97
|
-
description: '**DEPRECATED** Override the mobile device(s) to run your mobile test.
|
|
105
|
+
description: '**DEPRECATED** Override the mobile device(s) to run your mobile test. Please use `--override deviceIds="dev1;dev2;..."` instead.',
|
|
98
106
|
});
|
|
99
107
|
this.failOnCriticalErrors = clipanion_1.Option.Boolean('--failOnCriticalErrors', {
|
|
100
108
|
description: 'A boolean flag that fails the CI job if no tests were triggered, or results could not be fetched from Datadog.',
|
|
@@ -117,8 +125,10 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
117
125
|
this.overrides = clipanion_1.Option.Array('--override', {
|
|
118
126
|
description: 'Override specific test properties.',
|
|
119
127
|
});
|
|
128
|
+
// TODO SYNTH-12989: Clean up deprecated `--pollingTimeout` in favor of `--batchTimeout`
|
|
129
|
+
/** @deprecated This CLI parameter is deprecated, please use `--batchTimeout` instead. */
|
|
120
130
|
this.pollingTimeout = clipanion_1.Option.String('--pollingTimeout', {
|
|
121
|
-
description: 'The duration (in milliseconds) after which `datadog-ci` stops polling for test results.
|
|
131
|
+
description: '**DEPRECATED** The duration (in milliseconds) after which `datadog-ci` stops polling for test results. Please use `--batchTimeout` instead.',
|
|
122
132
|
validator: validation.isInteger(),
|
|
123
133
|
});
|
|
124
134
|
this.publicIds = clipanion_1.Option.Array('-p,--public-id', { description: 'Specify a test to run.' });
|
|
@@ -135,9 +145,9 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
135
145
|
description: `Use the ${$3('Continuous Testing Tunnel')} to execute your test batch.`,
|
|
136
146
|
});
|
|
137
147
|
// TODO SYNTH-12989: Clean up deprecated `variableStrings` in favor of `variables` in `defaultTestOverrides`.
|
|
138
|
-
/** @deprecated This is deprecated, please use `--override variables.NAME=VALUE` instead. */
|
|
148
|
+
/** @deprecated This CLI parameter is deprecated, please use `--override variables.NAME=VALUE` instead. */
|
|
139
149
|
this.variableStrings = clipanion_1.Option.Array('-v,--variable', {
|
|
140
|
-
description: '**DEPRECATED** Pass a variable override.
|
|
150
|
+
description: '**DEPRECATED** Pass a variable override. Please use `--override variables.NAME=VALUE` instead.',
|
|
141
151
|
});
|
|
142
152
|
this.config = JSON.parse(JSON.stringify(exports.DEFAULT_COMMAND_CONFIG)); // Deep copy to avoid mutation
|
|
143
153
|
}
|
|
@@ -189,7 +199,7 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
189
199
|
});
|
|
190
200
|
}
|
|
191
201
|
resolveConfig() {
|
|
192
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2
|
|
202
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
|
|
193
203
|
return __awaiter(this, void 0, void 0, function* () {
|
|
194
204
|
// Defaults < file < ENV < CLI
|
|
195
205
|
// Override with config file variables (e.g. datadog-ci.json)
|
|
@@ -212,12 +222,13 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
212
222
|
}
|
|
213
223
|
// TODO SYNTH-12989: Clean up deprecated `global` in favor of `defaultTestOverrides`
|
|
214
224
|
this.config = (0, compatibility_1.replaceGlobalWithDefaultTestOverrides)(this.config, this.reporter);
|
|
215
|
-
// TODO SYNTH-12989: Clean up `locations` that should only be part of
|
|
225
|
+
// TODO SYNTH-12989: Clean up `locations` that should only be part of test overrides
|
|
216
226
|
this.config = (0, compatibility_1.moveLocationsToTestOverrides)(this.config, this.reporter);
|
|
217
227
|
// Override with ENV variables
|
|
218
228
|
this.config = (0, deep_extend_1.default)(this.config, (0, utils_1.removeUndefinedValues)({
|
|
219
229
|
apiKey: process.env.DATADOG_API_KEY,
|
|
220
230
|
appKey: process.env.DATADOG_APP_KEY,
|
|
231
|
+
batchTimeout: (0, internal_1.toNumber)(process.env.DATADOG_SYNTHETICS_BATCH_TIMEOUT),
|
|
221
232
|
configPath: process.env.DATADOG_SYNTHETICS_CONFIG_PATH,
|
|
222
233
|
datadogSite: process.env.DATADOG_SITE,
|
|
223
234
|
failOnCriticalErrors: (0, internal_1.toBoolean)(process.env.DATADOG_SYNTHETICS_FAIL_ON_CRITICAL_ERRORS),
|
|
@@ -254,8 +265,7 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
254
265
|
deviceIds: (_k = process.env.DATADOG_SYNTHETICS_OVERRIDE_DEVICE_IDS) === null || _k === void 0 ? void 0 : _k.split(';'),
|
|
255
266
|
executionRule: (0, internal_1.toExecutionRule)(process.env.DATADOG_SYNTHETICS_OVERRIDE_EXECUTION_RULE),
|
|
256
267
|
followRedirects: (0, internal_1.toBoolean)(process.env.DATADOG_SYNTHETICS_OVERRIDE_FOLLOW_REDIRECTS),
|
|
257
|
-
|
|
258
|
-
// TODO SYNTH-12989: Clean up `locations` that should only be part of the testOverrides
|
|
268
|
+
// TODO SYNTH-12989: Clean up `locations` that should only be part of test overrides
|
|
259
269
|
locations: (_m = (_l = process.env.DATADOG_SYNTHETICS_OVERRIDE_LOCATIONS) === null || _l === void 0 ? void 0 : _l.split(';')) !== null && _m !== void 0 ? _m : (_o = process.env.DATADOG_SYNTHETICS_LOCATIONS) === null || _o === void 0 ? void 0 : _o.split(';'),
|
|
260
270
|
mobileApplicationVersion: process.env.DATADOG_SYNTHETICS_OVERRIDE_MOBILE_APPLICATION_VERSION,
|
|
261
271
|
resourceUrlSubstitutionRegexes: (_p = process.env.DATADOG_SYNTHETICS_OVERRIDE_RESOURCE_URL_SUBSTITUTION_REGEXES) === null || _p === void 0 ? void 0 : _p.split(';'),
|
|
@@ -263,12 +273,20 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
263
273
|
startUrl: process.env.DATADOG_SYNTHETICS_OVERRIDE_START_URL,
|
|
264
274
|
startUrlSubstitutionRegex: process.env.DATADOG_SYNTHETICS_OVERRIDE_START_URL_SUBSTITUTION_REGEX,
|
|
265
275
|
testTimeout: (0, internal_1.toNumber)(process.env.DATADOG_SYNTHETICS_OVERRIDE_TEST_TIMEOUT),
|
|
266
|
-
variables: (0, internal_1.toStringMap)(process.env.DATADOG_SYNTHETICS_OVERRIDE_VARIABLES),
|
|
267
276
|
}));
|
|
277
|
+
// We do not want to extend headers and variables, but rather override them completely
|
|
278
|
+
if (process.env.DATADOG_SYNTHETICS_OVERRIDE_HEADERS) {
|
|
279
|
+
this.config.defaultTestOverrides.headers = (0, internal_1.toStringMap)(process.env.DATADOG_SYNTHETICS_OVERRIDE_HEADERS);
|
|
280
|
+
}
|
|
281
|
+
if (process.env.DATADOG_SYNTHETICS_OVERRIDE_VARIABLES) {
|
|
282
|
+
this.config.defaultTestOverrides.variables = (0, internal_1.toStringMap)(process.env.DATADOG_SYNTHETICS_OVERRIDE_VARIABLES);
|
|
283
|
+
}
|
|
268
284
|
// Override with CLI parameters
|
|
285
|
+
const batchTimeout = (0, compatibility_1.replacePollingTimeoutWithBatchTimeout)(this.config, this.reporter, false, this.batchTimeout, this.pollingTimeout);
|
|
269
286
|
this.config = (0, deep_extend_1.default)(this.config, (0, utils_1.removeUndefinedValues)({
|
|
270
287
|
apiKey: this.apiKey,
|
|
271
288
|
appKey: this.appKey,
|
|
289
|
+
batchTimeout,
|
|
272
290
|
configPath: this.configPath,
|
|
273
291
|
datadogSite: this.datadogSite,
|
|
274
292
|
failOnCriticalErrors: this.failOnCriticalErrors,
|
|
@@ -277,12 +295,14 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
277
295
|
files: this.files,
|
|
278
296
|
jUnitReport: this.jUnitReport,
|
|
279
297
|
publicIds: this.publicIds,
|
|
298
|
+
// TODO SYNTH-12989: Clean up deprecated `pollingTimeout` in favor of `batchTimeout`
|
|
299
|
+
pollingTimeout: batchTimeout,
|
|
280
300
|
selectiveRerun: this.selectiveRerun,
|
|
281
301
|
subdomain: this.subdomain,
|
|
282
302
|
testSearchQuery: this.testSearchQuery,
|
|
283
303
|
tunnel: this.tunnel,
|
|
284
304
|
}));
|
|
285
|
-
// Override
|
|
305
|
+
// Override defaultTestOverrides with CLI parameters
|
|
286
306
|
const validatedOverrides = (0, internal_1.validateAndParseOverrides)(this.overrides);
|
|
287
307
|
const cliOverrideRetryConfig = (0, deep_extend_1.default)((_r = (_q = this.config.defaultTestOverrides) === null || _q === void 0 ? void 0 : _q.retry) !== null && _r !== void 0 ? _r : {}, (0, utils_1.removeUndefinedValues)({
|
|
288
308
|
count: (_s = validatedOverrides.retry) === null || _s === void 0 ? void 0 : _s.count,
|
|
@@ -307,19 +327,26 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
307
327
|
deviceIds: (_0 = validatedOverrides.deviceIds) !== null && _0 !== void 0 ? _0 : this.deviceIds,
|
|
308
328
|
executionRule: validatedOverrides.executionRule,
|
|
309
329
|
followRedirects: validatedOverrides.followRedirects,
|
|
310
|
-
headers: validatedOverrides.headers,
|
|
311
330
|
locations: validatedOverrides.locations,
|
|
312
331
|
mobileApplicationVersion: this.mobileApplicationVersion,
|
|
313
332
|
mobileApplicationVersionFilePath: this.mobileApplicationVersionFilePath,
|
|
314
|
-
|
|
333
|
+
// TODO SYNTH-12989: Clean up deprecated `pollingTimeout` in favor of `batchTimeout`
|
|
334
|
+
pollingTimeout: batchTimeout,
|
|
315
335
|
resourceUrlSubstitutionRegexes: validatedOverrides.resourceUrlSubstitutionRegexes,
|
|
316
336
|
retry: Object.keys(cliOverrideRetryConfig).length > 0 ? cliOverrideRetryConfig : undefined,
|
|
317
337
|
startUrl: validatedOverrides.startUrl,
|
|
318
338
|
startUrlSubstitutionRegex: validatedOverrides.startUrlSubstitutionRegex,
|
|
319
339
|
testTimeout: validatedOverrides.testTimeout,
|
|
320
|
-
// TODO SYNTH-12989: Clean up deprecated `variableStrings` in favor of `variables` in `defaultTestOverrides`.
|
|
321
|
-
variables: (_4 = validatedOverrides.variables) !== null && _4 !== void 0 ? _4 : (0, public_1.parseVariablesFromCli)(this.variableStrings, (log) => this.reporter.log(log)),
|
|
322
340
|
}));
|
|
341
|
+
// We do not want to extend headers and variables, but rather override them completely
|
|
342
|
+
// TODO SYNTH-12989: Clean up deprecated `variableStrings` in favor of `variables` in `defaultTestOverrides`.
|
|
343
|
+
if (validatedOverrides.headers) {
|
|
344
|
+
this.config.defaultTestOverrides.headers = validatedOverrides.headers;
|
|
345
|
+
}
|
|
346
|
+
if (validatedOverrides.variables || this.variableStrings) {
|
|
347
|
+
this.config.defaultTestOverrides.variables =
|
|
348
|
+
(_1 = validatedOverrides.variables) !== null && _1 !== void 0 ? _1 : (0, public_1.parseVariablesFromCli)(this.variableStrings, (log) => this.reporter.log(log));
|
|
349
|
+
}
|
|
323
350
|
if (typeof this.config.files === 'string') {
|
|
324
351
|
this.reporter.log('[DEPRECATED] "files" should be an array of string instead of a string.\n');
|
|
325
352
|
this.config.files = [this.config.files];
|
|
@@ -327,9 +354,9 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
327
354
|
if (!(0, validation_1.isValidDatadogSite)(this.config.datadogSite)) {
|
|
328
355
|
throw new errors_1.CiError('INVALID_CONFIG', `The \`datadogSite\` config property (${JSON.stringify(this.config.datadogSite)}) must match one of the sites supported by Datadog.\nFor more information, see "Site parameter" in our documentation: https://docs.datadoghq.com/getting_started/site/#access-the-datadog-site`);
|
|
329
356
|
}
|
|
330
|
-
if (typeof ((
|
|
357
|
+
if (typeof ((_2 = this.config.defaultTestOverrides) === null || _2 === void 0 ? void 0 : _2.cookies) === 'object' &&
|
|
331
358
|
!this.config.defaultTestOverrides.cookies.value) {
|
|
332
|
-
throw new
|
|
359
|
+
throw new errors_1.CiError('INVALID_CONFIG', 'Cookies value cannot be empty.');
|
|
333
360
|
}
|
|
334
361
|
});
|
|
335
362
|
}
|