@datadog/datadog-ci 2.33.0 → 2.34.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/dsyms/upload.js +4 -0
- package/dist/commands/dsyms/upload.js.map +1 -1
- package/dist/commands/flutter-symbols/helpers.js +2 -2
- package/dist/commands/flutter-symbols/helpers.js.map +1 -1
- package/dist/commands/git-metadata/gitdb.js +54 -26
- package/dist/commands/git-metadata/gitdb.js.map +1 -1
- package/dist/commands/git-metadata/library.js +1 -1
- package/dist/commands/git-metadata/upload.js +1 -1
- package/dist/commands/junit/upload.js +1 -1
- package/dist/commands/junit/upload.js.map +1 -1
- package/dist/commands/react-native/upload.js +1 -1
- package/dist/commands/sbom/payload.js +1 -2
- package/dist/commands/sbom/payload.js.map +1 -1
- package/dist/commands/sbom/upload.js +8 -3
- package/dist/commands/sbom/upload.js.map +1 -1
- package/dist/commands/sbom/validation.d.ts +9 -2
- package/dist/commands/sbom/validation.js +47 -6
- package/dist/commands/sbom/validation.js.map +1 -1
- package/dist/commands/sourcemaps/upload.js +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +1 -0
- package/dist/commands/synthetics/reporters/default.js +1 -1
- package/dist/commands/synthetics/reporters/default.js.map +1 -1
- package/dist/commands/synthetics/run-tests-command.js +10 -3
- package/dist/commands/synthetics/run-tests-command.js.map +1 -1
- package/dist/commands/synthetics/run-tests-lib.js +10 -1
- package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
- package/dist/commands/synthetics/test.d.ts +1 -5
- package/dist/commands/synthetics/test.js +2 -2
- package/dist/commands/synthetics/test.js.map +1 -1
- package/dist/commands/unity-symbols/helpers.js +1 -1
- package/package.json +1 -1
- package/dist/commands/sbom/license.d.ts +0 -3
- package/dist/commands/sbom/license.js +0 -113
- package/dist/commands/sbom/license.js.map +0 -1
|
@@ -242,6 +242,10 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
242
242
|
return (0, utils_1.getRequestBuilder)({
|
|
243
243
|
apiKey: this.config.apiKey,
|
|
244
244
|
baseUrl: (0, utils_2.getBaseIntakeUrl)(this.config.datadogSite),
|
|
245
|
+
headers: new Map([
|
|
246
|
+
['DD-EVP-ORIGIN', 'datadog-ci_dsyms'],
|
|
247
|
+
['DD-EVP-ORIGIN-VERSION', this.cliVersion],
|
|
248
|
+
]),
|
|
245
249
|
overrideUrl: 'api/v2/srcmap',
|
|
246
250
|
});
|
|
247
251
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/dsyms/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2BAA2B;AAC3B,gDAAuB;AAEvB,kDAAyB;AACzB,yCAAyC;AACzC,gDAAuB;AAEvB,iDAAwE;AACxE,2DAA8D;AAC9D,iDAA8D;AAE9D,mDAAqE;AACrE,iDAAyD;AACzD,+CAAqG;AACrG,qEAAsD;AACtD,yDAA4D;AAC5D,mDAA6C;AAE7C,6CAA4D;AAC5D,yCAUmB;AACnB,mCASgB;AAEhB,MAAa,aAAc,SAAQ,mBAAO;IAA1C;;QAmBU,aAAQ,GAAG,kBAAM,CAAC,MAAM,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAA;QAC1C,eAAU,GAAG,kBAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QACtC,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAC3C,mBAAc,GAAG,kBAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE,IAAI,EAAE,EAAC,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,EAAC,CAAC,CAAA;QAE9F,eAAU,GAAG,iBAAO,CAAA;QACpB,WAAM,GAA2B;YACvC,WAAW,EAAE,eAAe;SAC7B,CAAA;QAkFO,6BAAwB,GAAG,CAAO,KAAa,EAAE,aAAqB,EAA6B,EAAE;YAC3G,MAAM,aAAQ,CAAC,KAAK,CAAC,aAAa,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAA;YAEtD,OAAO,OAAO,CAAC,GAAG,CAChB,KAAK,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE;gBACvB,MAAM,WAAW,GAAG,IAAA,iBAAS,EAAC,aAAa,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAA;gBAC1E,MAAM,IAAA,6BAAqB,EAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;gBAEzD,OAAO,IAAI,2BAAc,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;YAC9C,CAAC,CAAA,CAAC,CACH,CAAA;QACH,CAAC,CAAA,CAAA;QAEO,yBAAoB,GAAG,CAAO,aAAqB,EAAmB,EAAE;YAC9E,MAAM,KAAK,GAAW,EAAE,CAAA;YACxB,KAAK,MAAM,QAAQ,IAAI,cAAI,CAAC,IAAI,CAAC,IAAA,iBAAS,EAAC,aAAa,EAAE,WAAW,CAAC,CAAC,EAAE;gBACvE,IAAI;oBACF,MAAM,MAAM,GAAG,CAAC,MAAM,IAAA,wBAAgB,EAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAA;oBACxD,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAA;oBACpD,KAAK,CAAC,IAAI,CAAC,EAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAC,CAAC,CAAA;iBACvD;gBAAC,WAAM;oBACN,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,mCAAwB,EAAC,QAAQ,CAAC,CAAC,CAAA;iBAC9D;aACF;YAED,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAC3B,CAAC,CAAA,CAAA;
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/dsyms/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,13 +41,13 @@ const getFlutterRequestBuilder = (apiKey, cliVersion, site) => (0, utils_1.getRe
|
|
|
41
41
|
apiKey,
|
|
42
42
|
baseUrl: (0, base_intake_url_1.getBaseSourcemapIntakeUrl)(site),
|
|
43
43
|
headers: new Map([
|
|
44
|
-
['DD-EVP-ORIGIN', 'datadog-
|
|
44
|
+
['DD-EVP-ORIGIN', 'datadog-ci_flutter-symbols'],
|
|
45
45
|
['DD-EVP-ORIGIN-VERSION', cliVersion],
|
|
46
46
|
]),
|
|
47
47
|
overrideUrl: 'api/v2/srcmap',
|
|
48
48
|
});
|
|
49
49
|
exports.getFlutterRequestBuilder = getFlutterRequestBuilder;
|
|
50
|
-
// This function exists partially just to make mocking
|
|
50
|
+
// This function exists partially just to make mocking network calls easier.
|
|
51
51
|
const uploadMultipartHelper = (requestBuilder, payload, opts) => __awaiter(void 0, void 0, void 0, function* () { return (0, upload_1.upload)(requestBuilder)(payload, opts); });
|
|
52
52
|
exports.uploadMultipartHelper = uploadMultipartHelper;
|
|
53
53
|
const getArchInfoFromFilename = (filename) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/commands/flutter-symbols/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4B;AAE5B,mEAAuE;AAEvE,iDAA4E;AAC5E,+CAAqD;AAE9C,MAAM,wBAAwB,GAAG,CAAC,MAAc,EAAE,UAAkB,EAAE,IAAY,EAAE,EAAE,CAC3F,IAAA,yBAAiB,EAAC;IAChB,MAAM;IACN,OAAO,EAAE,IAAA,2CAAyB,EAAC,IAAI,CAAC;IACxC,OAAO,EAAE,IAAI,GAAG,CAAC;QACf,CAAC,eAAe,EAAE,4BAA4B,CAAC;QAC/C,CAAC,uBAAuB,EAAE,UAAU,CAAC;KACtC,CAAC;IACF,WAAW,EAAE,eAAe;CAC7B,CAAC,CAAA;AATS,QAAA,wBAAwB,4BASjC;AAEJ,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/commands/flutter-symbols/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4B;AAE5B,mEAAuE;AAEvE,iDAA4E;AAC5E,+CAAqD;AAE9C,MAAM,wBAAwB,GAAG,CAAC,MAAc,EAAE,UAAkB,EAAE,IAAY,EAAE,EAAE,CAC3F,IAAA,yBAAiB,EAAC;IAChB,MAAM;IACN,OAAO,EAAE,IAAA,2CAAyB,EAAC,IAAI,CAAC;IACxC,OAAO,EAAE,IAAI,GAAG,CAAC;QACf,CAAC,eAAe,EAAE,4BAA4B,CAAC;QAC/C,CAAC,uBAAuB,EAAE,UAAU,CAAC;KACtC,CAAC;IACF,WAAW,EAAE,eAAe;CAC7B,CAAC,CAAA;AATS,QAAA,wBAAwB,4BASjC;AAEJ,4EAA4E;AACrE,MAAM,qBAAqB,GAAG,CACnC,cAA8B,EAC9B,OAAyB,EACzB,IAAmB,EACnB,EAAE,kDAAC,OAAA,IAAA,eAAM,EAAC,cAAc,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA,GAAA,CAAA;AAJ7B,QAAA,qBAAqB,yBAIQ;AAEnC,MAAM,uBAAuB,GAAG,CAAC,QAAgB,EAAE,EAAE;;IAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IACnC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAA;IAC5B,MAAM,MAAM,GAAG,MAAA,mCAAmC,CAAC,IAAI,CAAC,QAAQ,CAAC,0CAAE,MAAM,CAAA;IACzE,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,SAAS,CAAA;KACjB;IAED,MAAM,KAAK,GAAG;QACZ,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;KAC1B,CAAA;IAED,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QAClC,OAAO,SAAS,CAAA;KACjB;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAlBY,QAAA,uBAAuB,2BAkBnC"}
|
|
@@ -29,28 +29,17 @@ const MAX_HISTORY = {
|
|
|
29
29
|
maxCommits: 1000,
|
|
30
30
|
oldestCommits: '1 month ago',
|
|
31
31
|
};
|
|
32
|
-
const
|
|
33
|
-
let repoURL;
|
|
34
|
-
if (repositoryURL) {
|
|
35
|
-
repoURL = repositoryURL;
|
|
36
|
-
}
|
|
37
|
-
else {
|
|
38
|
-
try {
|
|
39
|
-
repoURL = yield (0, get_git_data_1.gitRemote)(git);
|
|
40
|
-
log.debug(`Syncing repository ${repoURL}`);
|
|
41
|
-
}
|
|
42
|
-
catch (err) {
|
|
43
|
-
log.warn(`Failed getting repository URL: ${err}`);
|
|
44
|
-
throw err;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
yield unshallowRepositoryWhenNeeded(log, git);
|
|
32
|
+
const getCommitsToInclude = (log, request, git, repositoryURL) => __awaiter(void 0, void 0, void 0, function* () {
|
|
48
33
|
let latestCommits;
|
|
49
34
|
try {
|
|
50
35
|
latestCommits = yield getLatestLocalCommits(git);
|
|
51
36
|
if (latestCommits.length === 0) {
|
|
52
37
|
log.debug('No local commits found.');
|
|
53
|
-
return
|
|
38
|
+
return {
|
|
39
|
+
commitsToInclude: [],
|
|
40
|
+
commitsToExclude: [],
|
|
41
|
+
headCommit: '',
|
|
42
|
+
};
|
|
54
43
|
}
|
|
55
44
|
log.debug(`${latestCommits.length} commits found, asking GitDB which ones are missing.`);
|
|
56
45
|
}
|
|
@@ -60,14 +49,54 @@ const uploadToGitDB = (log, request, git, dryRun, repositoryURL) => __awaiter(vo
|
|
|
60
49
|
}
|
|
61
50
|
let commitsToExclude;
|
|
62
51
|
try {
|
|
63
|
-
commitsToExclude = yield getKnownCommits(log, request,
|
|
52
|
+
commitsToExclude = yield getKnownCommits(log, request, repositoryURL, latestCommits);
|
|
64
53
|
log.debug(`${commitsToExclude.length} commits already in GitDB.`);
|
|
65
54
|
}
|
|
66
55
|
catch (err) {
|
|
67
56
|
log.warn(`Failed getting commits to exclude: ${err}`);
|
|
68
57
|
throw err;
|
|
69
58
|
}
|
|
70
|
-
|
|
59
|
+
return {
|
|
60
|
+
commitsToInclude: latestCommits.filter((x) => !commitsToExclude.includes(x)),
|
|
61
|
+
commitsToExclude,
|
|
62
|
+
headCommit: latestCommits[0],
|
|
63
|
+
};
|
|
64
|
+
});
|
|
65
|
+
const uploadToGitDB = (log, request, git, dryRun, repositoryURL) => __awaiter(void 0, void 0, void 0, function* () {
|
|
66
|
+
let repoURL;
|
|
67
|
+
if (repositoryURL) {
|
|
68
|
+
repoURL = repositoryURL;
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
try {
|
|
72
|
+
repoURL = yield (0, get_git_data_1.gitRemote)(git);
|
|
73
|
+
log.debug(`Syncing repository ${repoURL}`);
|
|
74
|
+
}
|
|
75
|
+
catch (err) {
|
|
76
|
+
log.warn(`Failed getting repository URL: ${err}`);
|
|
77
|
+
throw err;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
let commitsToInclude;
|
|
81
|
+
let commitsToExclude;
|
|
82
|
+
let headCommit;
|
|
83
|
+
const getCommitsBeforeUnshallowing = yield getCommitsToInclude(log, request, git, repoURL);
|
|
84
|
+
commitsToInclude = getCommitsBeforeUnshallowing.commitsToInclude;
|
|
85
|
+
commitsToExclude = getCommitsBeforeUnshallowing.commitsToExclude;
|
|
86
|
+
headCommit = getCommitsBeforeUnshallowing.headCommit;
|
|
87
|
+
// If there are no commits to include, it means the backend already has all the commits.
|
|
88
|
+
if (commitsToInclude.length === 0) {
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
91
|
+
// If there are commits to include and the repository is shallow, we need to repeat the process after unshallowing
|
|
92
|
+
const isShallow = yield isShallowRepository(git);
|
|
93
|
+
if (isShallow) {
|
|
94
|
+
yield unshallowRepository(log, git);
|
|
95
|
+
const getCommitsAfterUnshallowing = yield getCommitsToInclude(log, request, git, repoURL);
|
|
96
|
+
commitsToInclude = getCommitsAfterUnshallowing.commitsToInclude;
|
|
97
|
+
commitsToExclude = getCommitsAfterUnshallowing.commitsToExclude;
|
|
98
|
+
headCommit = getCommitsBeforeUnshallowing.headCommit;
|
|
99
|
+
}
|
|
71
100
|
// Get the list of all objects (commits, trees) to upload. This list can be quite long
|
|
72
101
|
// so quite memory intensive (multiple MBs).
|
|
73
102
|
let objectsToUpload;
|
|
@@ -96,7 +125,7 @@ const uploadToGitDB = (log, request, git, dryRun, repositoryURL) => __awaiter(vo
|
|
|
96
125
|
return;
|
|
97
126
|
}
|
|
98
127
|
log.debug(`Uploading packfiles...`);
|
|
99
|
-
yield (0, exports.uploadPackfiles)(log, request, repoURL,
|
|
128
|
+
yield (0, exports.uploadPackfiles)(log, request, repoURL, headCommit, packfiles);
|
|
100
129
|
log.debug('Successfully uploaded packfiles.');
|
|
101
130
|
}
|
|
102
131
|
catch (err) {
|
|
@@ -115,15 +144,14 @@ const getLatestLocalCommits = (git) => __awaiter(void 0, void 0, void 0, functio
|
|
|
115
144
|
const logResult = yield git.log([`-n ${MAX_HISTORY.maxCommits}`, `--since="${MAX_HISTORY.oldestCommits}"`]);
|
|
116
145
|
return logResult.all.map((c) => c.hash);
|
|
117
146
|
});
|
|
118
|
-
const
|
|
119
|
-
const isShallow = (yield git.revparse('--is-shallow-repository')) === 'true';
|
|
120
|
-
if (!isShallow) {
|
|
121
|
-
return;
|
|
122
|
-
}
|
|
147
|
+
const isShallowRepository = (git) => __awaiter(void 0, void 0, void 0, function* () {
|
|
123
148
|
const gitversion = String(yield git.version());
|
|
124
149
|
if ((0, semver_1.lte)(gitversion, '2.27.0')) {
|
|
125
|
-
return;
|
|
150
|
+
return false;
|
|
126
151
|
}
|
|
152
|
+
return (yield git.revparse('--is-shallow-repository')) === 'true';
|
|
153
|
+
});
|
|
154
|
+
const unshallowRepository = (log, git) => __awaiter(void 0, void 0, void 0, function* () {
|
|
127
155
|
log.info('[unshallow] Git repository is a shallow clone, unshallowing it...');
|
|
128
156
|
const [headCommit, remoteName] = yield Promise.all([git.revparse('HEAD'), (0, get_git_data_1.getDefaultRemoteName)(git)]);
|
|
129
157
|
const baseCommandLogLine = `[unshallow] Running git fetch --shallow-since="${MAX_HISTORY.oldestCommits}" --update-shallow --filter=blob:none --recurse-submodules=no`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitdb.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/gitdb.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kEAAyC;AACzC,4CAAmB;AACnB,0CAAmC;AACnC,4CAAmB;AACnB,gDAAuB;AAIvB,0DAAgC;AAChC,mCAA0B;AAG1B,iEAA4F;AAG5F,+CAAgD;AAEhD,MAAM,WAAW,GAAG,KAAK,CAAA;AAEzB,0EAA0E;AAC1E,2DAA2D;AAC3D,MAAM,WAAW,GAAG;IAClB,UAAU,EAAE,IAAI;IAChB,aAAa,EAAE,aAAa;CAC7B,CAAA;
|
|
1
|
+
{"version":3,"file":"gitdb.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/gitdb.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kEAAyC;AACzC,4CAAmB;AACnB,0CAAmC;AACnC,4CAAmB;AACnB,gDAAuB;AAIvB,0DAAgC;AAChC,mCAA0B;AAG1B,iEAA4F;AAG5F,+CAAgD;AAEhD,MAAM,WAAW,GAAG,KAAK,CAAA;AAEzB,0EAA0E;AAC1E,2DAA2D;AAC3D,MAAM,WAAW,GAAG;IAClB,UAAU,EAAE,IAAI;IAChB,aAAa,EAAE,aAAa;CAC7B,CAAA;AAED,MAAM,mBAAmB,GAAG,CAC1B,GAAW,EACX,OAAuB,EACvB,GAAwB,EACxB,aAAqB,EACrB,EAAE;IACF,IAAI,aAAuB,CAAA;IAC3B,IAAI;QACF,aAAa,GAAG,MAAM,qBAAqB,CAAC,GAAG,CAAC,CAAA;QAChD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,GAAG,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAA;YAEpC,OAAO;gBACL,gBAAgB,EAAE,EAAE;gBACpB,gBAAgB,EAAE,EAAE;gBACpB,UAAU,EAAE,EAAE;aACf,CAAA;SACF;QACD,GAAG,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,MAAM,sDAAsD,CAAC,CAAA;KACzF;IAAC,OAAO,GAAG,EAAE;QACZ,GAAG,CAAC,IAAI,CAAC,iCAAiC,GAAG,EAAE,CAAC,CAAA;QAChD,MAAM,GAAG,CAAA;KACV;IAED,IAAI,gBAA0B,CAAA;IAC9B,IAAI;QACF,gBAAgB,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,CAAC,CAAA;QACpF,GAAG,CAAC,KAAK,CAAC,GAAG,gBAAgB,CAAC,MAAM,4BAA4B,CAAC,CAAA;KAClE;IAAC,OAAO,GAAG,EAAE;QACZ,GAAG,CAAC,IAAI,CAAC,sCAAsC,GAAG,EAAE,CAAC,CAAA;QACrD,MAAM,GAAG,CAAA;KACV;IAED,OAAO;QACL,gBAAgB,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5E,gBAAgB;QAChB,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC;KAC7B,CAAA;AACH,CAAC,CAAA,CAAA;AAEM,MAAM,aAAa,GAAG,CAC3B,GAAW,EACX,OAAuB,EACvB,GAAwB,EACxB,MAAe,EACf,aAAsB,EACtB,EAAE;IACF,IAAI,OAAO,CAAA;IACX,IAAI,aAAa,EAAE;QACjB,OAAO,GAAG,aAAa,CAAA;KACxB;SAAM;QACL,IAAI;YACF,OAAO,GAAG,MAAM,IAAA,wBAAU,EAAC,GAAG,CAAC,CAAA;YAC/B,GAAG,CAAC,KAAK,CAAC,sBAAsB,OAAO,EAAE,CAAC,CAAA;SAC3C;QAAC,OAAO,GAAG,EAAE;YACZ,GAAG,CAAC,IAAI,CAAC,kCAAkC,GAAG,EAAE,CAAC,CAAA;YACjD,MAAM,GAAG,CAAA;SACV;KACF;IAED,IAAI,gBAA0B,CAAA;IAC9B,IAAI,gBAA0B,CAAA;IAC9B,IAAI,UAAkB,CAAA;IAEtB,MAAM,4BAA4B,GAAG,MAAM,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;IAE1F,gBAAgB,GAAG,4BAA4B,CAAC,gBAAgB,CAAA;IAChE,gBAAgB,GAAG,4BAA4B,CAAC,gBAAgB,CAAA;IAChE,UAAU,GAAG,4BAA4B,CAAC,UAAU,CAAA;IAEpD,wFAAwF;IACxF,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;QACjC,OAAM;KACP;IACD,kHAAkH;IAClH,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,GAAG,CAAC,CAAA;IAChD,IAAI,SAAS,EAAE;QACb,MAAM,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QACnC,MAAM,2BAA2B,GAAG,MAAM,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;QACzF,gBAAgB,GAAG,2BAA2B,CAAC,gBAAgB,CAAA;QAC/D,gBAAgB,GAAG,2BAA2B,CAAC,gBAAgB,CAAA;QAC/D,UAAU,GAAG,4BAA4B,CAAC,UAAU,CAAA;KACrD;IAED,sFAAsF;IACtF,4CAA4C;IAC5C,IAAI,eAAe,CAAA;IACnB,IAAI;QACF,eAAe,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;QACnF,GAAG,CAAC,KAAK,CAAC,GAAG,eAAe,CAAC,MAAM,qBAAqB,CAAC,CAAA;KAC1D;IAAC,OAAO,GAAG,EAAE;QACZ,GAAG,CAAC,IAAI,CAAC,qCAAqC,GAAG,EAAE,CAAC,CAAA;QACpD,MAAM,GAAG,CAAA;KACV;IAED,IAAI,SAAS,CAAA;IACb,IAAI,MAAM,CAAA;IACV,IAAI;QACF,CAAC;QAAA,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,2BAA2B,CAAC,GAAG,EAAE,eAAe,CAAC,CAAA;QAC9E,GAAG,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,MAAM,uBAAuB,CAAC,CAAA;KACtD;IAAC,OAAO,GAAG,EAAE;QACZ,GAAG,CAAC,IAAI,CAAC,gCAAgC,GAAG,EAAE,CAAC,CAAA;QAC/C,MAAM,GAAG,CAAA;KACV;IAED,IAAI;QACF,IAAI,MAAM,EAAE;YACV,GAAG,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAA;YAErD,OAAM;SACP;QACD,GAAG,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAA;QACnC,MAAM,IAAA,uBAAe,EAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,CAAC,CAAA;QACnE,GAAG,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAA;KAC9C;IAAC,OAAO,GAAG,EAAE;QACZ,GAAG,CAAC,IAAI,CAAC,+BAA+B,GAAG,EAAE,CAAC,CAAA;QAC9C,MAAM,GAAG,CAAA;KACV;YAAS;QACR,IAAI,MAAM,KAAK,SAAS,EAAE;YACxB,YAAE,CAAC,MAAM,CAAC,MAAM,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAA;SACrC;KACF;AACH,CAAC,CAAA,CAAA;AAlFY,QAAA,aAAa,iBAkFzB;AAED,MAAM,qBAAqB,GAAG,CAAO,GAAwB,EAAE,EAAE;IAC/D,+DAA+D;IAC/D,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,WAAW,CAAC,UAAU,EAAE,EAAE,YAAY,WAAW,CAAC,aAAa,GAAG,CAAC,CAAC,CAAA;IAE3G,OAAO,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;AACzC,CAAC,CAAA,CAAA;AAED,MAAM,mBAAmB,GAAG,CAAO,GAAwB,EAAE,EAAE;IAC7D,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;IAC9C,IAAI,IAAA,YAAG,EAAC,UAAU,EAAE,QAAQ,CAAC,EAAE;QAC7B,OAAO,KAAK,CAAA;KACb;IAED,OAAO,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC,KAAK,MAAM,CAAA;AACnE,CAAC,CAAA,CAAA;AAED,MAAM,mBAAmB,GAAG,CAAO,GAAW,EAAE,GAAwB,EAAE,EAAE;IAC1E,GAAG,CAAC,IAAI,CAAC,mEAAmE,CAAC,CAAA;IAE7E,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAA,mCAAoB,EAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACrG,MAAM,kBAAkB,GAAG,kDAAkD,WAAW,CAAC,aAAa,+DAA+D,CAAA;IAErK,GAAG,CAAC,IAAI,CAAC,GAAG,kBAAkB,qFAAqF,CAAC,CAAA;IAEpH,IAAI;QACF,MAAM,GAAG,CAAC,KAAK,CAAC;YACd,oBAAoB,WAAW,CAAC,aAAa,GAAG;YAChD,kBAAkB;YAClB,oBAAoB;YACpB,yBAAyB;YACzB,UAAU;YACV,UAAU;SACX,CAAC,CAAA;KACH;IAAC,OAAO,GAAG,EAAE;QACZ,qGAAqG;QACrG,GAAG,CAAC,IAAI,CAAC,oCAAoC,GAAG,EAAE,CAAC,CAAA;QACnD,IAAI;YACF,GAAG,CAAC,IAAI,CACN,GAAG,kBAAkB,8HAA8H,CACpJ,CAAA;YACD,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,+CAA+C,CAAC,CAAA;YAC1F,MAAM,GAAG,CAAC,KAAK,CAAC;gBACd,oBAAoB,WAAW,CAAC,aAAa,GAAG;gBAChD,kBAAkB;gBAClB,oBAAoB;gBACpB,yBAAyB;gBACzB,UAAU;gBACV,cAAc;aACf,CAAC,CAAA;SACH;QAAC,OAAO,WAAW,EAAE;YACpB,8GAA8G;YAC9G,GAAG,CAAC,IAAI,CAAC,0CAA0C,WAAW,EAAE,CAAC,CAAA;YACjE,GAAG,CAAC,IAAI,CAAC,GAAG,kBAAkB,+DAA+D,CAAC,CAAA;YAC9F,MAAM,GAAG,CAAC,KAAK,CAAC;gBACd,oBAAoB,WAAW,CAAC,aAAa,GAAG;gBAChD,kBAAkB;gBAClB,oBAAoB;gBACpB,yBAAyB;gBACzB,UAAU;aACX,CAAC,CAAA;SACH;KACF;IACD,GAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAA;AAC1C,CAAC,CAAA,CAAA;AAED,gFAAgF;AAChF,MAAM,eAAe,GAAG,CAAO,GAAW,EAAE,OAAuB,EAAE,OAAe,EAAE,aAAuB,EAAE,EAAE;IAU/G,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC;QACrC,IAAI,EAAE;YACJ,cAAc,EAAE,OAAO;SACxB;QACD,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACnC,EAAE,EAAE,MAAM;YACV,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;KACJ,CAAC,CAAA;IACF,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAC5D,OAAO,CAAC;QACN,GAAG,EAAE,uCAAuC;QAC5C,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;SACnC;QACD,IAAI,EAAE,eAAe;QACrB,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,WAAW;KACrB,CAAC,CACH,CAAA;IACD,MAAM,OAAO,GAAG,QAAQ,CAAC,IAA4B,CAAA;IACrD,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE;QAC1C,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAA;KACrD;IAED,OAAO,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,EAAE,KAAK,SAAS,EAAE;YAC7C,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;SAChD;QAED,OAAO,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAC7B,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE;IACrC,MAAM,WAAW,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAC3D,MAAM,aAAa,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAE7D,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE;QAC5C,MAAM,IAAI,KAAK,CAAC,0BAA0B,GAAG,EAAE,CAAC,CAAA;KACjD;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,CAAO,GAAwB,EAAE,gBAA0B,EAAE,gBAA0B,EAAE,EAAE;IACpH,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,GAAG,CAC/B,CAAC,UAAU,EAAE,WAAW,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,YAAY,WAAW,CAAC,aAAa,GAAG,CAAC;SAC3G,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;SAChD,MAAM,CAAC,gBAAgB,CAAC,CAC5B,CAAA;IACD,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;IAExE,OAAO,gBAAgB,CAAA;AACzB,CAAC,CAAA,CAAA;AAED,MAAM,2BAA2B,GAAG,CAAO,GAAW,EAAE,OAAiB,EAA2C,EAAE;IACpH,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,OAAO,CAAC,EAAE,EAAE,SAAS,CAAC,CAAA;KACvB;IAED,MAAM,iBAAiB,GAAG,CAAO,WAAmB,EAA2C,EAAE;QAC/F,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAA;QAC9D,MAAM,OAAO,GAAG,MAAM,IAAA,kBAAO,EAAC,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC,CAAA;QACtE,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;QACrD,MAAM,iBAAiB,GAAG,uBAAa;aACpC,QAAQ,CAAC,uDAAuD,YAAY,EAAE,EAAE;YAC/E,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;SAC1B,CAAC;aACD,QAAQ,EAAE;aACV,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;aAC/B,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,YAAY,IAAI,GAAG,OAAO,CAAC,CAAA;QAE9C,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAA;IACrC,CAAC,CAAA,CAAA;IAED,8BAA8B;IAC9B,IAAI;QACF,OAAO,MAAM,iBAAiB,CAAC,YAAE,CAAC,MAAM,EAAE,CAAC,CAAA;KAC5C;IAAC,OAAO,GAAG,EAAE;QACZ;;;;;;;;;;;WAWG;QACH,GAAG,CAAC,IAAI,CAAC,6CAA6C,GAAG,EAAE,CAAC,CAAA;QAC5D,GAAG,CAAC,IAAI,CAAC,sBAAsB,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QAEvD,OAAO,iBAAiB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;KACxC;AACH,CAAC,CAAA,CAAA;AAEM,MAAM,eAAe,GAAG,CAC7B,GAAW,EACX,OAAuB,EACvB,OAAe,EACf,UAAkB,EAClB,aAAuB,EACvB,EAAE;IACF,2DAA2D;IAC3D,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE;QAChC,MAAM,IAAA,sBAAc,EAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,CAAA;KAC9D;AACH,CAAC,CAAA,CAAA;AAXY,QAAA,eAAe,mBAW3B;AAEM,MAAM,cAAc,GAAG,CAC5B,GAAW,EACX,OAAuB,EACvB,OAAe,EACf,UAAkB,EAClB,YAAoB,EACpB,EAAE;IACF,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAC/B,IAAI,EAAE;YACJ,EAAE,EAAE,UAAU;YACd,IAAI,EAAE,QAAQ;SACf;QACD,IAAI,EAAE;YACJ,cAAc,EAAE,OAAO;SACxB;KACF,CAAC,CAAA;IAEF,MAAM,IAAI,GAAG,IAAI,mBAAQ,EAAE,CAAA;IAE3B,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE,EAAC,WAAW,EAAE,kBAAkB,EAAC,CAAC,CAAA;IACtE,MAAM,eAAe,GAAG,YAAE,CAAC,YAAY,CAAC,YAAY,CAAC,CAAA;IACrD,uEAAuE;IACvE,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAG,cAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC3D,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,eAAe,EAAE;QACvC,QAAQ;QACR,WAAW,EAAE,0BAA0B;KACxC,CAAC,CAAA;IAEF,OAAO,UAAU,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,CACtC,OAAO,CAAC;QACN,GAAG,EAAE,iCAAiC;QACtC,OAAO,oBACF,IAAI,CAAC,UAAU,EAAE,CACrB;QACD,OAAO,EAAE,WAAW;QACpB,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,MAAM;KACf,CAAC,CACH,CAAA;AACH,CAAC,CAAA,CAAA;AAvCY,QAAA,cAAc,kBAuC1B;AAED,2GAA2G;AAC3G,MAAM,UAAU,GAAG,CAAU,GAAW,EAAE,OAAe,EAAE,OAAwC,EAAE,EAAE;IACrG,OAAO,IAAA,oBAAY,EAAC,OAAO,EAAE;QAC3B,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE;YACtB,IAAI,YAAY,GAAG,GAAG,CAAC,EAAE,CAAA;YACzB,MAAM,cAAc,GAAG,CAAQ,CAAA;YAC/B,IAAI,cAAc,CAAC,QAAQ,IAAI,cAAc,CAAC,QAAQ,CAAC,UAAU,EAAE;gBACjE,YAAY,GAAG,GAAG,cAAc,CAAC,OAAO,KAAK,cAAc,CAAC,QAAQ,CAAC,UAAU,GAAG,CAAA;aACnF;YACD,GAAG,CAAC,IAAI,CAAC,YAAY,OAAO,cAAc,OAAO,aAAa,YAAY,EAAE,CAAC,CAAA;QAC/E,CAAC;KACF,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA"}
|
|
@@ -72,7 +72,7 @@ const uploadToSrcmapTrack = (apiKey, datadogSite, payload) => __awaiter(void 0,
|
|
|
72
72
|
apiKey,
|
|
73
73
|
baseUrl: 'https://sourcemap-intake.' + datadogSite,
|
|
74
74
|
headers: new Map([
|
|
75
|
-
['DD-EVP-ORIGIN', 'datadog-
|
|
75
|
+
['DD-EVP-ORIGIN', 'datadog-ci_sci'],
|
|
76
76
|
['DD-EVP-ORIGIN-VERSION', version_1.version],
|
|
77
77
|
]),
|
|
78
78
|
overrideUrl: 'api/v2/srcmap',
|
|
@@ -185,7 +185,7 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
185
185
|
apiKey,
|
|
186
186
|
baseUrl: (0, api_1.getBaseIntakeUrl)(),
|
|
187
187
|
headers: new Map([
|
|
188
|
-
['DD-EVP-ORIGIN', 'datadog-
|
|
188
|
+
['DD-EVP-ORIGIN', 'datadog-ci_git-metadata'],
|
|
189
189
|
['DD-EVP-ORIGIN-VERSION', this.cliVersion],
|
|
190
190
|
]),
|
|
191
191
|
overrideUrl: 'api/v2/srcmap',
|
|
@@ -101,7 +101,7 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
101
101
|
this.reportMeasures = clipanion_1.Option.Array('--report-measures');
|
|
102
102
|
this.rawXPathTags = clipanion_1.Option.Array('--xpath-tag');
|
|
103
103
|
this.gitRepositoryURL = clipanion_1.Option.String('--git-repository-url');
|
|
104
|
-
this.skipGitMetadataUpload = clipanion_1.Option.String('--skip-git-metadata-upload', '
|
|
104
|
+
this.skipGitMetadataUpload = clipanion_1.Option.String('--skip-git-metadata-upload', 'false', {
|
|
105
105
|
validator: t.isBoolean(),
|
|
106
106
|
tolerateBoolean: true,
|
|
107
107
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/junit/upload.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/junit/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -227,7 +227,7 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
227
227
|
apiKey: this.config.apiKey,
|
|
228
228
|
baseUrl: (0, base_intake_url_1.getBaseSourcemapIntakeUrl)(this.config.datadogSite),
|
|
229
229
|
headers: new Map([
|
|
230
|
-
['DD-EVP-ORIGIN', 'datadog-
|
|
230
|
+
['DD-EVP-ORIGIN', 'datadog-ci_react-native'],
|
|
231
231
|
['DD-EVP-ORIGIN-VERSION', this.cliVersion],
|
|
232
232
|
]),
|
|
233
233
|
overrideUrl: 'api/v2/srcmap',
|
|
@@ -31,7 +31,6 @@ const console = __importStar(require("console"));
|
|
|
31
31
|
const crypto_1 = __importDefault(require("crypto"));
|
|
32
32
|
const tags_1 = require("../../helpers/tags");
|
|
33
33
|
const language_1 = require("./language");
|
|
34
|
-
const license_1 = require("./license");
|
|
35
34
|
// Parse a location from the file generated by osv-scanner into a location that can be
|
|
36
35
|
// sent to our API.
|
|
37
36
|
const parseLocation = (location) => {
|
|
@@ -142,7 +141,7 @@ const generatePayload = (jsonContent, tags, service, env) => {
|
|
|
142
141
|
group: component['group'] || undefined,
|
|
143
142
|
version: component['version'],
|
|
144
143
|
language: lang,
|
|
145
|
-
licenses:
|
|
144
|
+
licenses: [],
|
|
146
145
|
purl,
|
|
147
146
|
locations,
|
|
148
147
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/commands/sbom/payload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAkC;AAClC,oDAA2B;AAG3B,6CAM2B;AAE3B,yCAAmD;
|
|
1
|
+
{"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/commands/sbom/payload.ts"],"names":[],"mappings":"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"}
|
|
@@ -83,9 +83,14 @@ class UploadSbomCommand extends clipanion_1.Command {
|
|
|
83
83
|
if (this.debug) {
|
|
84
84
|
this.context.stdout.write(`Processing file ${basePath}\n`);
|
|
85
85
|
}
|
|
86
|
-
if (!(0, validation_1.
|
|
87
|
-
|
|
88
|
-
|
|
86
|
+
if (!(0, validation_1.validateSbomFileAgainstSchema)(basePath, validator, !!this.debug)) {
|
|
87
|
+
if (!(0, validation_1.validateFileAgainstToolRequirements)(basePath, !!this.debug)) {
|
|
88
|
+
this.context.stdout.write((0, renderer_1.renderInvalidFile)(basePath));
|
|
89
|
+
return 1;
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
this.context.stdout.write('Invalid SBOM file but enough data to be processed (use --debug to get validation error)\n');
|
|
93
|
+
}
|
|
89
94
|
}
|
|
90
95
|
const jsonContent = JSON.parse(fs_1.default.readFileSync(basePath).toString('utf8'));
|
|
91
96
|
// Upload content
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,16 @@ import Ajv from 'ajv';
|
|
|
5
5
|
*/
|
|
6
6
|
export declare const getValidator: () => Ajv;
|
|
7
7
|
/**
|
|
8
|
-
* Validate an SBOM file.
|
|
8
|
+
* Validate an SBOM file against the SBOM CycloneDX schema.
|
|
9
|
+
*
|
|
9
10
|
* @param path - the path of the file to validate
|
|
10
11
|
* @param ajv - an instance of Ajv fully initialized and ready to use.
|
|
11
12
|
* @param debug - if we need to show debug information
|
|
12
13
|
*/
|
|
13
|
-
export declare const
|
|
14
|
+
export declare const validateSbomFileAgainstSchema: (path: string, ajv: Ajv, debug: boolean) => boolean;
|
|
15
|
+
/**
|
|
16
|
+
* Validate an SBOM file again what we need.
|
|
17
|
+
* @param path - the path of the file to validate
|
|
18
|
+
* @param debug - if we need to show debug information
|
|
19
|
+
*/
|
|
20
|
+
export declare const validateFileAgainstToolRequirements: (path: string, debug: boolean) => boolean;
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.validateFileAgainstToolRequirements = exports.validateSbomFileAgainstSchema = exports.getValidator = void 0;
|
|
7
7
|
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
const ajv_1 = __importDefault(require("ajv"));
|
|
9
9
|
const ajv_formats_1 = __importDefault(require("ajv-formats"));
|
|
@@ -24,12 +24,13 @@ const getValidator = () => {
|
|
|
24
24
|
};
|
|
25
25
|
exports.getValidator = getValidator;
|
|
26
26
|
/**
|
|
27
|
-
* Validate an SBOM file.
|
|
27
|
+
* Validate an SBOM file against the SBOM CycloneDX schema.
|
|
28
|
+
*
|
|
28
29
|
* @param path - the path of the file to validate
|
|
29
30
|
* @param ajv - an instance of Ajv fully initialized and ready to use.
|
|
30
31
|
* @param debug - if we need to show debug information
|
|
31
32
|
*/
|
|
32
|
-
const
|
|
33
|
+
const validateSbomFileAgainstSchema = (path, ajv, debug) => {
|
|
33
34
|
try {
|
|
34
35
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
35
36
|
const fileContent = JSON.parse(fs_1.default.readFileSync(path).toString('utf8'));
|
|
@@ -52,7 +53,7 @@ const validateSbomFile = (path, ajv, debug) => {
|
|
|
52
53
|
const errors15 = validateFunctionCycloneDx15.errors || [];
|
|
53
54
|
if (debug) {
|
|
54
55
|
errors15.forEach((message) => {
|
|
55
|
-
process.stderr.write(`Error while validating file ${path}, ${message.schemaPath}: ${message.instancePath} ${message.message}\n`);
|
|
56
|
+
process.stderr.write(`Error while validating file against CycloneDX 1.5: ${path}, ${message.schemaPath}: ${message.instancePath} ${message.message}\n`);
|
|
56
57
|
});
|
|
57
58
|
}
|
|
58
59
|
}
|
|
@@ -60,7 +61,7 @@ const validateSbomFile = (path, ajv, debug) => {
|
|
|
60
61
|
const errors14 = validateFunctionCycloneDx14.errors || [];
|
|
61
62
|
if (debug) {
|
|
62
63
|
errors14.forEach((message) => {
|
|
63
|
-
process.stderr.write(`Error while validating file ${path}, ${message.schemaPath}: ${message.instancePath} ${message.message}\n`);
|
|
64
|
+
process.stderr.write(`Error while validating file against CycloneDX 1.4: ${path}, ${message.schemaPath}: ${message.instancePath} ${message.message}\n`);
|
|
64
65
|
});
|
|
65
66
|
}
|
|
66
67
|
}
|
|
@@ -73,5 +74,45 @@ const validateSbomFile = (path, ajv, debug) => {
|
|
|
73
74
|
return false;
|
|
74
75
|
}
|
|
75
76
|
};
|
|
76
|
-
exports.
|
|
77
|
+
exports.validateSbomFileAgainstSchema = validateSbomFileAgainstSchema;
|
|
78
|
+
/**
|
|
79
|
+
* Validate an SBOM file again what we need.
|
|
80
|
+
* @param path - the path of the file to validate
|
|
81
|
+
* @param debug - if we need to show debug information
|
|
82
|
+
*/
|
|
83
|
+
const validateFileAgainstToolRequirements = (path, debug) => {
|
|
84
|
+
try {
|
|
85
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
86
|
+
const fileContent = JSON.parse(fs_1.default.readFileSync(path).toString('utf8'));
|
|
87
|
+
if (!fileContent) {
|
|
88
|
+
return false;
|
|
89
|
+
}
|
|
90
|
+
const components = fileContent['components'];
|
|
91
|
+
for (const component of components) {
|
|
92
|
+
if (!component['type']) {
|
|
93
|
+
return false;
|
|
94
|
+
}
|
|
95
|
+
if (component['type'] === 'library') {
|
|
96
|
+
const name = component['name'];
|
|
97
|
+
if (!!component['version']) {
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
100
|
+
if (!component['purl']) {
|
|
101
|
+
if (debug) {
|
|
102
|
+
process.stderr.write(`Component ${name} has no purl\n`);
|
|
103
|
+
}
|
|
104
|
+
return false;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
catch (error) {
|
|
110
|
+
if (debug) {
|
|
111
|
+
process.stderr.write(`Error while reading file: ${error.message}\n`);
|
|
112
|
+
}
|
|
113
|
+
return false;
|
|
114
|
+
}
|
|
115
|
+
return true;
|
|
116
|
+
};
|
|
117
|
+
exports.validateFileAgainstToolRequirements = validateFileAgainstToolRequirements;
|
|
77
118
|
//# sourceMappingURL=validation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/commands/sbom/validation.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AAEnB,8CAAqB;AACrB,8DAAoC;AAEpC,sGAA2E;AAC3E,sGAA2E;AAC3E,kGAA8D;AAC9D,2FAA4D;AAE5D;;;GAGG;AACI,MAAM,YAAY,GAAG,GAAQ,EAAE;IACpC,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,EAAC,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAC,CAAC,CAAA;IAC5D,GAAG,CAAC,aAAa,CAAC,0BAAU,CAAC,CAAA;IAC7B,GAAG,CAAC,aAAa,CAAC,8BAAS,CAAC,CAAA;IAC5B,IAAA,qBAAU,EAAC,GAAG,CAAC,CAAA;IAEf,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAPY,QAAA,YAAY,gBAOxB;AAED
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/commands/sbom/validation.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AAEnB,8CAAqB;AACrB,8DAAoC;AAEpC,sGAA2E;AAC3E,sGAA2E;AAC3E,kGAA8D;AAC9D,2FAA4D;AAE5D;;;GAGG;AACI,MAAM,YAAY,GAAG,GAAQ,EAAE;IACpC,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,EAAC,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAC,CAAC,CAAA;IAC5D,GAAG,CAAC,aAAa,CAAC,0BAAU,CAAC,CAAA;IAC7B,GAAG,CAAC,aAAa,CAAC,8BAAS,CAAC,CAAA;IAC5B,IAAA,qBAAU,EAAC,GAAG,CAAC,CAAA;IAEf,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAPY,QAAA,YAAY,gBAOxB;AAED;;;;;;GAMG;AACI,MAAM,6BAA6B,GAAG,CAAC,IAAY,EAAE,GAAQ,EAAE,KAAc,EAAW,EAAE;IAC/F,IAAI;QACF,mEAAmE;QACnE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QACtE,MAAM,2BAA2B,GAAG,GAAG,CAAC,OAAO,CAAC,6BAAiB,CAAC,CAAA;QAClE,MAAM,2BAA2B,GAAG,GAAG,CAAC,OAAO,CAAC,6BAAiB,CAAC,CAAA;QAElE,MAAM,SAAS,GAAG,2BAA2B,CAAC,WAAW,CAAC,CAAA;QAC1D,MAAM,SAAS,GAAG,2BAA2B,CAAC,WAAW,CAAC,CAAA;QAE1D,qFAAqF;QACrF,IAAI,SAAS,IAAI,KAAK,EAAE;YACtB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAA;SAC7D;QAED,IAAI,SAAS,IAAI,KAAK,EAAE;YACtB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAA;SAC7D;QAED,IAAI,SAAS,IAAI,SAAS,EAAE;YAC1B,OAAO,IAAI,CAAA;SACZ;QAED,kBAAkB;QAClB,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,QAAQ,GAAG,2BAA2B,CAAC,MAAM,IAAI,EAAE,CAAA;YAEzD,IAAI,KAAK,EAAE;gBACT,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,sDAAsD,IAAI,KAAK,OAAO,CAAC,UAAU,KAAK,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,OAAO,IAAI,CAClI,CAAA;gBACH,CAAC,CAAC,CAAA;aACH;SACF;QAED,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,QAAQ,GAAG,2BAA2B,CAAC,MAAM,IAAI,EAAE,CAAA;YAEzD,IAAI,KAAK,EAAE;gBACT,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,sDAAsD,IAAI,KAAK,OAAO,CAAC,UAAU,KAAK,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,OAAO,IAAI,CAClI,CAAA;gBACH,CAAC,CAAC,CAAA;aACH;SACF;QAED,OAAO,KAAK,CAAA;KACb;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,KAAK,EAAE;YACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,KAAK,CAAC,OAAO,IAAI,CAAC,CAAA;SACrE;QAED,OAAO,KAAK,CAAA;KACb;AACH,CAAC,CAAA;AAxDY,QAAA,6BAA6B,iCAwDzC;AAED;;;;GAIG;AACI,MAAM,mCAAmC,GAAG,CAAC,IAAY,EAAE,KAAc,EAAW,EAAE;IAC3F,IAAI;QACF,mEAAmE;QACnE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QACtE,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAA;SACb;QAED,MAAM,UAAU,GAAG,WAAW,CAAC,YAAY,CAAC,CAAA;QAE5C,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAClC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;gBACtB,OAAO,KAAK,CAAA;aACb;YAED,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,SAAS,EAAE;gBACnC,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;gBAE9B,IAAI,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE;oBAC1B,SAAQ;iBACT;gBAED,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;oBACtB,IAAI,KAAK,EAAE;wBACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,IAAI,gBAAgB,CAAC,CAAA;qBACxD;oBAED,OAAO,KAAK,CAAA;iBACb;aACF;SACF;KACF;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,KAAK,EAAE;YACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,KAAK,CAAC,OAAO,IAAI,CAAC,CAAA;SACrE;QAED,OAAO,KAAK,CAAA;KACb;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAxCY,QAAA,mCAAmC,uCAwC/C"}
|
|
@@ -212,7 +212,7 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
212
212
|
apiKey: this.config.apiKey,
|
|
213
213
|
baseUrl: (0, base_intake_url_1.getBaseSourcemapIntakeUrl)(this.config.datadogSite),
|
|
214
214
|
headers: new Map([
|
|
215
|
-
['DD-EVP-ORIGIN', 'datadog-
|
|
215
|
+
['DD-EVP-ORIGIN', 'datadog-ci_sourcemaps'],
|
|
216
216
|
['DD-EVP-ORIGIN-VERSION', this.cliVersion],
|
|
217
217
|
]),
|
|
218
218
|
overrideUrl: 'api/v2/srcmap',
|
|
@@ -400,6 +400,7 @@ export interface RunTestsCommandConfig extends SyntheticsCIConfig {
|
|
|
400
400
|
failOnTimeout: boolean;
|
|
401
401
|
files: string[];
|
|
402
402
|
global: UserConfigOverride;
|
|
403
|
+
defaultTestOverrides: UserConfigOverride;
|
|
403
404
|
locations: string[];
|
|
404
405
|
mobileApplicationVersionFilePath?: string;
|
|
405
406
|
pollingTimeout: number;
|
|
@@ -227,7 +227,7 @@ class DefaultReporter {
|
|
|
227
227
|
const lines = [];
|
|
228
228
|
const runSummary = [];
|
|
229
229
|
if (summary.previouslyPassed) {
|
|
230
|
-
runSummary.push(green(`${b(summary.passed)} passed (${b(summary.previouslyPassed)} in previous CI
|
|
230
|
+
runSummary.push(green(`${b(summary.passed)} passed (${b(summary.previouslyPassed)} in a previous CI batch)`));
|
|
231
231
|
}
|
|
232
232
|
else {
|
|
233
233
|
runSummary.push(green(`${b(summary.passed)} passed`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/reporters/default.ts"],"names":[],"mappings":";;;;;;AAGA,kDAAyB;AACzB,8CAAqB;AAIrB,8CAYsB;AACtB,gDAA2C;AAC3C,4CAWwB;AAExB,iBAAiB;AAEjB,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAE,EAAE;IAC9C,MAAM,QAAQ,GAAG,GAAG,EAAE;QACpB,IAAI,QAAQ,GAAG,KAAK,EAAE;YACpB,OAAO,eAAK,CAAC,IAAI,CAAC,GAAG,CAAA;SACtB;QACD,IAAI,QAAQ,GAAG,IAAI,EAAE;YACnB,OAAO,eAAK,CAAC,IAAI,CAAC,MAAM,CAAA;SACzB;QAED,OAAO,eAAK,CAAC,IAAI,CAAA;IACnB,CAAC,CAAA;IACD,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAA;IAExB,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAA;AAC1C,CAAC,CAAA;AAED,MAAM,KAAK,GAAG;IACZ,MAAM,EAAE,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IAC3B,mBAAmB,EAAE,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;IAC3C,OAAO,EAAE,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;IAC/B,OAAO,EAAE,eAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;CAC/B,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,IAAU,EAAE,EAAE;IACpC,IAAI,IAAI,CAAC,KAAK,EAAE;QACd,OAAO,KAAK,CAAC,MAAM,CAAA;KACpB;IACD,IAAI,IAAI,CAAC,OAAO,EAAE;QAChB,OAAO,KAAK,CAAC,OAAO,CAAA;KACrB;IAED,OAAO,KAAK,CAAC,OAAO,CAAA;AACtB,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,IAAU,EAAE,EAAE;IAChC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAClD,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,CAAA;IAEjC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAChE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAEpE,OAAO,OAAO,IAAI,MAAM,QAAQ,MAAM,IAAI,CAAC,WAAW,GAAG,KAAK,GAAG,KAAK,EAAE,CAAA;AAC1E,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,CAAC,KAAa,EAAsB,EAAE;IAC/D,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;QACjB,OAAM;KACP;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACtB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;KAC5B;IAED,OAAO,OAAO,KAAK,CAAC,OAAO,MAAM,KAAK,CAAC,MAAM,gBAAgB,CAAA;AAC/D,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,SAAiB,EAAE,YAAoB,EAAE,KAAkB,EAAE,EAAE;IACrF,IAAI,SAAS,KAAK,qBAAqB,EAAE;QACvC,IAAI;YACF,MAAM,gBAAgB,GAAgB,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;YAC9D,MAAM,MAAM,GAAG,CAAC,OAAO,IAAA,kBAAS,EAAC,WAAW,EAAE,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;YACjF,MAAM,CAAC,IAAI,CACT,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBAChC,MAAM,QAAQ,GAAG,eAAK,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;gBACnD,MAAM,MAAM,GAAG,eAAK,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;gBAEjD,OAAO,KAAK,KAAK,CAAC,IAAI,IAAI,0BAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,QAAQ,aAAa,MAAM,EAAE,CAAA;YAC9F,CAAC,CAAC,CACH,CAAA;YAED,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;SACpC;QAAC,OAAO,CAAC,EAAE;YACV,0DAA0D;SAC3D;KACF;IAED,OAAO,eAAK,CAAC,GAAG,CAAC,QAAQ,eAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,eAAK,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;AACjF,CAAC,CAAA;AAED,2BAA2B;AAC3B,MAAM,mBAAmB,GAAG,CAC1B,MAAoB,EACpB,IAAU,EACV,IAAY,EACZ,KAAkB,EACE,EAAE;IACtB,IAAI,MAAM,CAAC,SAAS,EAAE;QACpB,MAAM,KAAK,GACT,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,KAAK,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAA;QAEzG,OAAO;YACL,KAAK,eAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,OAAO,MAAM,KAAK,EAAE,CAAC,EAAE;YAClD,KAAK,eAAK,CAAC,MAAM,CAAC,+EAA+E,CAAC,EAAE;SACrG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KACb;IAED,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE;QACvB,MAAM,kBAAkB,GAAG,2BAA2B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAEjF,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,OAAO;gBACL,KAAK,IAAI,IAAI,KAAK,CAAC,kBAAkB,CAAC,EAAE;gBACxC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC;aACnE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SACb;QAED,OAAO,KAAK,IAAI,IAAI,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAA;KAChD;IAED,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;QAC3B,MAAM,KAAK,GAAa,EAAE,CAAA;QAE1B,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,KAAK,CAAC,IAAI,CAAC,eAAK,CAAC,GAAG,CAAC,QAAQ,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,eAAK,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAA;SACzG;QAED,oFAAoF;QACpF,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,aAAa,IAAI,MAAM,EAAE;YAC7C,MAAM,uBAAuB,GAAG,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;YACnG,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,uBAAuB,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAA;YAEnF,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAA;YAChG,IAAI,kBAAkB,EAAE;gBACtB,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;aAC/B;SACF;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KACxB;AACH,CAAC,CAAA;AAED,MAAM,2BAA2B,GAAG,CAAC,OAAe,EAAE,MAAsB,EAAU,EAAE;IACtF,MAAM,EAAC,OAAO,EAAE,KAAK,EAAC,GAAG,MAAM,CAAA;IAC/B,IAAI,OAAO,KAAK,KAAK,EAAE;QACrB,MAAM,IAAI,GAAG,aAAa,OAAO,CAAC,IAAI,EAAE,CAAA;QACxC,IAAI,OAAO,CAAC,SAAS,EAAE;YACrB,OAAO,GAAG,IAAI,cAAc,OAAO,CAAC,SAAS,EAAE,CAAA;SAChD;QAED,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,KAAK,EAAE;QAC1C,OAAO,SAAS,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,CAAA;KAC/C;IAED,IAAI,OAAO,KAAK,OAAO,IAAI,KAAK,EAAE;QAChC,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CACrC,KAAK;aACF,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;aAC3B,MAAM,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;YACvB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;YAEtC,OAAO,MAAM,CAAA;QACf,CAAC,EAAE,EAA6B,CAAC,CACpC;aACE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC;aAC7D,IAAI,CAAC,IAAI,CAAC,CAAA;QAEb,OAAO,6BAA6B,gBAAgB,EAAE,CAAA;KACvD;IAED,IAAI,OAAO,KAAK,MAAM,EAAE;QACtB,OAAO,GAAG,eAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,OAAO,CAAC,GAAG,EAAE,CAAA;KACxD;IAED,OAAO,GAAG,eAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,qBAAqB,GAAG,CAAC,IAAU,EAAE,SAAiB,EAAE,OAAe,EAAE,OAAe,EAAE,EAAE;;IAChG,MAAM,EAAC,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAC,GAAG,SAAS,CAAA;IAC3E,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,SAAS,CAAC,CAAA;IACjD,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,qBAAqB,CAAC,aAAa,CAAC,CAAA;IAE7D,MAAM,UAAU,GACd,CAAA,MAAA,SAAS,CAAC,cAAc,0CAAE,QAAQ,MAAK,KAAK,IAAI,SAAS,CAAC,cAAc,CAAC,MAAM,KAAK,QAAQ;QAC1F,CAAC,CAAC,eAAK,CAAC,GAAG,CAAC,WAAW,CAAC;QACxB,CAAC,CAAC,EAAE,CAAA;IAER,MAAM,iBAAiB,GAAG,+BAAsB,CAAC,QAAQ,CAAC,aAAa,CAAC;QACtE,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,IAAI,QAAQ,CAAC,aAAa,KAAK,0BAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAA;IAE5F,MAAM,SAAS,GAAG,GAAG,UAAU,GAAG,iBAAiB,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;IAEjH,MAAM,0BAA0B,GAAG,6BAA6B,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IACrF,MAAM,oBAAoB,GAAG,GAAG,IAAI,IAAI,SAAS,GAAG,0BAA0B,EAAE,CAAA;IAEhF,MAAM,WAAW,GAAG,CAAC,oBAAoB,CAAC,CAAA;IAE1C,6DAA6D;IAC7D,IAAI,IAAA,oBAAS,EAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE;QACvD,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QACpD,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,oBAAoB,QAAQ,OAAO,CAAC,CAAC,CAAC,EAAE,CAAA;QAExE,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;QAChE,MAAM,eAAe,GAAG,QAAQ,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAA;QAE5D,WAAW,CAAC,IAAI,CAAC,MAAM,YAAY,yBAAyB,CAAC,CAAA;QAC7D,WAAW,CAAC,IAAI,CAAC,SAAS,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,eAAe,EAAE,CAAC,CAAA;KAC1E;IAED,IAAI,IAAA,wCAA+B,EAAC,SAAS,CAAC,EAAE;QAC9C,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;QAEhE,WAAW,CAAC,IAAI,CAAC,eAAK,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,GAAG,CAAC,6BAA6B,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAA;QAC5G,WAAW,CAAC,IAAI,CAAC,SAAS,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;KACvD;SAAM;QACL,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,SAAS,CAAC,MAAM,EAAE,cAAc,IAAI,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;QAEvG,IAAI,iBAAiB,EAAE;YACrB,WAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;SACpC;KACF;IAED,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC/B,CAAC,CAAA;AAED,MAAM,6BAA6B,GAAG,CAAC,SAAiB,EAAE,QAAqB,EAAE,EAAE;IACjF,IAAI,IAAA,oBAAS,EAAC,SAAS,CAAC,EAAE;QACxB,MAAM,EAAC,MAAM,EAAC,GAAG,SAAS,CAAA;QAC1B,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,eAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAClG,MAAM,MAAM,GAAG,MAAM,IAAI,IAAA,sBAAa,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,WAAW,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAEjH,OAAO,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAA;KACjC;IAED,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AAED,MAAM,qBAAqB,GAAG,CAAC,aAA4B,EAAyB,EAAE;IACpF,IAAI,+BAAsB,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;QAClD,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,eAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;KACzC;IAED,IAAI,aAAa,gEAAoC,EAAE;QACrD,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;KACtD;IAED,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACvC,CAAC,CAAA;AAED,MAAa,eAAe;IAM1B,YAAY,EAAC,OAAO,EAA4B;QAC9C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACxD,CAAC;IAEM,KAAK,CAAC,KAAa;QACxB,IAAI,CAAC,aAAa,EAAE,CAAA;QACpB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IACnB,CAAC;IAEM,UAAU,CAAC,MAAgB;QAChC,IAAI,CAAC,aAAa,EAAE,CAAA;QACpB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAA;IACxC,CAAC;IAEM,GAAG,CAAC,GAAW;QACpB,IAAI,CAAC,aAAa,EAAE,CAAA;QACpB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACjB,CAAC;IAEM,WAAW,CAAC,OAA4B;QAC7C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,SAAS,CAAA;QAEnD,IAAI,CAAC,aAAa,EAAE,CAAA;QACpB,IAAI,CAAC,KAAK,CACR,CAAC,EAAE,EAAE,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,QAAQ,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAChH,CAAA;IACH,CAAC;IAEM,SAAS,CAAC,MAAc,EAAE,OAAe,EAAE,OAAe;;QAC/D,qFAAqF;QACrF,MAAA,IAAI,CAAC,eAAe,0CAAE,IAAI,EAAE,CAAA;QAC5B,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,CAAA;IACnF,CAAC;IAEM,cAAc,CAAC,MAAqB;QACzC,OAAM;IACR,CAAC;IAEM,MAAM,CAAC,OAAgB,EAAE,OAAe,EAAE,WAAmC;QAClF,MAAM,EAAC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAC,GAAG,eAAK,CAAA;QAEjD,MAAM,KAAK,GAAa,EAAE,CAAA;QAE1B,MAAM,UAAU,GAAG,EAAE,CAAA;QAErB,IAAI,OAAO,CAAC,gBAAgB,EAAE;YAC5B,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC,CAAA;SAC1G;aAAM;YACL,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAA;SACtD;QAED,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAA;QAEnD,IAAI,OAAO,CAAC,iBAAiB,EAAE;YAC7B,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,wBAAwB,CAAC,CAAC,CAAA;SACjF;QAED,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;SACjD;QAED,IAAI,OAAO,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,EAAE;YAClC,MAAM,oBAAoB,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAC/E,KAAK,CAAC,IAAI,CACR,GAAG,MAAM,CACP,GAAG,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,IAAA,kBAAS,EAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAC9F,IAAI,oBAAoB,EAAE,CAC5B,CAAA;SACF;QAED,MAAM,SAAS,GAAG,EAAE,CAAA;QACpB,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAA;SAC3D;QACD,IAAI,OAAO,CAAC,cAAc,EAAE;YAC1B,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAA;SACpE;QACD,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;QAE9E,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;YACtD,KAAK,CAAC,IAAI,CAAC,gCAAgC,GAAG,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;SACxE;QACD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,6BAA6B,CAAC,EAAE,CAAC,CAAA;QACnD,KAAK,CAAC,IAAI,CAAC,mBAAmB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,YAAY,EAAE,CAAC,CAAA;QAErE,IAAI,WAAW,IAAI,WAAW,CAAC,sBAAsB,GAAG,CAAC,EAAE;YACzD,KAAK,CAAC,IAAI,CACR,qCAAqC,WAAW,CAAC,sBAAsB,QACrE,WAAW,CAAC,sBAAsB,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EACjD,2BAA2B,CAC5B,CAAA;SACF;QAED,IAAI,OAAO,CAAC,gBAAgB,EAAE;YAC5B,KAAK,CAAC,IAAI,CACR,2BAA2B,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,gBAAgB,WAAW,OAAO,CAAC,QAAQ,QAAQ,CAC1G,CAAA;SACF;QAED,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;YACxD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,aAAa,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;YACjE,KAAK,CAAC,IAAI,CACR,oBAAoB,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,QAAQ,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,QAAQ,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC5G,CAAA;SACF;QAED,IAAI,WAAW,IAAI,WAAW,CAAC,sBAAsB,GAAG,CAAC,EAAE;YACzD,KAAK,CAAC,IAAI,CACR,sEAAsE,eAAK,CAAC,GAAG,CAAC,IAAI,CAClF,OAAO,GAAG,wCAAwC,CACnD,IAAI,CACN,CAAA;SACF;QAED,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;IACrC,CAAC;IAEM,SAAS,CAAC,KAAa,EAAE,OAAe,EAAE,OAAe,EAAE,YAAqB;QACrF,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QAC/C,IAAI,SAAS,CAAC,MAAM,GAAG,EAAE,EAAE;YACzB,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACpB,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;SACpB;QAED,MAAM,YAAY,GAAG,eAAK,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC5D,MAAM,aAAa,GAAG,IAAA,kBAAS,EAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QACrD,MAAM,iBAAiB,GAAG,YAAY,CAAC,CAAC,CAAC,cAAc,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAC,CAAC,EAAE,CAAA;QAE/G,MAAM,IAAI,GACR,KAAK,CAAC,MAAM,GAAG,CAAC;YACd,CAAC,CAAC,eAAe,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,aAAa,GAAG,iBAAiB,IAAI,YAAY,KAAK;YACxG,CAAC,CAAC,iCAAiC,CAAA;QAEvC,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,kDAAkD;YAClD,uDAAuD;YACvD,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,KAAK,IAAI,EAAE;gBACtC,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,IAAI,CAAA;gBAChC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;aAC7B;YAED,OAAM;SACP;QAED,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC9C,IAAI,CAAC,KAAK,CAAC,oCAAoC,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QAE9E,IAAI,CAAC,eAAe,GAAG,IAAA,aAAG,EAAC;YACzB,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;YAC3B,UAAU,EAAE,IAAI;YAChB,IAAI;SACL,CAAC,CAAA;QAEF,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAC9B,CAAC;IAEM,WAAW,CAChB,IAAwB,EACxB,MAAc,EACd,aAA4B,EAC5B,MAA0B;QAE1B,MAAM,SAAS,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAA;QAE/C,MAAM,UAAU,GAAG,GAAG,EAAE;YACtB,IAAI,aAAa,KAAK,0BAAa,CAAC,OAAO,EAAE;gBAC3C,oEAAoE;gBACpE,MAAM,mBAAmB,GAAG,MAAM,CAAC,aAAa,KAAK,0BAAa,CAAC,OAAO,CAAA;gBAC1E,IAAI,mBAAmB,EAAE;oBACvB,OAAO,iBAAiB,eAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;iBACvD;qBAAM;oBACL,OAAO,iBAAiB,eAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,sDAAsD,CAAA;iBAC1G;aACF;YAED,IAAI,aAAa,KAAK,0BAAa,CAAC,YAAY,EAAE;gBAChD,OAAO,eAAe,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAA;aACpE;YAED,OAAO,eAAe,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;QACtD,CAAC,CAAA;QAED,MAAM,sBAAsB,GAAG,GAAG,EAAE;YAClC,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAA;YACtD,IAAI,mBAAmB,KAAK,CAAC,IAAI,aAAa,KAAK,0BAAa,CAAC,OAAO,EAAE;gBACxE,OAAO,EAAE,CAAA;aACV;YAED,OAAO,GAAG,GAAG,eAAK,CAAC,IAAI,CAAC,IAAI,mBAAmB,WAAW,IAAA,kBAAS,EAAC,UAAU,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAA;QAC1G,CAAC,CAAA;QAED,IAAI,CAAC,KAAK,CAAC,GAAG,SAAS,IAAI,UAAU,EAAE,GAAG,sBAAsB,EAAE,IAAI,CAAC,CAAA;IACzE,CAAC;IAEM,QAAQ,CAAC,IAAU;QACxB,OAAM;IACR,CAAC;IAEO,aAAa;;QACnB,MAAA,IAAI,CAAC,eAAe,0CAAE,IAAI,EAAE,CAAA;QAC5B,OAAO,IAAI,CAAC,eAAe,CAAA;IAC7B,CAAC;CACF;AAnND,0CAmNC;AAEM,MAAM,iBAAiB,GAAG,CAAC,QAAsB,EAAkB,EAAE,CAAC,CAAC;IAC5E,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,OAAO,IAAI,CAAC;IAC7E,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,OAAO,IAAI,CAAC;IACnF,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,OAAO,IAAI,CAAC;CAChF,CAAC,CAAA;AAJW,QAAA,iBAAiB,qBAI5B"}
|
|
1
|
+
{"version":3,"file":"default.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/reporters/default.ts"],"names":[],"mappings":";;;;;;AAGA,kDAAyB;AACzB,8CAAqB;AAIrB,8CAYsB;AACtB,gDAA2C;AAC3C,4CAWwB;AAExB,iBAAiB;AAEjB,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAE,EAAE;IAC9C,MAAM,QAAQ,GAAG,GAAG,EAAE;QACpB,IAAI,QAAQ,GAAG,KAAK,EAAE;YACpB,OAAO,eAAK,CAAC,IAAI,CAAC,GAAG,CAAA;SACtB;QACD,IAAI,QAAQ,GAAG,IAAI,EAAE;YACnB,OAAO,eAAK,CAAC,IAAI,CAAC,MAAM,CAAA;SACzB;QAED,OAAO,eAAK,CAAC,IAAI,CAAA;IACnB,CAAC,CAAA;IACD,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAA;IAExB,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAA;AAC1C,CAAC,CAAA;AAED,MAAM,KAAK,GAAG;IACZ,MAAM,EAAE,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IAC3B,mBAAmB,EAAE,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;IAC3C,OAAO,EAAE,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;IAC/B,OAAO,EAAE,eAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;CAC/B,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,IAAU,EAAE,EAAE;IACpC,IAAI,IAAI,CAAC,KAAK,EAAE;QACd,OAAO,KAAK,CAAC,MAAM,CAAA;KACpB;IACD,IAAI,IAAI,CAAC,OAAO,EAAE;QAChB,OAAO,KAAK,CAAC,OAAO,CAAA;KACrB;IAED,OAAO,KAAK,CAAC,OAAO,CAAA;AACtB,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,IAAU,EAAE,EAAE;IAChC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAClD,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,CAAA;IAEjC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAChE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAEpE,OAAO,OAAO,IAAI,MAAM,QAAQ,MAAM,IAAI,CAAC,WAAW,GAAG,KAAK,GAAG,KAAK,EAAE,CAAA;AAC1E,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,CAAC,KAAa,EAAsB,EAAE;IAC/D,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;QACjB,OAAM;KACP;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACtB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;KAC5B;IAED,OAAO,OAAO,KAAK,CAAC,OAAO,MAAM,KAAK,CAAC,MAAM,gBAAgB,CAAA;AAC/D,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,SAAiB,EAAE,YAAoB,EAAE,KAAkB,EAAE,EAAE;IACrF,IAAI,SAAS,KAAK,qBAAqB,EAAE;QACvC,IAAI;YACF,MAAM,gBAAgB,GAAgB,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;YAC9D,MAAM,MAAM,GAAG,CAAC,OAAO,IAAA,kBAAS,EAAC,WAAW,EAAE,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;YACjF,MAAM,CAAC,IAAI,CACT,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBAChC,MAAM,QAAQ,GAAG,eAAK,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;gBACnD,MAAM,MAAM,GAAG,eAAK,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;gBAEjD,OAAO,KAAK,KAAK,CAAC,IAAI,IAAI,0BAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,QAAQ,aAAa,MAAM,EAAE,CAAA;YAC9F,CAAC,CAAC,CACH,CAAA;YAED,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;SACpC;QAAC,OAAO,CAAC,EAAE;YACV,0DAA0D;SAC3D;KACF;IAED,OAAO,eAAK,CAAC,GAAG,CAAC,QAAQ,eAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,eAAK,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;AACjF,CAAC,CAAA;AAED,2BAA2B;AAC3B,MAAM,mBAAmB,GAAG,CAC1B,MAAoB,EACpB,IAAU,EACV,IAAY,EACZ,KAAkB,EACE,EAAE;IACtB,IAAI,MAAM,CAAC,SAAS,EAAE;QACpB,MAAM,KAAK,GACT,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,KAAK,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAA;QAEzG,OAAO;YACL,KAAK,eAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,OAAO,MAAM,KAAK,EAAE,CAAC,EAAE;YAClD,KAAK,eAAK,CAAC,MAAM,CAAC,+EAA+E,CAAC,EAAE;SACrG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KACb;IAED,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE;QACvB,MAAM,kBAAkB,GAAG,2BAA2B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAEjF,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,OAAO;gBACL,KAAK,IAAI,IAAI,KAAK,CAAC,kBAAkB,CAAC,EAAE;gBACxC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC;aACnE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SACb;QAED,OAAO,KAAK,IAAI,IAAI,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAA;KAChD;IAED,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;QAC3B,MAAM,KAAK,GAAa,EAAE,CAAA;QAE1B,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,KAAK,CAAC,IAAI,CAAC,eAAK,CAAC,GAAG,CAAC,QAAQ,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,eAAK,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAA;SACzG;QAED,oFAAoF;QACpF,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,aAAa,IAAI,MAAM,EAAE;YAC7C,MAAM,uBAAuB,GAAG,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;YACnG,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,uBAAuB,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAA;YAEnF,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAA;YAChG,IAAI,kBAAkB,EAAE;gBACtB,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;aAC/B;SACF;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KACxB;AACH,CAAC,CAAA;AAED,MAAM,2BAA2B,GAAG,CAAC,OAAe,EAAE,MAAsB,EAAU,EAAE;IACtF,MAAM,EAAC,OAAO,EAAE,KAAK,EAAC,GAAG,MAAM,CAAA;IAC/B,IAAI,OAAO,KAAK,KAAK,EAAE;QACrB,MAAM,IAAI,GAAG,aAAa,OAAO,CAAC,IAAI,EAAE,CAAA;QACxC,IAAI,OAAO,CAAC,SAAS,EAAE;YACrB,OAAO,GAAG,IAAI,cAAc,OAAO,CAAC,SAAS,EAAE,CAAA;SAChD;QAED,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,KAAK,EAAE;QAC1C,OAAO,SAAS,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,CAAA;KAC/C;IAED,IAAI,OAAO,KAAK,OAAO,IAAI,KAAK,EAAE;QAChC,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CACrC,KAAK;aACF,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;aAC3B,MAAM,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;YACvB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;YAEtC,OAAO,MAAM,CAAA;QACf,CAAC,EAAE,EAA6B,CAAC,CACpC;aACE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC;aAC7D,IAAI,CAAC,IAAI,CAAC,CAAA;QAEb,OAAO,6BAA6B,gBAAgB,EAAE,CAAA;KACvD;IAED,IAAI,OAAO,KAAK,MAAM,EAAE;QACtB,OAAO,GAAG,eAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,OAAO,CAAC,GAAG,EAAE,CAAA;KACxD;IAED,OAAO,GAAG,eAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,qBAAqB,GAAG,CAAC,IAAU,EAAE,SAAiB,EAAE,OAAe,EAAE,OAAe,EAAE,EAAE;;IAChG,MAAM,EAAC,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAC,GAAG,SAAS,CAAA;IAC3E,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,SAAS,CAAC,CAAA;IACjD,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,qBAAqB,CAAC,aAAa,CAAC,CAAA;IAE7D,MAAM,UAAU,GACd,CAAA,MAAA,SAAS,CAAC,cAAc,0CAAE,QAAQ,MAAK,KAAK,IAAI,SAAS,CAAC,cAAc,CAAC,MAAM,KAAK,QAAQ;QAC1F,CAAC,CAAC,eAAK,CAAC,GAAG,CAAC,WAAW,CAAC;QACxB,CAAC,CAAC,EAAE,CAAA;IAER,MAAM,iBAAiB,GAAG,+BAAsB,CAAC,QAAQ,CAAC,aAAa,CAAC;QACtE,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,IAAI,QAAQ,CAAC,aAAa,KAAK,0BAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAA;IAE5F,MAAM,SAAS,GAAG,GAAG,UAAU,GAAG,iBAAiB,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;IAEjH,MAAM,0BAA0B,GAAG,6BAA6B,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IACrF,MAAM,oBAAoB,GAAG,GAAG,IAAI,IAAI,SAAS,GAAG,0BAA0B,EAAE,CAAA;IAEhF,MAAM,WAAW,GAAG,CAAC,oBAAoB,CAAC,CAAA;IAE1C,6DAA6D;IAC7D,IAAI,IAAA,oBAAS,EAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE;QACvD,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QACpD,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,oBAAoB,QAAQ,OAAO,CAAC,CAAC,CAAC,EAAE,CAAA;QAExE,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;QAChE,MAAM,eAAe,GAAG,QAAQ,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAA;QAE5D,WAAW,CAAC,IAAI,CAAC,MAAM,YAAY,yBAAyB,CAAC,CAAA;QAC7D,WAAW,CAAC,IAAI,CAAC,SAAS,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,eAAe,EAAE,CAAC,CAAA;KAC1E;IAED,IAAI,IAAA,wCAA+B,EAAC,SAAS,CAAC,EAAE;QAC9C,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;QAEhE,WAAW,CAAC,IAAI,CAAC,eAAK,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,GAAG,CAAC,6BAA6B,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAA;QAC5G,WAAW,CAAC,IAAI,CAAC,SAAS,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;KACvD;SAAM;QACL,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,SAAS,CAAC,MAAM,EAAE,cAAc,IAAI,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;QAEvG,IAAI,iBAAiB,EAAE;YACrB,WAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;SACpC;KACF;IAED,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC/B,CAAC,CAAA;AAED,MAAM,6BAA6B,GAAG,CAAC,SAAiB,EAAE,QAAqB,EAAE,EAAE;IACjF,IAAI,IAAA,oBAAS,EAAC,SAAS,CAAC,EAAE;QACxB,MAAM,EAAC,MAAM,EAAC,GAAG,SAAS,CAAA;QAC1B,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,eAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAClG,MAAM,MAAM,GAAG,MAAM,IAAI,IAAA,sBAAa,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,WAAW,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAEjH,OAAO,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAA;KACjC;IAED,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AAED,MAAM,qBAAqB,GAAG,CAAC,aAA4B,EAAyB,EAAE;IACpF,IAAI,+BAAsB,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;QAClD,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,eAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;KACzC;IAED,IAAI,aAAa,gEAAoC,EAAE;QACrD,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;KACtD;IAED,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACvC,CAAC,CAAA;AAED,MAAa,eAAe;IAM1B,YAAY,EAAC,OAAO,EAA4B;QAC9C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACxD,CAAC;IAEM,KAAK,CAAC,KAAa;QACxB,IAAI,CAAC,aAAa,EAAE,CAAA;QACpB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IACnB,CAAC;IAEM,UAAU,CAAC,MAAgB;QAChC,IAAI,CAAC,aAAa,EAAE,CAAA;QACpB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAA;IACxC,CAAC;IAEM,GAAG,CAAC,GAAW;QACpB,IAAI,CAAC,aAAa,EAAE,CAAA;QACpB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACjB,CAAC;IAEM,WAAW,CAAC,OAA4B;QAC7C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,SAAS,CAAA;QAEnD,IAAI,CAAC,aAAa,EAAE,CAAA;QACpB,IAAI,CAAC,KAAK,CACR,CAAC,EAAE,EAAE,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,QAAQ,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAChH,CAAA;IACH,CAAC;IAEM,SAAS,CAAC,MAAc,EAAE,OAAe,EAAE,OAAe;;QAC/D,qFAAqF;QACrF,MAAA,IAAI,CAAC,eAAe,0CAAE,IAAI,EAAE,CAAA;QAC5B,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,CAAA;IACnF,CAAC;IAEM,cAAc,CAAC,MAAqB;QACzC,OAAM;IACR,CAAC;IAEM,MAAM,CAAC,OAAgB,EAAE,OAAe,EAAE,WAAmC;QAClF,MAAM,EAAC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAC,GAAG,eAAK,CAAA;QAEjD,MAAM,KAAK,GAAa,EAAE,CAAA;QAE1B,MAAM,UAAU,GAAG,EAAE,CAAA;QAErB,IAAI,OAAO,CAAC,gBAAgB,EAAE;YAC5B,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,0BAA0B,CAAC,CAAC,CAAA;SAC9G;aAAM;YACL,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAA;SACtD;QAED,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAA;QAEnD,IAAI,OAAO,CAAC,iBAAiB,EAAE;YAC7B,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,wBAAwB,CAAC,CAAC,CAAA;SACjF;QAED,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;SACjD;QAED,IAAI,OAAO,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,EAAE;YAClC,MAAM,oBAAoB,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAC/E,KAAK,CAAC,IAAI,CACR,GAAG,MAAM,CACP,GAAG,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,IAAA,kBAAS,EAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAC9F,IAAI,oBAAoB,EAAE,CAC5B,CAAA;SACF;QAED,MAAM,SAAS,GAAG,EAAE,CAAA;QACpB,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAA;SAC3D;QACD,IAAI,OAAO,CAAC,cAAc,EAAE;YAC1B,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAA;SACpE;QACD,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;QAE9E,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;YACtD,KAAK,CAAC,IAAI,CAAC,gCAAgC,GAAG,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;SACxE;QACD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,6BAA6B,CAAC,EAAE,CAAC,CAAA;QACnD,KAAK,CAAC,IAAI,CAAC,mBAAmB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,YAAY,EAAE,CAAC,CAAA;QAErE,IAAI,WAAW,IAAI,WAAW,CAAC,sBAAsB,GAAG,CAAC,EAAE;YACzD,KAAK,CAAC,IAAI,CACR,qCAAqC,WAAW,CAAC,sBAAsB,QACrE,WAAW,CAAC,sBAAsB,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EACjD,2BAA2B,CAC5B,CAAA;SACF;QAED,IAAI,OAAO,CAAC,gBAAgB,EAAE;YAC5B,KAAK,CAAC,IAAI,CACR,2BAA2B,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,gBAAgB,WAAW,OAAO,CAAC,QAAQ,QAAQ,CAC1G,CAAA;SACF;QAED,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;YACxD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,aAAa,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;YACjE,KAAK,CAAC,IAAI,CACR,oBAAoB,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,QAAQ,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,QAAQ,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC5G,CAAA;SACF;QAED,IAAI,WAAW,IAAI,WAAW,CAAC,sBAAsB,GAAG,CAAC,EAAE;YACzD,KAAK,CAAC,IAAI,CACR,sEAAsE,eAAK,CAAC,GAAG,CAAC,IAAI,CAClF,OAAO,GAAG,wCAAwC,CACnD,IAAI,CACN,CAAA;SACF;QAED,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;IACrC,CAAC;IAEM,SAAS,CAAC,KAAa,EAAE,OAAe,EAAE,OAAe,EAAE,YAAqB;QACrF,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QAC/C,IAAI,SAAS,CAAC,MAAM,GAAG,EAAE,EAAE;YACzB,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACpB,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;SACpB;QAED,MAAM,YAAY,GAAG,eAAK,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC5D,MAAM,aAAa,GAAG,IAAA,kBAAS,EAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QACrD,MAAM,iBAAiB,GAAG,YAAY,CAAC,CAAC,CAAC,cAAc,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAC,CAAC,EAAE,CAAA;QAE/G,MAAM,IAAI,GACR,KAAK,CAAC,MAAM,GAAG,CAAC;YACd,CAAC,CAAC,eAAe,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,aAAa,GAAG,iBAAiB,IAAI,YAAY,KAAK;YACxG,CAAC,CAAC,iCAAiC,CAAA;QAEvC,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,kDAAkD;YAClD,uDAAuD;YACvD,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,KAAK,IAAI,EAAE;gBACtC,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,IAAI,CAAA;gBAChC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;aAC7B;YAED,OAAM;SACP;QAED,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC9C,IAAI,CAAC,KAAK,CAAC,oCAAoC,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QAE9E,IAAI,CAAC,eAAe,GAAG,IAAA,aAAG,EAAC;YACzB,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;YAC3B,UAAU,EAAE,IAAI;YAChB,IAAI;SACL,CAAC,CAAA;QAEF,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAC9B,CAAC;IAEM,WAAW,CAChB,IAAwB,EACxB,MAAc,EACd,aAA4B,EAC5B,MAA0B;QAE1B,MAAM,SAAS,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAA;QAE/C,MAAM,UAAU,GAAG,GAAG,EAAE;YACtB,IAAI,aAAa,KAAK,0BAAa,CAAC,OAAO,EAAE;gBAC3C,oEAAoE;gBACpE,MAAM,mBAAmB,GAAG,MAAM,CAAC,aAAa,KAAK,0BAAa,CAAC,OAAO,CAAA;gBAC1E,IAAI,mBAAmB,EAAE;oBACvB,OAAO,iBAAiB,eAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;iBACvD;qBAAM;oBACL,OAAO,iBAAiB,eAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,sDAAsD,CAAA;iBAC1G;aACF;YAED,IAAI,aAAa,KAAK,0BAAa,CAAC,YAAY,EAAE;gBAChD,OAAO,eAAe,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAA;aACpE;YAED,OAAO,eAAe,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;QACtD,CAAC,CAAA;QAED,MAAM,sBAAsB,GAAG,GAAG,EAAE;YAClC,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAA;YACtD,IAAI,mBAAmB,KAAK,CAAC,IAAI,aAAa,KAAK,0BAAa,CAAC,OAAO,EAAE;gBACxE,OAAO,EAAE,CAAA;aACV;YAED,OAAO,GAAG,GAAG,eAAK,CAAC,IAAI,CAAC,IAAI,mBAAmB,WAAW,IAAA,kBAAS,EAAC,UAAU,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAA;QAC1G,CAAC,CAAA;QAED,IAAI,CAAC,KAAK,CAAC,GAAG,SAAS,IAAI,UAAU,EAAE,GAAG,sBAAsB,EAAE,IAAI,CAAC,CAAA;IACzE,CAAC;IAEM,QAAQ,CAAC,IAAU;QACxB,OAAM;IACR,CAAC;IAEO,aAAa;;QACnB,MAAA,IAAI,CAAC,eAAe,0CAAE,IAAI,EAAE,CAAA;QAC5B,OAAO,IAAI,CAAC,eAAe,CAAA;IAC7B,CAAC;CACF;AAnND,0CAmNC;AAEM,MAAM,iBAAiB,GAAG,CAAC,QAAsB,EAAkB,EAAE,CAAC,CAAC;IAC5E,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,OAAO,IAAI,CAAC;IAC7E,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,OAAO,IAAI,CAAC;IACnF,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,OAAO,IAAI,CAAC;CAChF,CAAC,CAAA;AAJW,QAAA,iBAAiB,qBAI5B"}
|
|
@@ -58,7 +58,9 @@ exports.DEFAULT_COMMAND_CONFIG = {
|
|
|
58
58
|
failOnMissingTests: false,
|
|
59
59
|
failOnTimeout: true,
|
|
60
60
|
files: ['{,!(node_modules)/**/}*.synthetics.json'],
|
|
61
|
+
// SYNTH-12989: Clean up deprecated `global` in favor of `defaultTestOverrides`
|
|
61
62
|
global: {},
|
|
63
|
+
defaultTestOverrides: {},
|
|
62
64
|
locations: [],
|
|
63
65
|
pollingTimeout: exports.DEFAULT_POLLING_TIMEOUT,
|
|
64
66
|
proxy: { protocol: 'http' },
|
|
@@ -183,6 +185,11 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
183
185
|
throw error;
|
|
184
186
|
}
|
|
185
187
|
}
|
|
188
|
+
// Use global only if defaultTestOverrides does not exist
|
|
189
|
+
// SYNTH-12989: Clean up deprecated `global` in favor of `defaultTestOverrides`
|
|
190
|
+
if (Object.keys(this.config.global).length !== 0 && Object.keys(this.config.defaultTestOverrides).length === 0) {
|
|
191
|
+
this.config.defaultTestOverrides = Object.assign({}, this.config.global);
|
|
192
|
+
}
|
|
186
193
|
// Override with ENV variables
|
|
187
194
|
this.config = (0, deep_extend_1.default)(this.config, (0, utils_1.removeUndefinedValues)({
|
|
188
195
|
apiKey: process.env.DATADOG_API_KEY,
|
|
@@ -192,7 +199,7 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
192
199
|
subdomain: process.env.DATADOG_SUBDOMAIN,
|
|
193
200
|
}));
|
|
194
201
|
// Override with OVERRIDE ENV variables
|
|
195
|
-
this.config.
|
|
202
|
+
this.config.defaultTestOverrides = (0, deep_extend_1.default)(this.config.defaultTestOverrides, (0, utils_1.removeUndefinedValues)({
|
|
196
203
|
deviceIds: (_b = process.env.DATADOG_SYNTHETICS_OVERRIDE_DEVICE_IDS) === null || _b === void 0 ? void 0 : _b.split(';'),
|
|
197
204
|
mobileApplicationVersion: process.env.DATADOG_SYNTHETICS_OVERRIDE_MOBILE_APPLICATION_VERSION,
|
|
198
205
|
}));
|
|
@@ -213,12 +220,12 @@ class RunTestsCommand extends clipanion_1.Command {
|
|
|
213
220
|
tunnel: this.tunnel,
|
|
214
221
|
}));
|
|
215
222
|
// Override with Global CLI parameters
|
|
216
|
-
this.config.
|
|
223
|
+
this.config.defaultTestOverrides = (0, deep_extend_1.default)(this.config.defaultTestOverrides, (0, utils_1.removeUndefinedValues)({
|
|
217
224
|
deviceIds: this.deviceIds,
|
|
218
225
|
mobileApplicationVersion: this.mobileApplicationVersion,
|
|
219
226
|
mobileApplicationVersionFilePath: this.mobileApplicationVersionFilePath,
|
|
220
227
|
variables: (0, public_1.parseVariablesFromCli)(this.variableStrings, (log) => { var _a; return (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.log(log); }),
|
|
221
|
-
pollingTimeout: (_d = (_c = this.pollingTimeout) !== null && _c !== void 0 ? _c : this.config.
|
|
228
|
+
pollingTimeout: (_d = (_c = this.pollingTimeout) !== null && _c !== void 0 ? _c : this.config.defaultTestOverrides.pollingTimeout) !== null && _d !== void 0 ? _d : this.config.pollingTimeout,
|
|
222
229
|
}));
|
|
223
230
|
if (typeof this.config.files === 'string') {
|
|
224
231
|
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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAAyC;AACzC,8DAAoC;AACpC,kEAAwC;AAExC,+CAAgF;AAChF,qEAAsD;AACtD,yDAA2D;AAE3D,qCAAgC;AAEhC,iDAAmD;AACnD,6CAA+C;AAC/C,mDAA4C;AAC5C,2CASuB;AAEV,QAAA,oBAAoB,GAAG,GAAG,CAAA;AAE1B,QAAA,uBAAuB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAExC,QAAA,sBAAsB,GAA0B;IAC3D,MAAM,EAAE,EAAE;IACV,MAAM,EAAE,EAAE;IACV,UAAU,EAAE,iBAAiB;IAC7B,WAAW,EAAE,eAAe;IAC5B,oBAAoB,EAAE,KAAK;IAC3B,kBAAkB,EAAE,KAAK;IACzB,aAAa,EAAE,IAAI;IACnB,KAAK,EAAE,CAAC,yCAAyC,CAAC;IAClD,+EAA+E;IAC/E,MAAM,EAAE,EAAE;IACV,oBAAoB,EAAE,EAAE;IACxB,SAAS,EAAE,EAAE;IACb,cAAc,EAAE,+BAAuB;IACvC,KAAK,EAAE,EAAC,QAAQ,EAAE,MAAM,EAAC;IACzB,SAAS,EAAE,EAAE;IACb,cAAc,EAAE,KAAK;IACrB,SAAS,EAAE,KAAK;IAChB,MAAM,EAAE,KAAK;IACb,eAAe,EAAE,EAAE;CACpB,CAAA;AAED,MAAM,iBAAiB,GAAG,+EAA+E,CAAA;AAEzG,MAAM,EAAE,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAA,uBAAY,EAAC,IAAI,EAAE,GAAG,iBAAiB,oCAAoC,CAAC,CAAA;AACzG,MAAM,EAAE,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAA,uBAAY,EAAC,IAAI,EAAE,GAAG,iBAAiB,aAAa,CAAC,CAAA;AAClF,MAAM,EAAE,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAA,uBAAY,EAAC,IAAI,EAAE,GAAG,iBAAiB,yBAAyB,CAAC,CAAA;AAE9F,MAAa,eAAgB,SAAQ,mBAAO;IAA5C;;QA2BS,eAAU,GAAG,kBAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAC,WAAW,EAAE,oBAAoB,EAAE,CAAC,2BAA2B,CAAC,GAAG,EAAC,CAAC,CAAA;QAC7G,gBAAW,GAAG,kBAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAC,WAAW,EAAE,qCAAqC,EAAC,CAAC,CAAA;QACrG,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,cAAc,EAAE;YAC7C,WAAW,EAAE,uEAAuE;SACrF,CAAC,CAAA;QAEM,WAAM,GAAG,kBAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAC,WAAW,EAAE,4CAA4C,EAAC,CAAC,CAAA;QAC/F,WAAM,GAAG,kBAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAC,WAAW,EAAE,oDAAoD,EAAC,CAAC,CAAA;QACvG,gBAAW,GAAG,kBAAM,CAAC,MAAM,CAAC,eAAe,EAAE,EAAC,WAAW,EAAE,gDAAgD,EAAC,CAAC,CAAA;QAC7G,cAAS,GAAG,kBAAM,CAAC,KAAK,CAAC,aAAa,EAAE;YAC9C,WAAW,EAAE,wDAAwD;SACtE,CAAC,CAAA;QACM,yBAAoB,GAAG,kBAAM,CAAC,OAAO,CAAC,wBAAwB,EAAE;YACtE,WAAW,EACT,gHAAgH;SACnH,CAAC,CAAA;QACM,uBAAkB,GAAG,kBAAM,CAAC,OAAO,CAAC,sBAAsB,EAAE;YAClE,WAAW,EAAE,uIAAuI,EAAE,CACpJ,WAAW,CACZ,qGAAqG;SACvG,CAAC,CAAA;QACM,kBAAa,GAAG,kBAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE;YACxD,WAAW,EAAE,6FAA6F;SAC3G,CAAC,CAAA;QACM,UAAK,GAAG,kBAAM,CAAC,KAAK,CAAC,YAAY,EAAE;YACzC,WAAW,EAAE,yCAAyC,EAAE,CAAC,qBAAqB,CAAC,IAAI;SACpF,CAAC,CAAA;QACM,6BAAwB,GAAG,kBAAM,CAAC,MAAM,CAAC,4BAA4B,EAAE;YAC7E,WAAW,EAAE,6FAA6F;SAC3G,CAAC,CAAA;QACM,qCAAgC,GAAG,kBAAM,CAAC,MAAM,CAAC,gDAAgD,EAAE;YACzG,WAAW,EAAE,8EAA8E;SAC5F,CAAC,CAAA;QACM,mBAAc,GAAG,kBAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE;YACzD,WAAW,EACT,uMAAuM;YACzM,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE;SAClC,CAAC,CAAA;QACM,cAAS,GAAG,kBAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAC,WAAW,EAAE,wBAAwB,EAAC,CAAC,CAAA;QACnF,mBAAc,GAAG,kBAAM,CAAC,OAAO,CAAC,kBAAkB,EAAE;YAC1D,WAAW,EACT,4KAA4K;SAC/K,CAAC,CAAA;QACM,cAAS,GAAG,kBAAM,CAAC,MAAM,CAAC,aAAa,EAAE;YAC/C,WAAW,EACT,wLAAwL;SAC3L,CAAC,CAAA;QACM,oBAAe,GAAG,kBAAM,CAAC,MAAM,CAAC,aAAa,EAAE;YACrD,WAAW,EAAE,sDAAsD;SACpE,CAAC,CAAA;QACM,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,aAAa,EAAE;YAC7C,WAAW,EAAE,WAAW,EAAE,CAAC,2BAA2B,CAAC,8BAA8B;SACtF,CAAC,CAAA;QACM,oBAAe,GAAG,kBAAM,CAAC,KAAK,CAAC,eAAe,EAAE,EAAC,WAAW,EAAE,2BAA2B,EAAC,CAAC,CAAA;QAG3F,WAAM,GAA0B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,8BAAsB,CAAC,CAAC,CAAA,CAAC,gDAAgD;IA+I7I,CAAC;IA7Ic,OAAO;;YAClB,MAAM,SAAS,GAAe,CAAC,IAAI,yBAAe,CAAC,IAAI,CAAC,CAAC,CAAA;YACzD,IAAI,CAAC,QAAQ,GAAG,IAAA,oBAAW,EAAC,SAAS,CAAC,CAAA;YAEtC,IAAI,IAAI,CAAC,WAAW,EAAE;gBACpB,SAAS,CAAC,IAAI,CAAC,IAAI,qBAAa,CAAC,IAAI,CAAC,CAAC,CAAA;aACxC;YAED,IAAI;gBACF,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;aAC3B;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,KAAK,YAAY,gBAAO,EAAE;oBAC5B,IAAA,sBAAa,EAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;iBACpC;gBAED,OAAO,CAAC,CAAA;aACT;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAC5B,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBACtB,IAAI,CAAC,QAAQ,CAAC,GAAG,CACf,gHAAgH,CACjH,CAAA;aACF;YAED,IAAI,OAAiB,CAAA;YACrB,IAAI,OAAgB,CAAA;YAEpB,IAAI;gBACF,CAAC;gBAAA,CAAC,EAAC,OAAO,EAAE,OAAO,EAAC,GAAG,MAAM,IAAA,4BAAY,EAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;aACvE;YAAC,OAAO,KAAK,EAAE;gBACd,IAAA,uBAAc,EAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,EAAC,KAAK,EAAC,CAAC,CAAA;gBAEnD,OAAO,IAAA,mBAAU,EAAC,IAAA,sBAAa,EAAC,IAAI,CAAC,MAAM,EAAE,EAAC,KAAK,EAAC,CAAC,CAAC,CAAA;aACvD;YAED,MAAM,WAAW,GAAG,MAAM,IAAA,uBAAc,EAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;YAEpE,IAAA,sBAAa,EAAC;gBACZ,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,WAAW;gBACX,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,OAAO;gBACP,SAAS;gBACT,OAAO;aACR,CAAC,CAAA;YAEF,IAAA,uBAAc,EAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,EAAC,OAAO,EAAC,CAAC,CAAA;YAErD,OAAO,IAAA,mBAAU,EAAC,IAAA,sBAAa,EAAC,IAAI,CAAC,MAAM,EAAE,EAAC,OAAO,EAAC,CAAC,CAAC,CAAA;QAC1D,CAAC;KAAA;IAEa,aAAa;;;YACzB,8BAA8B;YAE9B,6DAA6D;YAC7D,IAAI;gBACF,IAAI,CAAC,MAAM,GAAG,MAAM,IAAA,6BAAqB,EAAC,IAAI,CAAC,MAAM,EAAE;oBACrD,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,kBAAkB,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;iBAC7C,CAAC,CAAA;aACH;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,IAAI,CAAC,UAAU,EAAE;oBACnB,MAAM,KAAK,CAAA;iBACZ;aACF;YAED,yDAAyD;YACzD,+EAA+E;YAC/E,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC9G,IAAI,CAAC,MAAM,CAAC,oBAAoB,qBAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;aAC3D;YAED,8BAA8B;YAC9B,IAAI,CAAC,MAAM,GAAG,IAAA,qBAAU,EACtB,IAAI,CAAC,MAAM,EACX,IAAA,6BAAqB,EAAC;gBACpB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;gBACnC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;gBACnC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;gBACrC,SAAS,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,4BAA4B,0CAAE,KAAK,CAAC,GAAG,CAAC;gBAC/D,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;aACzC,CAAC,CACH,CAAA;YAED,uCAAuC;YACvC,IAAI,CAAC,MAAM,CAAC,oBAAoB,GAAG,IAAA,qBAAU,EAC3C,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAChC,IAAA,6BAAqB,EAAC;gBACpB,SAAS,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,sCAAsC,0CAAE,KAAK,CAAC,GAAG,CAAC;gBACzE,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,sDAAsD;aAC7F,CAAC,CACH,CAAA;YAED,+BAA+B;YAC/B,IAAI,CAAC,MAAM,GAAG,IAAA,qBAAU,EACtB,IAAI,CAAC,MAAM,EACX,IAAA,6BAAqB,EAAC;gBACpB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;gBAC/C,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;gBAC3C,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,eAAe,EAAE,IAAI,CAAC,eAAe;gBACrC,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB,CAAC,CACH,CAAA;YAED,sCAAsC;YACtC,IAAI,CAAC,MAAM,CAAC,oBAAoB,GAAG,IAAA,qBAAU,EAC3C,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAChC,IAAA,6BAAqB,EAAC;gBACpB,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,wBAAwB,EAAE,IAAI,CAAC,wBAAwB;gBACvD,gCAAgC,EAAE,IAAI,CAAC,gCAAgC;gBACvE,SAAS,EAAE,IAAA,8BAAqB,EAAC,IAAI,CAAC,eAAe,EAAE,CAAC,GAAG,EAAE,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,GAAG,CAAC,GAAG,CAAC,CAAA,EAAA,CAAC;gBACxF,cAAc,EACZ,MAAA,MAAA,IAAI,CAAC,cAAc,mCAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,cAAc,mCAAI,IAAI,CAAC,MAAM,CAAC,cAAc;aACvG,CAAC,CACH,CAAA;YAED,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,QAAQ,EAAE;gBACzC,IAAI,CAAC,QAAS,CAAC,GAAG,CAAC,0EAA0E,CAAC,CAAA;gBAC9F,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;aACxC;YAED,IAAI,CAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;gBAChD,MAAM,IAAI,gBAAO,CACf,gBAAgB,EAChB,wCAAwC,IAAI,CAAC,SAAS,CACpD,IAAI,CAAC,MAAM,CAAC,WAAW,CACxB,gMAAgM,CAClM,CAAA;aACF;;KACF;;AAjOH,0CAkOC;AAjOe,qBAAK,GAAG,CAAC,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,AAAhC,CAAgC;AAErC,qBAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,YAAY;IACtB,WAAW,EAAE,mCAAmC;IAChD,OAAO,EAAE;;;KAGR;IACD,QAAQ,EAAE;QACR;YACE,0CAA0C;YAC1C,iFAAiF;SAClF;QACD,CAAC,oCAAoC,EAAE,0DAA0D,CAAC;QAClG;YACE,gEAAgE;YAChE,6GAA6G;SAC9G;QACD;YACE,6BAA6B;YAC7B,qGAAqG;SACtG;KACF;CACF,CAAC,AAtBiB,CAsBjB"}
|
|
@@ -28,6 +28,15 @@ const executeTests = (reporter, config, suites) => __awaiter(void 0, void 0, voi
|
|
|
28
28
|
yield tunnel.stop();
|
|
29
29
|
}
|
|
30
30
|
});
|
|
31
|
+
// If both global and defaultTestOverrides exist use defaultTestOverrides
|
|
32
|
+
// SYNTH-12989: Clean up deprecated `global` in favor of `defaultTestOverrides`
|
|
33
|
+
if (Object.keys(config.global).length !== 0) {
|
|
34
|
+
console.warn("The 'global' property is deprecated. Please use 'defaultTestOverrides' instead.\nIf both 'global' and 'defaultTestOverrides' properties exist, 'defaultTestOverrides' is used!");
|
|
35
|
+
// if config.defaultTestOverrides does not exist because executeTests was called directly, use global instead
|
|
36
|
+
if (Object.keys(config.defaultTestOverrides).length === 0) {
|
|
37
|
+
config.defaultTestOverrides = Object.assign({}, config.global);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
31
40
|
try {
|
|
32
41
|
triggerConfigs = yield (0, exports.getTriggerConfigs)(api, config, reporter, suites);
|
|
33
42
|
}
|
|
@@ -109,7 +118,7 @@ exports.executeTests = executeTests;
|
|
|
109
118
|
const getTriggerConfigs = (api, config, reporter, suites) => __awaiter(void 0, void 0, void 0, function* () {
|
|
110
119
|
var _a, _b;
|
|
111
120
|
// Grab the test config overrides from all the sources: default test config overrides, test files containing specific test config override, env variable, and CLI params
|
|
112
|
-
const defaultTestConfigOverrides = config.
|
|
121
|
+
const defaultTestConfigOverrides = config.defaultTestOverrides;
|
|
113
122
|
// TODO: Clean up locations as part of SYNTH-12989
|
|
114
123
|
const testConfigOverridesFromEnv = ((_a = config.locations) === null || _a === void 0 ? void 0 : _a.length) ? { locations: config.locations } : {};
|
|
115
124
|
const testsFromTestConfigs = yield (0, test_1.getTestConfigs)(config, reporter, suites);
|
|
@@ -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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"}
|
|
@@ -2,11 +2,7 @@
|
|
|
2
2
|
import { APIHelper } from './api';
|
|
3
3
|
import { MainReporter, RunTestsCommandConfig, Suite, Test, TriggerConfig } from './interfaces';
|
|
4
4
|
export declare const getTestConfigs: (config: RunTestsCommandConfig, reporter: MainReporter, suites?: Suite[]) => Promise<TriggerConfig[]>;
|
|
5
|
-
export declare const getTestsFromSearchQuery: (api: APIHelper, config: Pick<RunTestsCommandConfig, '
|
|
6
|
-
config: import("./interfaces").UserConfigOverride;
|
|
7
|
-
id: string;
|
|
8
|
-
suite: string;
|
|
9
|
-
}[]>;
|
|
5
|
+
export declare const getTestsFromSearchQuery: (api: APIHelper, config: Pick<RunTestsCommandConfig, 'defaultTestOverrides' | 'testSearchQuery'>) => Promise<TriggerConfig[] | []>;
|
|
10
6
|
export declare const getTest: (api: APIHelper, { id, suite }: TriggerConfig) => Promise<{
|
|
11
7
|
test: Test;
|
|
12
8
|
} | {
|
|
@@ -35,14 +35,14 @@ const getTestConfigs = (config, reporter, suites = []) => __awaiter(void 0, void
|
|
|
35
35
|
});
|
|
36
36
|
exports.getTestConfigs = getTestConfigs;
|
|
37
37
|
const getTestsFromSearchQuery = (api, config) => __awaiter(void 0, void 0, void 0, function* () {
|
|
38
|
-
const {
|
|
38
|
+
const { defaultTestOverrides, testSearchQuery } = config;
|
|
39
39
|
// Empty search queries are not allowed.
|
|
40
40
|
if (!testSearchQuery) {
|
|
41
41
|
return [];
|
|
42
42
|
}
|
|
43
43
|
const testSearchResults = yield api.searchTests(testSearchQuery);
|
|
44
44
|
return testSearchResults.tests.map((test) => ({
|
|
45
|
-
config:
|
|
45
|
+
config: defaultTestOverrides,
|
|
46
46
|
id: test.public_id,
|
|
47
47
|
suite: `Query: ${testSearchQuery}`,
|
|
48
48
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../src/commands/synthetics/test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,+BAAoF;AAEpF,2CAA2D;AAEpD,MAAM,cAAc,GAAG,CAC5B,MAA6B,EAC7B,QAAsB,EACtB,SAAkB,EAAE,EACM,EAAE;IAC5B,MAAM,eAAe,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAA,kBAAS,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;SACvG,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;SACzC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAE3C,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAA;IAE/B,MAAM,WAAW,GAAG,MAAM;SACvB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACb,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;;QAAC,OAAA,CAAC;YACjC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,EAAE,EAAE,MAAA,IAAA,0BAAiB,EAAC,IAAI,CAAC,EAAE,CAAC,mCAAI,EAAE;YACpC,KAAK,EAAE,KAAK,CAAC,IAAI;SAClB,CAAC,CAAA;KAAA,CAAC,CACJ;SACA,MAAM,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC,CAAA;IAE1D,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA,CAAA;AAtBY,QAAA,cAAc,kBAsB1B;AAEM,MAAM,uBAAuB,GAAG,CACrC,GAAc,EACd,
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../src/commands/synthetics/test.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ const getUnityRequestBuilder = (apiKey, cliVersion, site) => (0, utils_1.getRequ
|
|
|
17
17
|
apiKey,
|
|
18
18
|
baseUrl: (0, base_intake_url_1.getBaseSourcemapIntakeUrl)(site),
|
|
19
19
|
headers: new Map([
|
|
20
|
-
['DD-EVP-ORIGIN', 'datadog-
|
|
20
|
+
['DD-EVP-ORIGIN', 'datadog-ci_unity-symbols'],
|
|
21
21
|
['DD-EVP-ORIGIN-VERSION', cliVersion],
|
|
22
22
|
]),
|
|
23
23
|
overrideUrl: 'api/v2/srcmap',
|
package/package.json
CHANGED
|
@@ -1,113 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getLicensesFromComponent = exports.getLicensesFromString = void 0;
|
|
4
|
-
const types_1 = require("./types");
|
|
5
|
-
// Get the license from a string. If the license is valid, we return it. Otherwise, we return undefined
|
|
6
|
-
// List of licenses: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/licensing-a-repository
|
|
7
|
-
const getLicenseFromString = (s) => {
|
|
8
|
-
if (!s) {
|
|
9
|
-
return undefined;
|
|
10
|
-
}
|
|
11
|
-
switch (s.toLowerCase()) {
|
|
12
|
-
case '0bsd':
|
|
13
|
-
return types_1.DependencyLicense.ZEROBSD;
|
|
14
|
-
case 'apache-2.0':
|
|
15
|
-
case 'apache 2':
|
|
16
|
-
case 'apache license, version 2.0':
|
|
17
|
-
case 'the apache software license, version 2.0':
|
|
18
|
-
case 'apache license 2.0':
|
|
19
|
-
case 'apache public license 2.0':
|
|
20
|
-
case 'the apache license, version 2.0':
|
|
21
|
-
case 'apache license version 2.0':
|
|
22
|
-
return types_1.DependencyLicense.APACHE2;
|
|
23
|
-
case 'bsd-2-clause':
|
|
24
|
-
return types_1.DependencyLicense.BSD2CLAUSE;
|
|
25
|
-
case 'bsd-3-clause':
|
|
26
|
-
return types_1.DependencyLicense.BSD3CLAUSE;
|
|
27
|
-
case 'bsl-1.0':
|
|
28
|
-
return types_1.DependencyLicense.BSL1;
|
|
29
|
-
case 'cc0':
|
|
30
|
-
return types_1.DependencyLicense.CC0_1_0;
|
|
31
|
-
case 'epl 1.0':
|
|
32
|
-
case 'eclipse public license 1.0':
|
|
33
|
-
case 'eclipse public license, version 1.0':
|
|
34
|
-
return types_1.DependencyLicense.EPL1_0;
|
|
35
|
-
case 'eclipse public license - v 2.0':
|
|
36
|
-
case 'eclipse public license v2.0':
|
|
37
|
-
return types_1.DependencyLicense.EPL2_0;
|
|
38
|
-
case 'gpl v2':
|
|
39
|
-
case 'gnu general public license, version 2 (gpl2)':
|
|
40
|
-
return types_1.DependencyLicense.GPL2_0;
|
|
41
|
-
case 'gpl v3':
|
|
42
|
-
return types_1.DependencyLicense.GPL3_0;
|
|
43
|
-
case 'isc':
|
|
44
|
-
return types_1.DependencyLicense.ISC;
|
|
45
|
-
case 'mit':
|
|
46
|
-
case 'the mit license':
|
|
47
|
-
case 'mit license':
|
|
48
|
-
return types_1.DependencyLicense.MIT;
|
|
49
|
-
case 'mpl-2.0':
|
|
50
|
-
case 'mozilla public license, version 2.0':
|
|
51
|
-
return types_1.DependencyLicense.MPL_2_0;
|
|
52
|
-
case 'unlicense':
|
|
53
|
-
return types_1.DependencyLicense.UNLICENSE;
|
|
54
|
-
case 'zlib':
|
|
55
|
-
return types_1.DependencyLicense.ZLIB;
|
|
56
|
-
}
|
|
57
|
-
console.debug(`license |${s}| not recognized`);
|
|
58
|
-
return undefined;
|
|
59
|
-
};
|
|
60
|
-
// Get all the licenses from a string. Sometimes, there are two licenses in one string
|
|
61
|
-
// such as "MIT OR Apache-2.0". In this case, we return all the licenses in this condition.
|
|
62
|
-
const getLicensesFromString = (s) => {
|
|
63
|
-
if (!s) {
|
|
64
|
-
return [];
|
|
65
|
-
}
|
|
66
|
-
const licenses = [];
|
|
67
|
-
if (s.toLowerCase().includes('or')) {
|
|
68
|
-
for (const lic of s.toLowerCase().split(' or ')) {
|
|
69
|
-
const l = getLicenseFromString(lic.trim());
|
|
70
|
-
if (l) {
|
|
71
|
-
licenses.push(l);
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
else {
|
|
76
|
-
const lic = getLicenseFromString(s);
|
|
77
|
-
if (lic) {
|
|
78
|
-
licenses.push(lic);
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
return licenses;
|
|
82
|
-
};
|
|
83
|
-
exports.getLicensesFromString = getLicensesFromString;
|
|
84
|
-
// Get all the licenses of this component. We extract the "licenses" element from the SBOM component.
|
|
85
|
-
// Unfortunately, depending on the SBOM generator, the licenses are generated in a different manner.
|
|
86
|
-
// We attempt to get as much as possible.
|
|
87
|
-
const getLicensesFromComponent = (component) => {
|
|
88
|
-
var _a;
|
|
89
|
-
const elementsForLicense = ['id', 'name'];
|
|
90
|
-
const licensesSet = new Set();
|
|
91
|
-
// Get the "licenses" attribute of the SBOM component.
|
|
92
|
-
if (component['licenses']) {
|
|
93
|
-
for (const license of component['licenses']) {
|
|
94
|
-
for (const el of elementsForLicense) {
|
|
95
|
-
// Handle "license": [ {"license": {"id": <license>}} ]
|
|
96
|
-
if ((_a = license['license']) === null || _a === void 0 ? void 0 : _a[el]) {
|
|
97
|
-
for (const l of (0, exports.getLicensesFromString)(license['license'][el])) {
|
|
98
|
-
licensesSet.add(l);
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
// Handle "license": [ {"expression": "MIT"} ]
|
|
103
|
-
if (license['expression']) {
|
|
104
|
-
for (const l of (0, exports.getLicensesFromString)(license['expression'])) {
|
|
105
|
-
licensesSet.add(l);
|
|
106
|
-
}
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
return Array.from(licensesSet);
|
|
111
|
-
};
|
|
112
|
-
exports.getLicensesFromComponent = getLicensesFromComponent;
|
|
113
|
-
//# sourceMappingURL=license.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"license.js","sourceRoot":"","sources":["../../../src/commands/sbom/license.ts"],"names":[],"mappings":"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"}
|