@datadog/datadog-ci 2.41.0 → 2.42.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/elf-symbols/elf.d.ts +5 -3
- package/dist/commands/elf-symbols/elf.js +18 -16
- package/dist/commands/elf-symbols/elf.js.map +1 -1
- package/dist/commands/elf-symbols/helpers.js +1 -1
- package/dist/commands/elf-symbols/interfaces.d.ts +6 -2
- package/dist/commands/elf-symbols/upload.d.ts +3 -0
- package/dist/commands/elf-symbols/upload.js +46 -22
- package/dist/commands/elf-symbols/upload.js.map +1 -1
- package/dist/commands/sarif/renderer.d.ts +1 -1
- package/dist/commands/sarif/renderer.js +5 -2
- package/dist/commands/sarif/renderer.js.map +1 -1
- package/dist/commands/sarif/upload.d.ts +1 -0
- package/dist/commands/sarif/upload.js +12 -35
- package/dist/commands/sarif/upload.js.map +1 -1
- package/dist/commands/sarif/validation.d.ts +15 -0
- package/dist/commands/sarif/validation.js +78 -0
- package/dist/commands/sarif/validation.js.map +1 -0
- package/dist/commands/sbom/upload.d.ts +1 -0
- package/dist/commands/sbom/upload.js +6 -14
- package/dist/commands/sbom/upload.js.map +1 -1
- package/dist/commands/synthetics/batch.js +3 -2
- package/dist/commands/synthetics/batch.js.map +1 -1
- package/dist/commands/synthetics/compatibility.d.ts +2 -2
- package/dist/commands/synthetics/compatibility.js +26 -26
- package/dist/commands/synthetics/compatibility.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +3 -2
- package/dist/commands/synthetics/interfaces.js.map +1 -1
- package/dist/commands/synthetics/reporters/junit.d.ts +1 -0
- package/dist/commands/synthetics/reporters/junit.js +1 -0
- package/dist/commands/synthetics/reporters/junit.js.map +1 -1
- package/dist/commands/synthetics/run-tests-command.d.ts +1 -0
- package/dist/commands/synthetics/run-tests-command.js +25 -17
- package/dist/commands/synthetics/run-tests-command.js.map +1 -1
- package/dist/commands/synthetics/utils/internal.d.ts +4 -0
- package/dist/commands/synthetics/utils/internal.js +37 -2
- package/dist/commands/synthetics/utils/internal.js.map +1 -1
- package/dist/commands/synthetics/utils/public.d.ts +3 -0
- package/dist/commands/synthetics/utils/public.js +3 -0
- package/dist/commands/synthetics/utils/public.js.map +1 -1
- package/dist/helpers/tags.d.ts +2 -1
- package/dist/helpers/tags.js +3 -2
- package/dist/helpers/tags.js.map +1 -1
- package/package.json +12 -11
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.checkForError = exports.validateSarif = void 0;
|
|
7
|
+
const fs_1 = __importDefault(require("fs"));
|
|
8
|
+
const ajv_1 = __importDefault(require("ajv"));
|
|
9
|
+
const ajv_formats_1 = __importDefault(require("ajv-formats"));
|
|
10
|
+
const sarif_schema_2_1_0_json_1 = __importDefault(require("./json-schema/sarif-schema-2.1.0.json"));
|
|
11
|
+
/**
|
|
12
|
+
* Validate the SARIF file against the SARIF schema.
|
|
13
|
+
*
|
|
14
|
+
* @param sarifReportPath - the path of the SARIF file
|
|
15
|
+
*/
|
|
16
|
+
const validateSarif = (sarifReportPath) => {
|
|
17
|
+
const ajv = new ajv_1.default({ allErrors: true });
|
|
18
|
+
(0, ajv_formats_1.default)(ajv);
|
|
19
|
+
const sarifJsonSchemaValidate = ajv.compile(sarif_schema_2_1_0_json_1.default);
|
|
20
|
+
try {
|
|
21
|
+
const sarifReportContent = JSON.parse(String(fs_1.default.readFileSync(sarifReportPath)));
|
|
22
|
+
const valid = sarifJsonSchemaValidate(sarifReportContent);
|
|
23
|
+
if (!valid) {
|
|
24
|
+
const errors = sarifJsonSchemaValidate.errors || [];
|
|
25
|
+
const errorMessages = errors.map((error) => {
|
|
26
|
+
return `${error.instancePath}: ${error.message}`;
|
|
27
|
+
});
|
|
28
|
+
return errorMessages.join('\n');
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
catch (error) {
|
|
32
|
+
return error.message;
|
|
33
|
+
}
|
|
34
|
+
return undefined;
|
|
35
|
+
};
|
|
36
|
+
exports.validateSarif = validateSarif;
|
|
37
|
+
/**
|
|
38
|
+
* Functions that looks for errors specific to how Datadog processes SARIF file. This way, we
|
|
39
|
+
* show the error directly to the user instead of uploading a file we cannot process in our backend.
|
|
40
|
+
*
|
|
41
|
+
* The function returns a list of errors to show. The return value is empty if there is no error.
|
|
42
|
+
*
|
|
43
|
+
* @param filePath - the path of the SARIF file.
|
|
44
|
+
*/
|
|
45
|
+
const checkForError = (filePath) => {
|
|
46
|
+
const report = JSON.parse(String(fs_1.default.readFileSync(filePath)));
|
|
47
|
+
const res = [];
|
|
48
|
+
if ('runs' in report) {
|
|
49
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
|
50
|
+
for (const run of report['runs']) {
|
|
51
|
+
const rules = [];
|
|
52
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
|
53
|
+
if ('tool' in run && 'driver' in run['tool'] && 'rules' in run['tool']['driver']) {
|
|
54
|
+
for (const rule of run['tool']['driver']['rules']) {
|
|
55
|
+
if ('id' in rule) {
|
|
56
|
+
rules.push(rule['id']);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
if ('results' in run) {
|
|
61
|
+
for (const result of run['results']) {
|
|
62
|
+
if (!('ruleId' in result)) {
|
|
63
|
+
res.push('a result should have a ruleId');
|
|
64
|
+
continue;
|
|
65
|
+
}
|
|
66
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
|
|
67
|
+
const ruleId = result['ruleId'];
|
|
68
|
+
if (rules.indexOf(ruleId) === -1) {
|
|
69
|
+
res.push(`result references rule ${ruleId} but rule not found in the tool section`);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
return res;
|
|
76
|
+
};
|
|
77
|
+
exports.checkForError = checkForError;
|
|
78
|
+
//# sourceMappingURL=validation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/commands/sarif/validation.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AAInB,8CAAqB;AACrB,8DAAoC;AAEpC,oGAAmE;AAEnE;;;;GAIG;AACI,MAAM,aAAa,GAAG,CAAC,eAAuB,EAAE,EAAE;IACvD,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAA;IACtC,IAAA,qBAAU,EAAC,GAAG,CAAC,CAAA;IACf,MAAM,uBAAuB,GAAG,GAAG,CAAC,OAAO,CAAC,iCAAe,CAAC,CAAA;IAC5D,IAAI;QACF,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;QAC/E,MAAM,KAAK,GAAG,uBAAuB,CAAC,kBAAkB,CAAC,CAAA;QACzD,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,MAAM,GAAG,uBAAuB,CAAC,MAAM,IAAI,EAAE,CAAA;YACnD,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAkB,EAAE,EAAE;gBACtD,OAAO,GAAG,KAAK,CAAC,YAAY,KAAK,KAAK,CAAC,OAAO,EAAE,CAAA;YAClD,CAAC,CAAC,CAAA;YAEF,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SAChC;KACF;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,KAAK,CAAC,OAAO,CAAA;KACrB;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AApBY,QAAA,aAAa,iBAoBzB;AAED;;;;;;;GAOG;AACI,MAAM,aAAa,GAAG,CAAC,QAAgB,EAAY,EAAE;IAC1D,MAAM,MAAM,GAAQ,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;IACjE,MAAM,GAAG,GAAa,EAAE,CAAA;IAExB,IAAI,MAAM,IAAI,MAAM,EAAE;QACpB,sEAAsE;QACtE,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE;YAChC,MAAM,KAAK,GAAa,EAAE,CAAA;YAC1B,sEAAsE;YACtE,IAAI,MAAM,IAAI,GAAG,IAAI,QAAQ,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EAAE;gBAChF,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE;oBACjD,IAAI,IAAI,IAAI,IAAI,EAAE;wBAChB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;qBACvB;iBACF;aACF;YAED,IAAI,SAAS,IAAI,GAAG,EAAE;gBACpB,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,SAAS,CAAC,EAAE;oBACnC,IAAI,CAAC,CAAC,QAAQ,IAAI,MAAM,CAAC,EAAE;wBACzB,GAAG,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAA;wBACzC,SAAQ;qBACT;oBACD,8GAA8G;oBAC9G,MAAM,MAAM,GAAW,MAAM,CAAC,QAAQ,CAAC,CAAA;oBACvC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;wBAChC,GAAG,CAAC,IAAI,CAAC,0BAA0B,MAAM,yCAAyC,CAAC,CAAA;qBACpF;iBACF;aACF;SACF;KACF;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAlCY,QAAA,aAAa,iBAkCzB"}
|
|
@@ -26,10 +26,11 @@ class UploadSbomCommand extends clipanion_1.Command {
|
|
|
26
26
|
constructor() {
|
|
27
27
|
super(...arguments);
|
|
28
28
|
this.basePaths = clipanion_1.Option.Rest({ required: 1 });
|
|
29
|
-
this.service = clipanion_1.Option.String('--service');
|
|
30
|
-
this.env = clipanion_1.Option.String('--env');
|
|
29
|
+
this.service = clipanion_1.Option.String('--service', 'datadog-ci');
|
|
30
|
+
this.env = clipanion_1.Option.String('--env', 'ci');
|
|
31
31
|
this.tags = clipanion_1.Option.Array('--tags');
|
|
32
32
|
this.debug = clipanion_1.Option.Boolean('--debug');
|
|
33
|
+
this.noCiTags = clipanion_1.Option.Boolean('--no-ci-tags', false);
|
|
33
34
|
this.config = {
|
|
34
35
|
apiKey: process_1.default.env.DATADOG_API_KEY || process_1.default.env.DD_API_KEY,
|
|
35
36
|
appKey: process_1.default.env.DATADOG_APP_KEY || process_1.default.env.DD_APP_KEY || '',
|
|
@@ -44,17 +45,8 @@ class UploadSbomCommand extends clipanion_1.Command {
|
|
|
44
45
|
execute() {
|
|
45
46
|
var _a;
|
|
46
47
|
return __awaiter(this, void 0, void 0, function* () {
|
|
47
|
-
const service = this.service
|
|
48
|
-
|
|
49
|
-
this.context.stderr.write('Missing service\n');
|
|
50
|
-
return 1;
|
|
51
|
-
}
|
|
52
|
-
const environment = this.env || this.config.env;
|
|
53
|
-
this.config.env = environment;
|
|
54
|
-
if (!environment) {
|
|
55
|
-
this.context.stderr.write('Missing env\n');
|
|
56
|
-
return 1;
|
|
57
|
-
}
|
|
48
|
+
const service = this.service;
|
|
49
|
+
const environment = this.env;
|
|
58
50
|
if (!this.basePaths || !this.basePaths.length) {
|
|
59
51
|
this.context.stderr.write('Missing basePath\n');
|
|
60
52
|
return 1;
|
|
@@ -69,7 +61,7 @@ class UploadSbomCommand extends clipanion_1.Command {
|
|
|
69
61
|
}
|
|
70
62
|
// Get the API helper to send the payload
|
|
71
63
|
const api = (0, api_1.getApiHelper)(this.config.apiKey, this.config.appKey);
|
|
72
|
-
const tags = yield (0, tags_1.getSpanTags)(this.config, this.tags);
|
|
64
|
+
const tags = yield (0, tags_1.getSpanTags)(this.config, this.tags, !this.noCiTags);
|
|
73
65
|
// Check if we have all the mandatory git fields
|
|
74
66
|
const spanTagsKeys = Object.keys(tags);
|
|
75
67
|
const filteredSpanTags = spanTagsKeys.filter((key) => tags_1.mandatoryGitFields[key]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,sDAA6B;AAG7B,iCAA+D;AAC/D,yCAAyC;AAEzC,6CAA2E;AAE3E,+BAAkC;AAClC,uCAAyC;AACzC,yCAQmB;AAEnB,6CAA6G;AAE7G,MAAa,iBAAkB,SAAQ,mBAAO;IAA9C;;QAYU,cAAS,GAAG,kBAAM,CAAC,IAAI,CAAC,EAAC,QAAQ,EAAE,CAAC,EAAC,CAAC,CAAA;QACtC,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -122,7 +122,7 @@ const reportWaitingTests = (batchId, batch, resultDisplayInfo, reporter) => {
|
|
|
122
122
|
reporter.testsWait(remainingTests, baseUrl, batchId, skippedCount);
|
|
123
123
|
};
|
|
124
124
|
const getResultFromBatch = (resultInBatch, pollResultMap, resultDisplayInfo, safeDeadlineReached = false) => {
|
|
125
|
-
var _a, _b
|
|
125
|
+
var _a, _b;
|
|
126
126
|
const { getLocation, options, tests } = resultDisplayInfo;
|
|
127
127
|
const hasTimedOut = (_a = resultInBatch.timed_out) !== null && _a !== void 0 ? _a : safeDeadlineReached;
|
|
128
128
|
const test = getTestByPublicId(resultInBatch.test_public_id, tests);
|
|
@@ -145,10 +145,11 @@ const getResultFromBatch = (resultInBatch, pollResultMap, resultDisplayInfo, saf
|
|
|
145
145
|
pollResult.result.failure = { code: 'TIMEOUT', message: 'The batch timed out before receiving the result.' };
|
|
146
146
|
pollResult.result.passed = false;
|
|
147
147
|
}
|
|
148
|
+
const isUnhealthy = (_b = pollResult.result.unhealthy) !== null && _b !== void 0 ? _b : false;
|
|
148
149
|
return {
|
|
149
150
|
executionRule: resultInBatch.execution_rule,
|
|
150
151
|
location: getLocation(resultInBatch.location, test),
|
|
151
|
-
passed: (0,
|
|
152
|
+
passed: (0, internal_1.hasResultPassed)(resultInBatch, isUnhealthy, hasTimedOut, options),
|
|
152
153
|
result: pollResult.result,
|
|
153
154
|
resultId: (0, internal_1.getResultIdOrLinkedResultId)(resultInBatch),
|
|
154
155
|
retries: resultInBatch.retries || 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch.js","sourceRoot":"","sources":["../../../src/commands/synthetics/batch.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8DAAoC;AAEpC,+BAAmE;AACnE,qCAAiD;AAWjD,+
|
|
1
|
+
{"version":3,"file":"batch.js","sourceRoot":"","sources":["../../../src/commands/synthetics/batch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { MainReporter, RunTestsCommandConfig, Suite, UserConfigOverride } from './interfaces';
|
|
2
|
-
export declare const
|
|
2
|
+
export declare const moveLocationsToTestOverrides: (config: RunTestsCommandConfig, reporter: MainReporter, warnDeprecatedLocations?: boolean) => RunTestsCommandConfig;
|
|
3
3
|
export declare const replaceConfigWithTestOverrides: (config: UserConfigOverride | undefined, testOverrides: UserConfigOverride | undefined) => UserConfigOverride;
|
|
4
|
+
export declare const replaceGlobalWithDefaultTestOverrides: (config: RunTestsCommandConfig, reporter: MainReporter, warnDeprecatedGlobal?: boolean) => RunTestsCommandConfig;
|
|
4
5
|
export declare const replacePollingTimeoutWithBatchTimeout: (config: RunTestsCommandConfig, reporter: MainReporter, warnDeprecatedPollingTimeout?: boolean, batchTimeoutCliParam?: number, pollingTimeoutCliParam?: number) => number | undefined;
|
|
5
6
|
export declare const warnIfDeprecatedConfigUsed: (suites: Suite[], reporter: MainReporter) => void;
|
|
6
7
|
export declare const warnIfDeprecatedPollingTimeoutUsed: (suites: Suite[], reporter: MainReporter) => void;
|
|
7
|
-
export declare const moveLocationsToTestOverrides: (config: RunTestsCommandConfig, reporter: MainReporter, warnDeprecatedLocations?: boolean) => RunTestsCommandConfig;
|
|
@@ -1,7 +1,32 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.warnIfDeprecatedPollingTimeoutUsed = exports.warnIfDeprecatedConfigUsed = exports.replacePollingTimeoutWithBatchTimeout = exports.replaceGlobalWithDefaultTestOverrides = exports.replaceConfigWithTestOverrides = exports.moveLocationsToTestOverrides = void 0;
|
|
4
4
|
const run_tests_command_1 = require("./run-tests-command");
|
|
5
|
+
const moveLocationsToTestOverrides = (config, reporter, warnDeprecatedLocations = false) => {
|
|
6
|
+
var _a, _b, _c;
|
|
7
|
+
const isLocationsUsedInRoot = ((_a = config.locations) !== null && _a !== void 0 ? _a : []).length !== 0;
|
|
8
|
+
// At this point, `global` should already have been moved to `defaultTestOverrides`
|
|
9
|
+
const isLocationsUsedInDefaultTestOverrides = ((_c = (_b = config.defaultTestOverrides) === null || _b === void 0 ? void 0 : _b.locations) !== null && _c !== void 0 ? _c : []).length !== 0;
|
|
10
|
+
if (isLocationsUsedInRoot && warnDeprecatedLocations) {
|
|
11
|
+
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");
|
|
12
|
+
}
|
|
13
|
+
// If the user hasn't migrated and is still using `locations` at the root level, move it in the `defaultTestOverrides`
|
|
14
|
+
if (!isLocationsUsedInDefaultTestOverrides && isLocationsUsedInRoot) {
|
|
15
|
+
return Object.assign(Object.assign({}, config), { defaultTestOverrides: Object.assign(Object.assign({}, config.defaultTestOverrides), { locations: config.locations }) });
|
|
16
|
+
}
|
|
17
|
+
return config;
|
|
18
|
+
};
|
|
19
|
+
exports.moveLocationsToTestOverrides = moveLocationsToTestOverrides;
|
|
20
|
+
const replaceConfigWithTestOverrides = (config, testOverrides) => {
|
|
21
|
+
const isConfigUsed = Object.keys(config !== null && config !== void 0 ? config : {}).length !== 0;
|
|
22
|
+
const isTestOverridesUsed = Object.keys(testOverrides !== null && testOverrides !== void 0 ? testOverrides : {}).length !== 0;
|
|
23
|
+
// If the user hasn't migrated and is still using `config` in test files, use `config`
|
|
24
|
+
if (!isTestOverridesUsed && isConfigUsed) {
|
|
25
|
+
return config !== null && config !== void 0 ? config : {};
|
|
26
|
+
}
|
|
27
|
+
return testOverrides !== null && testOverrides !== void 0 ? testOverrides : {};
|
|
28
|
+
};
|
|
29
|
+
exports.replaceConfigWithTestOverrides = replaceConfigWithTestOverrides;
|
|
5
30
|
const replaceGlobalWithDefaultTestOverrides = (config, reporter, warnDeprecatedGlobal = false) => {
|
|
6
31
|
var _a, _b;
|
|
7
32
|
// The user is able to put both if they don't use the library in TS or use configuration files.
|
|
@@ -17,16 +42,6 @@ const replaceGlobalWithDefaultTestOverrides = (config, reporter, warnDeprecatedG
|
|
|
17
42
|
return config;
|
|
18
43
|
};
|
|
19
44
|
exports.replaceGlobalWithDefaultTestOverrides = replaceGlobalWithDefaultTestOverrides;
|
|
20
|
-
const replaceConfigWithTestOverrides = (config, testOverrides) => {
|
|
21
|
-
const isConfigUsed = Object.keys(config !== null && config !== void 0 ? config : {}).length !== 0;
|
|
22
|
-
const isTestOverridesUsed = Object.keys(testOverrides !== null && testOverrides !== void 0 ? testOverrides : {}).length !== 0;
|
|
23
|
-
// If the user hasn't migrated and is still using `config` in test files, use `config`
|
|
24
|
-
if (!isTestOverridesUsed && isConfigUsed) {
|
|
25
|
-
return config !== null && config !== void 0 ? config : {};
|
|
26
|
-
}
|
|
27
|
-
return testOverrides !== null && testOverrides !== void 0 ? testOverrides : {};
|
|
28
|
-
};
|
|
29
|
-
exports.replaceConfigWithTestOverrides = replaceConfigWithTestOverrides;
|
|
30
45
|
const replacePollingTimeoutWithBatchTimeout = (config, reporter, warnDeprecatedPollingTimeout = false, batchTimeoutCliParam, pollingTimeoutCliParam) => {
|
|
31
46
|
var _a, _b;
|
|
32
47
|
// At this point, `global` should already have been moved to `defaultTestOverrides`
|
|
@@ -60,19 +75,4 @@ const warnIfDeprecatedPollingTimeoutUsed = (suites, reporter) => {
|
|
|
60
75
|
}
|
|
61
76
|
};
|
|
62
77
|
exports.warnIfDeprecatedPollingTimeoutUsed = warnIfDeprecatedPollingTimeoutUsed;
|
|
63
|
-
const moveLocationsToTestOverrides = (config, reporter, warnDeprecatedLocations = false) => {
|
|
64
|
-
var _a, _b, _c;
|
|
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`
|
|
67
|
-
const isLocationsUsedInDefaultTestOverrides = ((_c = (_b = config.defaultTestOverrides) === null || _b === void 0 ? void 0 : _b.locations) !== null && _c !== void 0 ? _c : []).length !== 0;
|
|
68
|
-
if (isLocationsUsedInRoot && warnDeprecatedLocations) {
|
|
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");
|
|
70
|
-
}
|
|
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) {
|
|
73
|
-
return Object.assign(Object.assign({}, config), { defaultTestOverrides: Object.assign(Object.assign({}, config.defaultTestOverrides), { locations: config.locations }) });
|
|
74
|
-
}
|
|
75
|
-
return config;
|
|
76
|
-
};
|
|
77
|
-
exports.moveLocationsToTestOverrides = moveLocationsToTestOverrides;
|
|
78
78
|
//# sourceMappingURL=compatibility.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compatibility.js","sourceRoot":"","sources":["../../../src/commands/synthetics/compatibility.ts"],"names":[],"mappings":";;;AACA,2DAAkF;AAE3E,MAAM,
|
|
1
|
+
{"version":3,"file":"compatibility.js","sourceRoot":"","sources":["../../../src/commands/synthetics/compatibility.ts"],"names":[],"mappings":"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"}
|
|
@@ -129,6 +129,7 @@ export type ResultSkippedBySelectiveRerun = Omit<BaseResult, 'location' | 'resul
|
|
|
129
129
|
};
|
|
130
130
|
export type Result = BaseResult | ResultSkippedBySelectiveRerun;
|
|
131
131
|
type Status = 'passed' | 'failed' | 'in_progress' | 'skipped';
|
|
132
|
+
type BatchStatus = 'passed' | 'failed' | 'in_progress';
|
|
132
133
|
export interface BaseResultInBatch {
|
|
133
134
|
execution_rule: ExecutionRule;
|
|
134
135
|
location: string;
|
|
@@ -151,12 +152,12 @@ export type ResultInBatchSkippedBySelectiveRerun = SkippedResultInBatch & {
|
|
|
151
152
|
export type ResultInBatch = BaseResultInBatch | ResultInBatchSkippedBySelectiveRerun;
|
|
152
153
|
export interface Batch {
|
|
153
154
|
results: ResultInBatch[];
|
|
154
|
-
status:
|
|
155
|
+
status: BatchStatus;
|
|
155
156
|
}
|
|
156
157
|
type ServerResultInBatch = BaseResultInBatch | SkippedResultInBatch;
|
|
157
158
|
export interface ServerBatch {
|
|
158
159
|
results: ServerResultInBatch[];
|
|
159
|
-
status:
|
|
160
|
+
status: BatchStatus;
|
|
160
161
|
}
|
|
161
162
|
export interface Vitals {
|
|
162
163
|
cls?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/commands/synthetics/interfaces.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/commands/synthetics/interfaces.ts"],"names":[],"mappings":";;;AA4RA,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"junit.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/reporters/junit.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"junit.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/reporters/junit.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ export declare class RunTestsCommand extends Command {
|
|
|
11
11
|
static usage: import("clipanion").Usage;
|
|
12
12
|
configPath: string | undefined;
|
|
13
13
|
jUnitReport: string | undefined;
|
|
14
|
+
/** @deprecated This CLI parameter is deprecated */
|
|
14
15
|
runName: string | undefined;
|
|
15
16
|
private apiKey;
|
|
16
17
|
private appKey;
|
|
@@ -90,6 +90,8 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
90
90
|
super(...arguments);
|
|
91
91
|
this.configPath = clipanion_1.Option.String('--config', { description: `Pass a path to a ${$1('global configuration file')}.` });
|
|
92
92
|
this.jUnitReport = clipanion_1.Option.String('-j,--jUnitReport', { description: 'Pass a path to a JUnit report file.' });
|
|
93
|
+
// TODO SYNTH-12989: Clean up deprecated `--runName`
|
|
94
|
+
/** @deprecated This CLI parameter is deprecated */
|
|
93
95
|
this.runName = clipanion_1.Option.String('-n,--runName', {
|
|
94
96
|
description: 'A name for this run, which will be included in the JUnit report file.',
|
|
95
97
|
});
|
|
@@ -154,6 +156,8 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
154
156
|
}
|
|
155
157
|
execute() {
|
|
156
158
|
return __awaiter(this, void 0, void 0, function* () {
|
|
159
|
+
const reporters = [new default_1.DefaultReporter(this)];
|
|
160
|
+
this.reporter = (0, public_1.getReporter)(reporters);
|
|
157
161
|
try {
|
|
158
162
|
yield this.resolveConfig();
|
|
159
163
|
}
|
|
@@ -163,8 +167,6 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
163
167
|
}
|
|
164
168
|
return 1;
|
|
165
169
|
}
|
|
166
|
-
const reporters = [new default_1.DefaultReporter(this)];
|
|
167
|
-
this.reporter = (0, public_1.getReporter)(reporters);
|
|
168
170
|
if (this.config.jUnitReport) {
|
|
169
171
|
reporters.push(new junit_1.JUnitReporter({
|
|
170
172
|
context: this.context,
|
|
@@ -244,11 +246,7 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
244
246
|
tunnel: (0, internal_1.toBoolean)(process.env.DATADOG_SYNTHETICS_TUNNEL),
|
|
245
247
|
}));
|
|
246
248
|
// Override with OVERRIDE ENV variables
|
|
247
|
-
const
|
|
248
|
-
count: (0, internal_1.toNumber)(process.env.DATADOG_SYNTHETICS_OVERRIDE_RETRY_COUNT),
|
|
249
|
-
interval: (0, internal_1.toNumber)(process.env.DATADOG_SYNTHETICS_OVERRIDE_RETRY_INTERVAL),
|
|
250
|
-
}));
|
|
251
|
-
const envOverrideBasicAuth = (0, deep_extend_1.default)((_j = (_h = this.config.defaultTestOverrides) === null || _h === void 0 ? void 0 : _h.basicAuth) !== null && _j !== void 0 ? _j : {}, (0, utils_1.removeUndefinedValues)({
|
|
249
|
+
const envOverrideBasicAuth = (0, deep_extend_1.default)((_g = (_f = this.config.defaultTestOverrides) === null || _f === void 0 ? void 0 : _f.basicAuth) !== null && _g !== void 0 ? _g : {}, (0, utils_1.removeUndefinedValues)({
|
|
252
250
|
password: process.env.DATADOG_SYNTHETICS_OVERRIDE_BASIC_AUTH_PASSWORD,
|
|
253
251
|
username: process.env.DATADOG_SYNTHETICS_OVERRIDE_BASIC_AUTH_USERNAME,
|
|
254
252
|
}));
|
|
@@ -256,6 +254,10 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
256
254
|
append: (0, internal_1.toBoolean)(process.env.DATADOG_SYNTHETICS_OVERRIDE_COOKIES_APPEND),
|
|
257
255
|
value: process.env.DATADOG_SYNTHETICS_OVERRIDE_COOKIES,
|
|
258
256
|
});
|
|
257
|
+
const envOverrideRetryConfig = (0, deep_extend_1.default)((_j = (_h = this.config.defaultTestOverrides) === null || _h === void 0 ? void 0 : _h.retry) !== null && _j !== void 0 ? _j : {}, (0, utils_1.removeUndefinedValues)({
|
|
258
|
+
count: (0, internal_1.toNumber)(process.env.DATADOG_SYNTHETICS_OVERRIDE_RETRY_COUNT),
|
|
259
|
+
interval: (0, internal_1.toNumber)(process.env.DATADOG_SYNTHETICS_OVERRIDE_RETRY_INTERVAL),
|
|
260
|
+
}));
|
|
259
261
|
this.config.defaultTestOverrides = (0, deep_extend_1.default)(this.config.defaultTestOverrides, (0, utils_1.removeUndefinedValues)({
|
|
260
262
|
allowInsecureCertificates: (0, internal_1.toBoolean)(process.env.DATADOG_SYNTHETICS_OVERRIDE_ALLOW_INSECURE_CERTIFICATES),
|
|
261
263
|
basicAuth: Object.keys(envOverrideBasicAuth).length > 0 ? envOverrideBasicAuth : undefined,
|
|
@@ -304,19 +306,25 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
304
306
|
tunnel: this.tunnel,
|
|
305
307
|
}));
|
|
306
308
|
// Override defaultTestOverrides with CLI parameters
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
309
|
+
let validatedOverrides;
|
|
310
|
+
try {
|
|
311
|
+
validatedOverrides = (0, internal_1.validateAndParseOverrides)(this.overrides);
|
|
312
|
+
}
|
|
313
|
+
catch (error) {
|
|
314
|
+
throw new errors_1.CiError('INVALID_CONFIG', error.message);
|
|
315
|
+
}
|
|
316
|
+
const cliOverrideBasicAuth = (0, deep_extend_1.default)((_r = (_q = this.config.defaultTestOverrides) === null || _q === void 0 ? void 0 : _q.basicAuth) !== null && _r !== void 0 ? _r : {}, (0, utils_1.removeUndefinedValues)({
|
|
317
|
+
password: (_s = validatedOverrides.basicAuth) === null || _s === void 0 ? void 0 : _s.password,
|
|
318
|
+
username: (_t = validatedOverrides.basicAuth) === null || _t === void 0 ? void 0 : _t.username,
|
|
315
319
|
}));
|
|
316
320
|
const cliOverrideCookies = (0, utils_1.removeUndefinedValues)({
|
|
317
|
-
append: (
|
|
318
|
-
value: (
|
|
321
|
+
append: (_u = validatedOverrides.cookies) === null || _u === void 0 ? void 0 : _u.append,
|
|
322
|
+
value: (_v = validatedOverrides.cookies) === null || _v === void 0 ? void 0 : _v.value,
|
|
319
323
|
});
|
|
324
|
+
const cliOverrideRetryConfig = (0, deep_extend_1.default)((_x = (_w = this.config.defaultTestOverrides) === null || _w === void 0 ? void 0 : _w.retry) !== null && _x !== void 0 ? _x : {}, (0, utils_1.removeUndefinedValues)({
|
|
325
|
+
count: (_y = validatedOverrides.retry) === null || _y === void 0 ? void 0 : _y.count,
|
|
326
|
+
interval: (_z = validatedOverrides.retry) === null || _z === void 0 ? void 0 : _z.interval,
|
|
327
|
+
}));
|
|
320
328
|
this.config.defaultTestOverrides = (0, deep_extend_1.default)(this.config.defaultTestOverrides, (0, utils_1.removeUndefinedValues)({
|
|
321
329
|
allowInsecureCertificates: validatedOverrides.allowInsecureCertificates,
|
|
322
330
|
basicAuth: Object.keys(cliOverrideBasicAuth).length > 0 ? cliOverrideBasicAuth : undefined,
|