@datadog/datadog-ci 2.38.1 → 2.40.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/commands/deployment/constants.d.ts +1 -1
- package/dist/commands/deployment/constants.js +1 -1
- package/dist/commands/deployment/constants.js.map +1 -1
- package/dist/commands/gate/api.js +1 -0
- package/dist/commands/gate/api.js.map +1 -1
- package/dist/commands/gate/evaluate.d.ts +1 -0
- package/dist/commands/gate/evaluate.js +17 -4
- package/dist/commands/gate/evaluate.js.map +1 -1
- package/dist/commands/gate/interfaces.d.ts +3 -2
- package/dist/commands/measure/measure.js +0 -5
- package/dist/commands/measure/measure.js.map +1 -1
- package/dist/commands/synthetics/batch.d.ts +1 -1
- package/dist/commands/synthetics/batch.js +14 -10
- package/dist/commands/synthetics/batch.js.map +1 -1
- package/dist/commands/synthetics/compatibility.d.ts +6 -4
- package/dist/commands/synthetics/compatibility.js +37 -10
- package/dist/commands/synthetics/compatibility.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +16 -5
- package/dist/commands/synthetics/interfaces.js.map +1 -1
- package/dist/commands/synthetics/mobile.js +1 -1
- package/dist/commands/synthetics/mobile.js.map +1 -1
- package/dist/commands/synthetics/reporters/default.js +17 -2
- package/dist/commands/synthetics/reporters/default.js.map +1 -1
- package/dist/commands/synthetics/run-tests-command.d.ts +6 -0
- package/dist/commands/synthetics/run-tests-command.js +53 -17
- package/dist/commands/synthetics/run-tests-command.js.map +1 -1
- package/dist/commands/synthetics/run-tests-lib.js +20 -6
- package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
- package/dist/commands/synthetics/test.js +1 -0
- package/dist/commands/synthetics/test.js.map +1 -1
- package/dist/commands/synthetics/utils/internal.d.ts +13 -3
- package/dist/commands/synthetics/utils/internal.js +24 -16
- package/dist/commands/synthetics/utils/internal.js.map +1 -1
- package/dist/commands/synthetics/utils/public.d.ts +1 -1
- package/dist/commands/synthetics/utils/public.js +26 -5
- package/dist/commands/synthetics/utils/public.js.map +1 -1
- package/dist/commands/tag/tag.js +0 -5
- package/dist/commands/tag/tag.js.map +1 -1
- package/dist/commands/trace/api.d.ts +2 -2
- package/dist/commands/trace/api.js +7 -9
- package/dist/commands/trace/api.js.map +1 -1
- package/dist/commands/trace/interfaces.d.ts +7 -13
- package/dist/commands/trace/interfaces.js +11 -4
- package/dist/commands/trace/interfaces.js.map +1 -1
- package/dist/commands/trace/trace.d.ts +2 -3
- package/dist/commands/trace/trace.js +50 -98
- package/dist/commands/trace/trace.js.map +1 -1
- package/dist/commands/unity-symbols/interfaces.d.ts +3 -0
- package/dist/commands/unity-symbols/interfaces.js +3 -1
- package/dist/commands/unity-symbols/interfaces.js.map +1 -1
- package/dist/commands/unity-symbols/renderer.d.ts +3 -0
- package/dist/commands/unity-symbols/renderer.js +9 -3
- package/dist/commands/unity-symbols/renderer.js.map +1 -1
- package/dist/commands/unity-symbols/upload.d.ts +4 -0
- package/dist/commands/unity-symbols/upload.js +115 -7
- package/dist/commands/unity-symbols/upload.js.map +1 -1
- package/dist/helpers/ci.d.ts +4 -1
- package/dist/helpers/ci.js +63 -13
- package/dist/helpers/ci.js.map +1 -1
- package/dist/helpers/interfaces.d.ts +2 -2
- package/dist/helpers/tags.d.ts +2 -0
- package/dist/helpers/tags.js +3 -1
- package/dist/helpers/tags.js.map +1 -1
- package/dist/helpers/utils.d.ts +1 -0
- package/dist/helpers/utils.js +14 -1
- package/dist/helpers/utils.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -137,7 +137,7 @@ curl -L --fail "https://github.com/DataDog/datadog-ci/releases/latest/download/d
|
|
|
137
137
|
#### Windows
|
|
138
138
|
|
|
139
139
|
```sh
|
|
140
|
-
Invoke-WebRequest -Uri "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_win-x64
|
|
140
|
+
Invoke-WebRequest -Uri "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_win-x64" -OutFile "datadog-ci.exe"
|
|
141
141
|
```
|
|
142
142
|
|
|
143
143
|
Then, you can run `datadog-ci` commands normally:
|
|
@@ -5,4 +5,4 @@ export declare const REVISION_TAG: string;
|
|
|
5
5
|
export declare const SERVICE_TAG: string;
|
|
6
6
|
export declare const IS_ROLLBACK_TAG: string;
|
|
7
7
|
export declare const CUSTOM_TAGS_TAG: string;
|
|
8
|
-
export declare const CONTAINS_DEPLOYMENT_TAG = "ci.contains_deployment:true";
|
|
8
|
+
export declare const CONTAINS_DEPLOYMENT_TAG = "ci.pipeline.contains_deployment:true";
|
|
@@ -8,5 +8,5 @@ exports.REVISION_TAG = exports.CD_VIS_PREFIX + 'revision:';
|
|
|
8
8
|
exports.SERVICE_TAG = exports.CD_VIS_PREFIX + 'service:';
|
|
9
9
|
exports.IS_ROLLBACK_TAG = exports.CD_VIS_PREFIX + 'is_rollback:true';
|
|
10
10
|
exports.CUSTOM_TAGS_TAG = exports.CD_VIS_PREFIX + 'custom_tags:';
|
|
11
|
-
exports.CONTAINS_DEPLOYMENT_TAG = 'ci.contains_deployment:true';
|
|
11
|
+
exports.CONTAINS_DEPLOYMENT_TAG = 'ci.pipeline.contains_deployment:true';
|
|
12
12
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/commands/deployment/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAG,wBAAwB,CAAA;AACxC,QAAA,iBAAiB,GAAG,qBAAa,GAAG,oBAAoB,CAAA;AACxD,QAAA,OAAO,GAAG,qBAAa,GAAG,MAAM,CAAA;AAChC,QAAA,YAAY,GAAG,qBAAa,GAAG,WAAW,CAAA;AAC1C,QAAA,WAAW,GAAG,qBAAa,GAAG,UAAU,CAAA;AACxC,QAAA,eAAe,GAAG,qBAAa,GAAG,kBAAkB,CAAA;AACpD,QAAA,eAAe,GAAG,qBAAa,GAAG,cAAc,CAAA;AAChD,QAAA,uBAAuB,GAAG,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/commands/deployment/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAG,wBAAwB,CAAA;AACxC,QAAA,iBAAiB,GAAG,qBAAa,GAAG,oBAAoB,CAAA;AACxD,QAAA,OAAO,GAAG,qBAAa,GAAG,MAAM,CAAA;AAChC,QAAA,YAAY,GAAG,qBAAa,GAAG,WAAW,CAAA;AAC1C,QAAA,WAAW,GAAG,qBAAa,GAAG,UAAU,CAAA;AACxC,QAAA,eAAe,GAAG,qBAAa,GAAG,kBAAkB,CAAA;AACpD,QAAA,eAAe,GAAG,qBAAa,GAAG,cAAc,CAAA;AAChD,QAAA,uBAAuB,GAAG,sCAAsC,CAAA"}
|
|
@@ -24,6 +24,7 @@ const evaluateGateRules = (request) => (evaluateRequest, write) => __awaiter(voi
|
|
|
24
24
|
no_wait: evaluateRequest.options.noWait,
|
|
25
25
|
dry_run: evaluateRequest.options.dryRun,
|
|
26
26
|
is_last_retry: evaluateRequest.options.isLastRetry,
|
|
27
|
+
pull_request_sha: evaluateRequest.options.pull_request_sha,
|
|
27
28
|
},
|
|
28
29
|
},
|
|
29
30
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/gate/api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAIA,+CAAqD;AAI9C,MAAM,iBAAiB,GAAG,CAC/B,OAA8E,EAC9E,EAAE,CAAC,CAAO,eAAwB,EAAE,KAAwB,EAAE,EAAE;IAChE,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;QAC7B,IAAI,EAAE;YACJ,EAAE,EAAE,eAAe,CAAC,SAAS;YAC7B,IAAI,EAAE,iBAAiB;YACvB,UAAU,EAAE;gBACV,IAAI,EAAE,eAAe,CAAC,QAAQ;gBAC9B,UAAU,EAAE,eAAe,CAAC,SAAS;gBACrC,aAAa,EAAE,eAAe,CAAC,WAAW;gBAC1C,OAAO,EAAE;oBACP,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,MAAM;oBACvC,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,MAAM;oBACvC,aAAa,EAAE,eAAe,CAAC,OAAO,CAAC,WAAW;
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/gate/api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAIA,+CAAqD;AAI9C,MAAM,iBAAiB,GAAG,CAC/B,OAA8E,EAC9E,EAAE,CAAC,CAAO,eAAwB,EAAE,KAAwB,EAAE,EAAE;IAChE,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;QAC7B,IAAI,EAAE;YACJ,EAAE,EAAE,eAAe,CAAC,SAAS;YAC7B,IAAI,EAAE,iBAAiB;YACvB,UAAU,EAAE;gBACV,IAAI,EAAE,eAAe,CAAC,QAAQ;gBAC9B,UAAU,EAAE,eAAe,CAAC,SAAS;gBACrC,aAAa,EAAE,eAAe,CAAC,WAAW;gBAC1C,OAAO,EAAE;oBACP,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,MAAM;oBACvC,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,MAAM;oBACvC,aAAa,EAAE,eAAe,CAAC,OAAO,CAAC,WAAW;oBAClD,gBAAgB,EAAE,eAAe,CAAC,OAAO,CAAC,gBAAgB;iBAC3D;aACF;SACF;KACF,CAAC,CAAA;IAEF,OAAO,OAAO,CAAC;QACb,IAAI,EAAE,OAAO;QACb,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;SACnC;QACD,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,gCAAgC;KACtC,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;AA7BY,QAAA,iBAAiB,qBA6B7B;AAEM,MAAM,cAAc,GAAG,CAAC,aAAqB,EAAE,MAAc,EAAE,MAAc,EAAE,EAAE;IACtF,MAAM,cAAc,GAAG,IAAA,yBAAiB,EAAC,EAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC,CAAA;IAElF,OAAO;QACL,iBAAiB,EAAE,IAAA,yBAAiB,EAAC,cAAc,CAAC;KACrD,CAAA;AACH,CAAC,CAAA;AANY,QAAA,cAAc,kBAM1B"}
|
|
@@ -41,6 +41,7 @@ const clipanion_1 = require("clipanion");
|
|
|
41
41
|
const uuid_1 = require("uuid");
|
|
42
42
|
const ci_1 = require("../../helpers/ci");
|
|
43
43
|
const format_git_span_data_1 = require("../../helpers/git/format-git-span-data");
|
|
44
|
+
const logger_1 = require("../../helpers/logger");
|
|
44
45
|
const retry_1 = require("../../helpers/retry");
|
|
45
46
|
const tags_1 = require("../../helpers/tags");
|
|
46
47
|
const user_provided_git_1 = require("../../helpers/user-provided-git");
|
|
@@ -63,6 +64,7 @@ class GateEvaluateCommand extends clipanion_1.Command {
|
|
|
63
64
|
});
|
|
64
65
|
this.userScope = clipanion_1.Option.Array('--scope');
|
|
65
66
|
this.tags = clipanion_1.Option.Array('--tags');
|
|
67
|
+
this.logger = new logger_1.Logger((s) => this.context.stdout.write(s), logger_1.LogLevel.INFO);
|
|
66
68
|
this.config = {
|
|
67
69
|
apiKey: process.env.DD_API_KEY,
|
|
68
70
|
appKey: process.env.DD_APP_KEY,
|
|
@@ -71,8 +73,22 @@ class GateEvaluateCommand extends clipanion_1.Command {
|
|
|
71
73
|
}
|
|
72
74
|
execute() {
|
|
73
75
|
return __awaiter(this, void 0, void 0, function* () {
|
|
76
|
+
const options = {
|
|
77
|
+
dryRun: this.dryRun,
|
|
78
|
+
noWait: this.noWait,
|
|
79
|
+
};
|
|
74
80
|
const api = this.getApiHelper();
|
|
75
81
|
const spanTags = yield this.getSpanTags();
|
|
82
|
+
const headRef = spanTags[tags_1.GIT_BASE_REF];
|
|
83
|
+
if (headRef) {
|
|
84
|
+
const headSha = spanTags[tags_1.GIT_HEAD_SHA];
|
|
85
|
+
if (headSha) {
|
|
86
|
+
options.pull_request_sha = headSha;
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
this.logger.warn('Detected a pull request run but HEAD commit SHA could not be extracted.');
|
|
90
|
+
}
|
|
91
|
+
}
|
|
76
92
|
const userScope = this.userScope ? (0, utils_1.parseScope)(this.userScope) : {};
|
|
77
93
|
const startTimeMs = new Date().getTime();
|
|
78
94
|
const payload = {
|
|
@@ -80,10 +96,7 @@ class GateEvaluateCommand extends clipanion_1.Command {
|
|
|
80
96
|
spanTags,
|
|
81
97
|
userScope,
|
|
82
98
|
startTimeMs,
|
|
83
|
-
options
|
|
84
|
-
dryRun: this.dryRun,
|
|
85
|
-
noWait: this.noWait,
|
|
86
|
-
},
|
|
99
|
+
options,
|
|
87
100
|
};
|
|
88
101
|
return this.evaluateRules(api, payload);
|
|
89
102
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../../src/commands/gate/evaluate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../../src/commands/gate/evaluate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { Writable } from 'stream';
|
|
3
2
|
import type { AxiosPromise } from 'axios';
|
|
4
|
-
import {
|
|
3
|
+
import type { Writable } from 'stream';
|
|
4
|
+
import type { SpanTags } from '../../helpers/interfaces';
|
|
5
5
|
export interface Payload {
|
|
6
6
|
requestId: string;
|
|
7
7
|
startTimeMs: number;
|
|
@@ -13,6 +13,7 @@ export interface PayloadOptions {
|
|
|
13
13
|
dryRun: boolean;
|
|
14
14
|
noWait: boolean;
|
|
15
15
|
isLastRetry?: boolean;
|
|
16
|
+
pull_request_sha?: string;
|
|
16
17
|
}
|
|
17
18
|
export interface EvaluationResponsePayload {
|
|
18
19
|
data: {
|
|
@@ -61,11 +61,6 @@ class MeasureCommand extends clipanion_1.Command {
|
|
|
61
61
|
try {
|
|
62
62
|
const measures = (0, exports.parseMeasures)(rawMeasures);
|
|
63
63
|
const { provider, ciEnv } = (0, ci_1.getCIEnv)();
|
|
64
|
-
// For Buddy only the pipeline level is supported as there is no way to identify the job from the runner.
|
|
65
|
-
if (provider === 'buddy' && this.level === 'job') {
|
|
66
|
-
this.context.stderr.write(`${chalk_1.default.red.bold('[ERROR]')} Cannot use level "job" for ${ci_1.PROVIDER_TO_DISPLAY_NAME[provider]}.`);
|
|
67
|
-
return 1;
|
|
68
|
-
}
|
|
69
64
|
const exitStatus = yield this.sendMeasures(ciEnv, this.level === 'pipeline' ? 0 : 1, provider, measures);
|
|
70
65
|
if (exitStatus !== 0 && this.noFail) {
|
|
71
66
|
this.context.stderr.write(`${chalk_1.default.yellow.bold('[WARNING]')} sending measures failed but continuing due to --no-fail\n`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"measure.js","sourceRoot":"","sources":["../../../src/commands/measure/measure.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,kDAAyB;AACzB,yCAAyC;AAEzC,yCAAmE;AACnE,+CAAgD;AAChD,+CAAwE;AAEjE,MAAM,aAAa,GAAG,CAAC,QAAkB,EAAE,EAAE,CAClD,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;IAChC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,oCAAoC,QAAQ,GAAG,CAAC,CAAA;KACjE;IAED,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IAC3C,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;IAClC,IAAI,KAAK,CAAC,QAAQ,CAAC,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;KACxC;IAED,uCACK,GAAG,KACN,CAAC,GAAG,CAAC,EAAE,QAAQ,IAChB;AACH,CAAC,EAAE,EAAE,CAAC,CAAA;AAhBK,QAAA,aAAa,iBAgBlB;AAER,MAAa,cAAe,SAAQ,mBAAO;IAA3C;;QAmBU,UAAK,GAAG,kBAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAChC,YAAO,GAAG,kBAAM,CAAC,KAAK,CAAC,WAAW,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAA;QACnD,aAAQ,GAAG,kBAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QACrC,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAEpC,WAAM,GAAG;YACf,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU;SAC9D,CAAA;
|
|
1
|
+
{"version":3,"file":"measure.js","sourceRoot":"","sources":["../../../src/commands/measure/measure.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { APIHelper } from './api';
|
|
2
2
|
import { MainReporter, Result, ResultDisplayInfo } from './interfaces';
|
|
3
|
-
export declare const waitForBatchToFinish: (api: APIHelper, batchId: string,
|
|
3
|
+
export declare const waitForBatchToFinish: (api: APIHelper, batchId: string, batchTimeout: number, resultDisplayInfo: ResultDisplayInfo, reporter: MainReporter) => Promise<Result[]>;
|
|
@@ -19,9 +19,9 @@ const errors_1 = require("./errors");
|
|
|
19
19
|
const internal_1 = require("./utils/internal");
|
|
20
20
|
const public_1 = require("./utils/public");
|
|
21
21
|
const POLLING_INTERVAL = 5000; // In ms
|
|
22
|
-
const waitForBatchToFinish = (api, batchId,
|
|
23
|
-
const safeDeadline = Date.now() +
|
|
24
|
-
const
|
|
22
|
+
const waitForBatchToFinish = (api, batchId, batchTimeout, resultDisplayInfo, reporter) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23
|
+
const safeDeadline = Date.now() + batchTimeout + 3 * POLLING_INTERVAL;
|
|
24
|
+
const emittedResultIds = new Set();
|
|
25
25
|
let oldIncompleteResultIds = new Set();
|
|
26
26
|
while (true) {
|
|
27
27
|
const batch = yield getBatch(api, batchId);
|
|
@@ -29,10 +29,10 @@ const waitForBatchToFinish = (api, batchId, maxPollingTimeout, resultDisplayInfo
|
|
|
29
29
|
// The backend is expected to handle the time out of the batch by eventually changing its status to `failed`.
|
|
30
30
|
// But `safeDeadlineReached` is a safety in case it fails to do that on time.
|
|
31
31
|
const shouldContinuePolling = batch.status === 'in_progress' && !safeDeadlineReached;
|
|
32
|
-
const newlyReceivedResults = reportReceivedResults(batch,
|
|
32
|
+
const newlyReceivedResults = reportReceivedResults(batch, emittedResultIds, reporter);
|
|
33
33
|
const resultIdsToFetch = getResultIdsToFetch(shouldContinuePolling, batch, newlyReceivedResults, oldIncompleteResultIds);
|
|
34
34
|
const { pollResultMap, incompleteResultIds } = yield getPollResultMap(api, resultIdsToFetch);
|
|
35
|
-
const resultsToReport = getResultsToReport(shouldContinuePolling, batch, newlyReceivedResults,
|
|
35
|
+
const resultsToReport = getResultsToReport(shouldContinuePolling, batch, newlyReceivedResults, emittedResultIds, oldIncompleteResultIds, incompleteResultIds, reporter);
|
|
36
36
|
reportResults(batchId, resultsToReport, pollResultMap, resultDisplayInfo, safeDeadlineReached, reporter);
|
|
37
37
|
oldIncompleteResultIds = incompleteResultIds;
|
|
38
38
|
if (safeDeadlineReached) {
|
|
@@ -53,7 +53,7 @@ const getResultIdsToFetch = (shouldContinuePolling, batch, newlyReceivedResults,
|
|
|
53
53
|
}
|
|
54
54
|
return getResultIds(newlyReceivedResults).concat(...oldIncompleteResultIds);
|
|
55
55
|
};
|
|
56
|
-
const getResultsToReport = (shouldContinuePolling, batch, newlyReceivedResults,
|
|
56
|
+
const getResultsToReport = (shouldContinuePolling, batch, newlyReceivedResults, emittedResultIds, oldIncompleteResultIds, incompleteResultIds, reporter) => {
|
|
57
57
|
const newlyCompleteResults = excludeSkipped(batch.results).filter((r) => oldIncompleteResultIds.has(r.result_id) && !incompleteResultIds.has(r.result_id));
|
|
58
58
|
const resultsToReport = newlyReceivedResults
|
|
59
59
|
.filter((r) => (0, internal_1.isResultInBatchSkippedBySelectiveRerun)(r) || !incompleteResultIds.has(r.result_id))
|
|
@@ -64,7 +64,7 @@ const getResultsToReport = (shouldContinuePolling, batch, newlyReceivedResults,
|
|
|
64
64
|
// Residual results are either:
|
|
65
65
|
// - Still in progress (from the batch POV): they were never emitted.
|
|
66
66
|
// - Or still incomplete (from the poll results POV): report them with their incomplete data and a warning.
|
|
67
|
-
const residualResults = excludeSkipped(batch.results).filter((r
|
|
67
|
+
const residualResults = excludeSkipped(batch.results).filter((r) => !emittedResultIds.has(r.result_id) || incompleteResultIds.has(r.result_id));
|
|
68
68
|
const errors = [];
|
|
69
69
|
for (const result of residualResults) {
|
|
70
70
|
if (!result.timed_out) {
|
|
@@ -76,11 +76,14 @@ const getResultsToReport = (shouldContinuePolling, batch, newlyReceivedResults,
|
|
|
76
76
|
}
|
|
77
77
|
return resultsToReport.concat(residualResults);
|
|
78
78
|
};
|
|
79
|
-
const reportReceivedResults = (batch,
|
|
79
|
+
const reportReceivedResults = (batch, emittedResultIds, reporter) => {
|
|
80
80
|
const receivedResults = [];
|
|
81
81
|
for (const [index, result] of batch.results.entries()) {
|
|
82
|
-
|
|
83
|
-
|
|
82
|
+
// Skipped results aren't reported in detail in the terminal output, but they are still reported by `resultReceived()`.
|
|
83
|
+
const resultId = result.status === 'skipped' ? `skipped-${index}` : result.result_id;
|
|
84
|
+
// The result is reported if it has a final status, or if it's a non-final result.
|
|
85
|
+
if ((result.status !== 'in_progress' || (0, internal_1.hasRetries)(result)) && !emittedResultIds.has(resultId)) {
|
|
86
|
+
emittedResultIds.add(resultId);
|
|
84
87
|
reporter.resultReceived(result);
|
|
85
88
|
receivedResults.push(result);
|
|
86
89
|
}
|
|
@@ -148,6 +151,7 @@ const getResultFromBatch = (resultInBatch, pollResultMap, resultDisplayInfo, saf
|
|
|
148
151
|
passed: (0, public_1.hasResultPassed)(pollResult.result, hasTimedOut, (_b = options.failOnCriticalErrors) !== null && _b !== void 0 ? _b : false, (_c = options.failOnTimeout) !== null && _c !== void 0 ? _c : false),
|
|
149
152
|
result: pollResult.result,
|
|
150
153
|
resultId: (0, internal_1.getResultIdOrLinkedResultId)(resultInBatch),
|
|
154
|
+
retries: resultInBatch.retries || 0,
|
|
151
155
|
selectiveRerun: resultInBatch.selective_rerun,
|
|
152
156
|
test: (0, deep_extend_1.default)({}, test, pollResult.check),
|
|
153
157
|
timedOut: hasTimedOut,
|
|
@@ -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,5 +1,7 @@
|
|
|
1
1
|
import { MainReporter, RunTestsCommandConfig, Suite, UserConfigOverride } from './interfaces';
|
|
2
|
-
export declare const replaceGlobalWithDefaultTestOverrides: (config: RunTestsCommandConfig, reporter
|
|
3
|
-
export declare const replaceConfigWithTestOverrides: (config
|
|
4
|
-
export declare const
|
|
5
|
-
export declare const
|
|
2
|
+
export declare const replaceGlobalWithDefaultTestOverrides: (config: RunTestsCommandConfig, reporter: MainReporter, warnDeprecatedGlobal?: boolean) => RunTestsCommandConfig;
|
|
3
|
+
export declare const replaceConfigWithTestOverrides: (config: UserConfigOverride | undefined, testOverrides: UserConfigOverride | undefined) => UserConfigOverride;
|
|
4
|
+
export declare const replacePollingTimeoutWithBatchTimeout: (config: RunTestsCommandConfig, reporter: MainReporter, warnDeprecatedPollingTimeout?: boolean, batchTimeoutCliParam?: number, pollingTimeoutCliParam?: number) => number | undefined;
|
|
5
|
+
export declare const warnIfDeprecatedConfigUsed: (suites: Suite[], reporter: MainReporter) => void;
|
|
6
|
+
export declare const warnIfDeprecatedPollingTimeoutUsed: (suites: Suite[], reporter: MainReporter) => void;
|
|
7
|
+
export declare const moveLocationsToTestOverrides: (config: RunTestsCommandConfig, reporter: MainReporter, warnDeprecatedLocations?: boolean) => RunTestsCommandConfig;
|
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.moveLocationsToTestOverrides = exports.warnIfDeprecatedConfigUsed = exports.replaceConfigWithTestOverrides = exports.replaceGlobalWithDefaultTestOverrides = void 0;
|
|
3
|
+
exports.moveLocationsToTestOverrides = exports.warnIfDeprecatedPollingTimeoutUsed = exports.warnIfDeprecatedConfigUsed = exports.replacePollingTimeoutWithBatchTimeout = exports.replaceConfigWithTestOverrides = exports.replaceGlobalWithDefaultTestOverrides = void 0;
|
|
4
|
+
const run_tests_command_1 = require("./run-tests-command");
|
|
4
5
|
const replaceGlobalWithDefaultTestOverrides = (config, reporter, warnDeprecatedGlobal = false) => {
|
|
5
6
|
var _a, _b;
|
|
6
7
|
// The user is able to put both if they don't use the library in TS or use configuration files.
|
|
7
8
|
const isGlobalUsed = Object.keys((_a = config.global) !== null && _a !== void 0 ? _a : {}).length !== 0;
|
|
8
9
|
const isDefaultTestOverridesUsed = Object.keys((_b = config.defaultTestOverrides) !== null && _b !== void 0 ? _b : {}).length !== 0;
|
|
9
10
|
if (isGlobalUsed && warnDeprecatedGlobal) {
|
|
10
|
-
reporter
|
|
11
|
+
reporter.error("The 'global' property is deprecated. Please use 'defaultTestOverrides' instead.\nIf both 'global' and 'defaultTestOverrides' properties exist, 'defaultTestOverrides' is used!\n");
|
|
11
12
|
}
|
|
12
|
-
// If
|
|
13
|
-
if (
|
|
13
|
+
// If the user hasn't migrated and is still using `global`, use `global`
|
|
14
|
+
if (!isDefaultTestOverridesUsed && isGlobalUsed) {
|
|
14
15
|
return Object.assign(Object.assign({}, config), { defaultTestOverrides: Object.assign({}, config.global) });
|
|
15
16
|
}
|
|
16
17
|
return config;
|
|
@@ -19,30 +20,56 @@ exports.replaceGlobalWithDefaultTestOverrides = replaceGlobalWithDefaultTestOver
|
|
|
19
20
|
const replaceConfigWithTestOverrides = (config, testOverrides) => {
|
|
20
21
|
const isConfigUsed = Object.keys(config !== null && config !== void 0 ? config : {}).length !== 0;
|
|
21
22
|
const isTestOverridesUsed = Object.keys(testOverrides !== null && testOverrides !== void 0 ? testOverrides : {}).length !== 0;
|
|
22
|
-
// If
|
|
23
|
-
if (
|
|
23
|
+
// If the user hasn't migrated and is still using `config` in test files, use `config`
|
|
24
|
+
if (!isTestOverridesUsed && isConfigUsed) {
|
|
24
25
|
return config !== null && config !== void 0 ? config : {};
|
|
25
26
|
}
|
|
26
27
|
return testOverrides !== null && testOverrides !== void 0 ? testOverrides : {};
|
|
27
28
|
};
|
|
28
29
|
exports.replaceConfigWithTestOverrides = replaceConfigWithTestOverrides;
|
|
30
|
+
const replacePollingTimeoutWithBatchTimeout = (config, reporter, warnDeprecatedPollingTimeout = false, batchTimeoutCliParam, pollingTimeoutCliParam) => {
|
|
31
|
+
var _a, _b;
|
|
32
|
+
// At this point, `global` should already have been moved to `defaultTestOverrides`
|
|
33
|
+
const pollingTimeout = (_b = pollingTimeoutCliParam !== null && pollingTimeoutCliParam !== void 0 ? pollingTimeoutCliParam : (_a = config.defaultTestOverrides) === null || _a === void 0 ? void 0 : _a.pollingTimeout) !== null && _b !== void 0 ? _b : config.pollingTimeout;
|
|
34
|
+
const isPollingTimeoutUsed = pollingTimeout !== undefined && pollingTimeout !== run_tests_command_1.DEFAULT_POLLING_TIMEOUT;
|
|
35
|
+
if (isPollingTimeoutUsed && warnDeprecatedPollingTimeout) {
|
|
36
|
+
reporter.error("The 'pollingTimeout' property is deprecated. Please use 'batchTimeout' instead.\nIf both 'pollingTimeout' and 'batchTimeout' properties exist, 'batchTimeout' is used!\n");
|
|
37
|
+
}
|
|
38
|
+
const batchTimeout = batchTimeoutCliParam !== null && batchTimeoutCliParam !== void 0 ? batchTimeoutCliParam : config.batchTimeout;
|
|
39
|
+
const isBatchTimeoutUsed = batchTimeout !== run_tests_command_1.DEFAULT_BATCH_TIMEOUT;
|
|
40
|
+
// If the user hasn't migrated and is still using `pollingTimeout`, use `pollingTimeout`
|
|
41
|
+
if (!isBatchTimeoutUsed && isPollingTimeoutUsed) {
|
|
42
|
+
return pollingTimeout;
|
|
43
|
+
}
|
|
44
|
+
return batchTimeout;
|
|
45
|
+
};
|
|
46
|
+
exports.replacePollingTimeoutWithBatchTimeout = replacePollingTimeoutWithBatchTimeout;
|
|
29
47
|
const warnIfDeprecatedConfigUsed = (suites, reporter) => {
|
|
30
48
|
// TODO SYNTH-12989: Clean up deprecated `config` in favor of `testOverrides`
|
|
31
49
|
const isUsingConfig = suites.some((suite) => suite.content.tests.some((test) => { var _a; return Object.keys((_a = test.config) !== null && _a !== void 0 ? _a : {}).length > 0; }));
|
|
32
50
|
if (isUsingConfig) {
|
|
33
|
-
reporter
|
|
51
|
+
reporter.error("The 'config' property is deprecated. Please use 'testOverrides' instead.\nIf both 'config' and 'testOverrides' properties exist, 'testOverrides' is used!\n");
|
|
34
52
|
}
|
|
35
53
|
};
|
|
36
54
|
exports.warnIfDeprecatedConfigUsed = warnIfDeprecatedConfigUsed;
|
|
55
|
+
const warnIfDeprecatedPollingTimeoutUsed = (suites, reporter) => {
|
|
56
|
+
// TODO SYNTH-12989: Clean up deprecated `pollingTimeout` in favor of `batchTimeout`
|
|
57
|
+
const isUsingPollingTimeout = suites.some((suite) => suite.content.tests.some((test) => { var _a, _b; return ((_a = test.config) === null || _a === void 0 ? void 0 : _a.pollingTimeout) !== undefined || ((_b = test.testOverrides) === null || _b === void 0 ? void 0 : _b.pollingTimeout) !== undefined; }));
|
|
58
|
+
if (isUsingPollingTimeout) {
|
|
59
|
+
reporter.error("The 'pollingTimeout' property is deprecated. Please use 'batchTimeout' in the global configuration file or '--batchTimeout' instead.\nIf both 'pollingTimeout' and 'batchTimeout' properties exist, 'batchTimeout' is used!\n");
|
|
60
|
+
}
|
|
61
|
+
};
|
|
62
|
+
exports.warnIfDeprecatedPollingTimeoutUsed = warnIfDeprecatedPollingTimeoutUsed;
|
|
37
63
|
const moveLocationsToTestOverrides = (config, reporter, warnDeprecatedLocations = false) => {
|
|
38
64
|
var _a, _b, _c;
|
|
39
65
|
const isLocationsUsedInRoot = ((_a = config.locations) !== null && _a !== void 0 ? _a : []).length !== 0;
|
|
66
|
+
// At this point, `global` should already have been moved to `defaultTestOverrides`
|
|
40
67
|
const isLocationsUsedInDefaultTestOverrides = ((_c = (_b = config.defaultTestOverrides) === null || _b === void 0 ? void 0 : _b.locations) !== null && _c !== void 0 ? _c : []).length !== 0;
|
|
41
68
|
if (isLocationsUsedInRoot && warnDeprecatedLocations) {
|
|
42
|
-
reporter
|
|
69
|
+
reporter.error("The 'locations' property should not be used at the root level of the global configuration file. Please put it in 'defaultTestOverrides' instead.\n If 'locations' exists in both places, only the one in 'defaultTestOverrides' is used!\n");
|
|
43
70
|
}
|
|
44
|
-
// If
|
|
45
|
-
if (
|
|
71
|
+
// If the user hasn't migrated and is still using `locations` at the root level, move it in the `defaultTestOverrides`
|
|
72
|
+
if (!isLocationsUsedInDefaultTestOverrides && isLocationsUsedInRoot) {
|
|
46
73
|
return Object.assign(Object.assign({}, config), { defaultTestOverrides: Object.assign(Object.assign({}, config.defaultTestOverrides), { locations: config.locations }) });
|
|
47
74
|
}
|
|
48
75
|
return config;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compatibility.js","sourceRoot":"","sources":["../../../src/commands/synthetics/compatibility.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"compatibility.js","sourceRoot":"","sources":["../../../src/commands/synthetics/compatibility.ts"],"names":[],"mappings":"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"}
|
|
@@ -83,10 +83,10 @@ export type PollResultMap = {
|
|
|
83
83
|
export type ResultDisplayInfo = {
|
|
84
84
|
getLocation: (datacenterId: string, test: Test) => string;
|
|
85
85
|
options: {
|
|
86
|
+
batchTimeout: number;
|
|
86
87
|
datadogSite: string;
|
|
87
88
|
failOnCriticalErrors?: boolean;
|
|
88
89
|
failOnTimeout?: boolean;
|
|
89
|
-
maxPollingTimeout: number;
|
|
90
90
|
subdomain: string;
|
|
91
91
|
};
|
|
92
92
|
tests: Test[];
|
|
@@ -115,12 +115,13 @@ export interface BaseResult {
|
|
|
115
115
|
passed: boolean;
|
|
116
116
|
result: ServerResult;
|
|
117
117
|
resultId: string;
|
|
118
|
+
retries: number;
|
|
118
119
|
selectiveRerun?: SelectiveRerunDecision;
|
|
119
120
|
test: Test;
|
|
120
121
|
timedOut: boolean;
|
|
121
122
|
timestamp: number;
|
|
122
123
|
}
|
|
123
|
-
export type ResultSkippedBySelectiveRerun = Omit<BaseResult, 'location' | 'result' | 'timestamp'> & {
|
|
124
|
+
export type ResultSkippedBySelectiveRerun = Omit<BaseResult, 'location' | 'result' | 'retries' | 'timestamp'> & {
|
|
124
125
|
executionRule: ExecutionRule.SKIPPED;
|
|
125
126
|
selectiveRerun: Extract<SelectiveRerunDecision, {
|
|
126
127
|
decision: 'skip';
|
|
@@ -132,6 +133,7 @@ export interface BaseResultInBatch {
|
|
|
132
133
|
execution_rule: ExecutionRule;
|
|
133
134
|
location: string;
|
|
134
135
|
result_id: string;
|
|
136
|
+
retries: number | null;
|
|
135
137
|
selective_rerun?: SelectiveRerunDecision;
|
|
136
138
|
status: Status;
|
|
137
139
|
test_public_id: string;
|
|
@@ -222,6 +224,9 @@ export interface ServerTest {
|
|
|
222
224
|
min_location_failed: number;
|
|
223
225
|
mobileApplication?: MobileApplication;
|
|
224
226
|
tick_every: number;
|
|
227
|
+
retry?: {
|
|
228
|
+
count?: number;
|
|
229
|
+
};
|
|
225
230
|
};
|
|
226
231
|
overall_state: number;
|
|
227
232
|
overall_state_modified: string;
|
|
@@ -283,6 +288,7 @@ export interface LocationsMapping {
|
|
|
283
288
|
export interface Trigger {
|
|
284
289
|
batch_id: string;
|
|
285
290
|
locations: Location[];
|
|
291
|
+
selective_rerun_rate_limited?: boolean;
|
|
286
292
|
}
|
|
287
293
|
export interface RetryConfig {
|
|
288
294
|
count: number;
|
|
@@ -310,6 +316,7 @@ export interface BaseConfigOverride {
|
|
|
310
316
|
[key: string]: string;
|
|
311
317
|
};
|
|
312
318
|
locations?: string[];
|
|
319
|
+
/** @deprecated This property is deprecated, please use `batchTimeout` in the global configuration file or `--batchTimeout` instead. */
|
|
313
320
|
pollingTimeout?: number;
|
|
314
321
|
resourceUrlSubstitutionRegexes?: string[];
|
|
315
322
|
retry?: RetryConfig;
|
|
@@ -330,6 +337,7 @@ export interface ServerConfigOverride extends BaseConfigOverride {
|
|
|
330
337
|
appExtractedMetadata?: MobileAppExtractedMetadata;
|
|
331
338
|
}
|
|
332
339
|
export interface BatchOptions {
|
|
340
|
+
batch_timeout?: number;
|
|
333
341
|
selective_rerun?: boolean;
|
|
334
342
|
}
|
|
335
343
|
export interface Payload {
|
|
@@ -415,7 +423,9 @@ export interface APIHelperConfig {
|
|
|
415
423
|
export interface SyntheticsCIConfig extends APIHelperConfig {
|
|
416
424
|
}
|
|
417
425
|
export interface RunTestsCommandConfig extends SyntheticsCIConfig {
|
|
426
|
+
batchTimeout?: number;
|
|
418
427
|
configPath: string;
|
|
428
|
+
defaultTestOverrides?: UserConfigOverride;
|
|
419
429
|
failOnCriticalErrors: boolean;
|
|
420
430
|
failOnMissingTests: boolean;
|
|
421
431
|
failOnTimeout: boolean;
|
|
@@ -423,16 +433,17 @@ export interface RunTestsCommandConfig extends SyntheticsCIConfig {
|
|
|
423
433
|
/** @deprecated This property is deprecated, please use `defaultTestOverrides` instead. */
|
|
424
434
|
global?: UserConfigOverride;
|
|
425
435
|
jUnitReport?: string;
|
|
426
|
-
defaultTestOverrides
|
|
427
|
-
/** @deprecated This property should only be used inside of `defaultTestOverrides`. */
|
|
436
|
+
/** @deprecated This property should only be used inside of `defaultTestOverrides` or `testOverrides`. */
|
|
428
437
|
locations?: string[];
|
|
429
438
|
mobileApplicationVersionFilePath?: string;
|
|
430
|
-
|
|
439
|
+
/** @deprecated This property is deprecated, please use `batchTimeout` in the global configuration file or `--batchTimeout` instead. */
|
|
440
|
+
pollingTimeout?: number;
|
|
431
441
|
publicIds: string[];
|
|
432
442
|
selectiveRerun: boolean;
|
|
433
443
|
subdomain: string;
|
|
434
444
|
testSearchQuery?: string;
|
|
435
445
|
tunnel: boolean;
|
|
446
|
+
/** @deprecated This property is deprecated, please use `variables` inside of `defaultTestOverrides`. */
|
|
436
447
|
variableStrings: string[];
|
|
437
448
|
}
|
|
438
449
|
export type WrapperConfig = Partial<RunTestsCommandConfig>;
|
|
@@ -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":";;;AA2RA,IAAY,QAeX;AAfD,WAAY,QAAQ;IAClB,iCAAqB,CAAA;IACrB,6CAAiC,CAAA;IACjC,qBAAS,CAAA;IACT,2BAAe,CAAA;IACf,yCAA6B,CAAA;IAC7B,yCAA6B,CAAA;IAC7B,iCAAqB,CAAA;IACrB,+CAAmC,CAAA;IACnC,iCAAqB,CAAA;IACrB,+CAAmC,CAAA;IACnC,+BAAmB,CAAA;IACnB,yCAA6B,CAAA;IAC7B,mDAAuC,CAAA;IACvC,6CAAiC,CAAA;AACnC,CAAC,EAfW,QAAQ,wBAAR,QAAQ,QAenB;AA2HD,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,sCAAqB,CAAA;IACrB,8CAA6B,CAAA;IAC7B,oCAAmB,CAAA;AACrB,CAAC,EAJW,aAAa,6BAAb,aAAa,QAIxB"}
|
|
@@ -206,7 +206,7 @@ const uploadMobileApplicationVersion = (config, appUploadReporter) => __awaiter(
|
|
|
206
206
|
throw new errors_1.CiError('MISSING_MOBILE_APPLICATION_ID', 'Mobile application id is required.');
|
|
207
207
|
}
|
|
208
208
|
if (!config.versionName) {
|
|
209
|
-
throw new errors_1.CiError('MISSING_MOBILE_VERSION_NAME', 'Version name is required');
|
|
209
|
+
throw new errors_1.CiError('MISSING_MOBILE_VERSION_NAME', 'Version name is required.');
|
|
210
210
|
}
|
|
211
211
|
config.latest = (_l = config.latest) !== null && _l !== void 0 ? _l : false;
|
|
212
212
|
const newVersionParams = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mobile.js","sourceRoot":"","sources":["../../../src/commands/synthetics/mobile.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mobile.js","sourceRoot":"","sources":["../../../src/commands/synthetics/mobile.ts"],"names":[],"mappings":"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"}
|