@datadog/datadog-ci 2.43.0 → 2.45.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/deployment/correlate.d.ts +1 -0
- package/dist/commands/deployment/correlate.js +30 -19
- package/dist/commands/deployment/correlate.js.map +1 -1
- package/dist/commands/sarif/renderer.d.ts +1 -1
- package/dist/commands/sarif/renderer.js +9 -7
- package/dist/commands/sarif/renderer.js.map +1 -1
- package/dist/commands/sarif/upload.js +9 -5
- package/dist/commands/sarif/upload.js.map +1 -1
- package/dist/commands/sbom/constants.d.ts +3 -0
- package/dist/commands/sbom/constants.js +4 -1
- package/dist/commands/sbom/constants.js.map +1 -1
- package/dist/commands/sbom/payload.js +90 -37
- package/dist/commands/sbom/payload.js.map +1 -1
- package/dist/commands/sbom/renderer.d.ts +0 -1
- package/dist/commands/sbom/renderer.js +1 -10
- package/dist/commands/sbom/renderer.js.map +1 -1
- package/dist/commands/sbom/types.d.ts +16 -0
- package/dist/commands/sbom/upload.js +18 -13
- package/dist/commands/sbom/upload.js.map +1 -1
- package/dist/commands/stepfunctions/helpers.d.ts +0 -2
- package/dist/commands/stepfunctions/helpers.js +58 -60
- package/dist/commands/stepfunctions/helpers.js.map +1 -1
- package/dist/commands/synthetics/api.d.ts +1 -0
- package/dist/commands/synthetics/api.js +6 -5
- package/dist/commands/synthetics/api.js.map +1 -1
- package/dist/commands/synthetics/batch.js +46 -16
- package/dist/commands/synthetics/batch.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +13 -11
- package/dist/commands/synthetics/interfaces.js.map +1 -1
- package/dist/commands/synthetics/reporters/default.js +9 -10
- package/dist/commands/synthetics/reporters/default.js.map +1 -1
- package/dist/commands/synthetics/reporters/junit.d.ts +2 -2
- package/dist/commands/synthetics/reporters/junit.js +22 -17
- package/dist/commands/synthetics/reporters/junit.js.map +1 -1
- package/dist/commands/synthetics/run-tests-command.js +37 -19
- package/dist/commands/synthetics/run-tests-command.js.map +1 -1
- package/dist/commands/synthetics/utils/internal.d.ts +17 -4
- package/dist/commands/synthetics/utils/internal.js +27 -10
- package/dist/commands/synthetics/utils/internal.js.map +1 -1
- package/dist/commands/synthetics/utils/public.d.ts +4 -1
- package/dist/commands/synthetics/utils/public.js +8 -4
- package/dist/commands/synthetics/utils/public.js.map +1 -1
- package/dist/helpers/ci.d.ts +2 -0
- package/dist/helpers/ci.js +10 -5
- package/dist/helpers/ci.js.map +1 -1
- package/dist/helpers/interfaces.d.ts +2 -2
- package/dist/helpers/tags.d.ts +4 -3
- package/dist/helpers/tags.js +11 -4
- package/dist/helpers/tags.js.map +1 -1
- package/dist/helpers/utils.d.ts +11 -1
- package/dist/helpers/utils.js +5 -11
- package/dist/helpers/utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,8 +15,6 @@ export declare const parseArn: (arn: string) => {
|
|
|
15
15
|
};
|
|
16
16
|
export declare const buildLogAccessPolicyName: (stepFunction: DescribeStateMachineCommandOutput) => string;
|
|
17
17
|
export declare const injectContextIntoTasks: (describeStateMachineCommandOutput: DescribeStateMachineCommandOutput, stepFunctionsClient: SFNClient, context: BaseContext, dryRun: boolean) => Promise<void>;
|
|
18
|
-
export declare const addTraceContextToStepFunctionParameters: ({ Parameters }: StepType) => void;
|
|
19
|
-
export declare const shouldUpdateStepForStepFunctionContextInjection: (step: StepType, context: BaseContext, stepName: string) => boolean;
|
|
20
18
|
export type StateMachineDefinitionType = {
|
|
21
19
|
Comment?: string;
|
|
22
20
|
StartAt?: string;
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.injectContextForStepFunctions = exports.injectContextForLambdaFunctions = exports.
|
|
12
|
+
exports.injectContextForStepFunctions = exports.injectContextForLambdaFunctions = exports.injectContextIntoTasks = exports.buildLogAccessPolicyName = exports.parseArn = exports.getStepFunctionLogGroupArn = exports.isValidArn = exports.buildSubscriptionFilterName = exports.buildLogGroupName = exports.buildArn = exports.displayChanges = void 0;
|
|
13
13
|
const deep_object_diff_1 = require("deep-object-diff");
|
|
14
14
|
const awsCommands_1 = require("./awsCommands");
|
|
15
15
|
const constants_1 = require("./constants");
|
|
@@ -79,61 +79,6 @@ const injectContextIntoTasks = (describeStateMachineCommandOutput, stepFunctions
|
|
|
79
79
|
}
|
|
80
80
|
});
|
|
81
81
|
exports.injectContextIntoTasks = injectContextIntoTasks;
|
|
82
|
-
const addTraceContextToStepFunctionParameters = ({ Parameters }) => {
|
|
83
|
-
if (Parameters) {
|
|
84
|
-
if (!Parameters.Input) {
|
|
85
|
-
Parameters.Input = {};
|
|
86
|
-
}
|
|
87
|
-
Parameters.Input['CONTEXT.$'] = 'States.JsonMerge($$, $, false)';
|
|
88
|
-
}
|
|
89
|
-
};
|
|
90
|
-
exports.addTraceContextToStepFunctionParameters = addTraceContextToStepFunctionParameters;
|
|
91
|
-
// Truth table
|
|
92
|
-
// Input | Expected
|
|
93
|
-
// -------------------------|---------
|
|
94
|
-
// Empty object | true
|
|
95
|
-
// undefined | true
|
|
96
|
-
// not object | false
|
|
97
|
-
// object without CONTEXT.$ | true
|
|
98
|
-
// object with CONTEXT.$ | false
|
|
99
|
-
const shouldUpdateStepForStepFunctionContextInjection = (step, context, stepName) => {
|
|
100
|
-
var _a;
|
|
101
|
-
// not default lambda api
|
|
102
|
-
if (!((_a = step.Resource) === null || _a === void 0 ? void 0 : _a.startsWith('arn:aws:states:::states:startExecution'))) {
|
|
103
|
-
return false;
|
|
104
|
-
}
|
|
105
|
-
if (!step.Parameters) {
|
|
106
|
-
context.stdout
|
|
107
|
-
.write(`[Warn] Step ${stepName} does not have a Parameters field. Step Functions Context Object injection \
|
|
108
|
-
skipped. Your Step Functions trace will not be merged with downstream Step Function traces. To manually merge these \
|
|
109
|
-
traces, check out https://docs.datadoghq.com/serverless/step_functions/troubleshooting/\n`);
|
|
110
|
-
return false;
|
|
111
|
-
}
|
|
112
|
-
if (!step.Parameters.Input) {
|
|
113
|
-
return true;
|
|
114
|
-
}
|
|
115
|
-
if (typeof step.Parameters.Input !== 'object') {
|
|
116
|
-
context.stdout
|
|
117
|
-
.write(`[Warn] Step ${stepName}'s Parameters.Input field is not a JSON object. Step Functions Context Object \
|
|
118
|
-
injection skipped. Your Step Functions trace will not be merged with downstream Step Function traces. To manually \
|
|
119
|
-
merge these traces, check out https://docs.datadoghq.com/serverless/step_functions/troubleshooting/\n`);
|
|
120
|
-
return false;
|
|
121
|
-
}
|
|
122
|
-
if (!step.Parameters.Input['CONTEXT.$'] && !step.Parameters.Input['CONTEXT']) {
|
|
123
|
-
return true;
|
|
124
|
-
}
|
|
125
|
-
// context injection is already set up
|
|
126
|
-
if (step.Parameters.Input['CONTEXT.$'] === 'States.JsonMerge($$, $, false)') {
|
|
127
|
-
context.stdout.write(` Step ${stepName}: Context injection is already set up. Skipping context injection.\n`);
|
|
128
|
-
return false;
|
|
129
|
-
}
|
|
130
|
-
context.stdout
|
|
131
|
-
.write(`[Warn] Step ${stepName}'s Parameters.Input field has a custom CONTEXT field. Step Functions Context \
|
|
132
|
-
Object injection skipped. Your Step Functions trace will not be merged with downstream Step Function traces. To \
|
|
133
|
-
manually merge these traces, check out https://docs.datadoghq.com/serverless/step_functions/troubleshooting/\n`);
|
|
134
|
-
return false;
|
|
135
|
-
};
|
|
136
|
-
exports.shouldUpdateStepForStepFunctionContextInjection = shouldUpdateStepForStepFunctionContextInjection;
|
|
137
82
|
// Truth table
|
|
138
83
|
// Case | Input | Expected
|
|
139
84
|
// -----|----------------------------------------------------------|---------
|
|
@@ -143,7 +88,8 @@ exports.shouldUpdateStepForStepFunctionContextInjection = shouldUpdateStepForSte
|
|
|
143
88
|
// 2.3 | "Payload" object has no Execution, State or StateMachine | true
|
|
144
89
|
// 3 | "Payload" is not object | false
|
|
145
90
|
// 4.1 | "Payload.$": "$" (default payload) | true
|
|
146
|
-
// 4.2 | "Payload.$": "States.JsonMerge($$, $, false)"
|
|
91
|
+
// 4.2 | "Payload.$": "States.JsonMerge($$, $, false)" or | false
|
|
92
|
+
// | "Payload.$": "$$['Execution', 'State', 'StateMachine']" |
|
|
147
93
|
// 4.3 | Custom "Payload.$" | false
|
|
148
94
|
const injectContextForLambdaFunctions = (step, context, stepName) => {
|
|
149
95
|
var _a;
|
|
@@ -216,7 +162,8 @@ merge these traces, check out https://docs.datadoghq.com/serverless/step_functio
|
|
|
216
162
|
return true;
|
|
217
163
|
}
|
|
218
164
|
// Case 4.2: context injection is already set up using "Payload.$"
|
|
219
|
-
if (step.Parameters['Payload.$'] === 'States.JsonMerge($$, $, false)'
|
|
165
|
+
if (step.Parameters['Payload.$'] === 'States.JsonMerge($$, $, false)' ||
|
|
166
|
+
step.Parameters['Payload.$'] === `$$['Execution', 'State', 'StateMachine']`) {
|
|
220
167
|
context.stdout.write(` Step ${stepName}: Context injection is already set up. Skipping context injection.\n`);
|
|
221
168
|
return false;
|
|
222
169
|
}
|
|
@@ -228,11 +175,62 @@ check out https://docs.datadoghq.com/serverless/step_functions/troubleshooting/\
|
|
|
228
175
|
return false;
|
|
229
176
|
};
|
|
230
177
|
exports.injectContextForLambdaFunctions = injectContextForLambdaFunctions;
|
|
178
|
+
// Truth table
|
|
179
|
+
// Case | Input | Expected
|
|
180
|
+
// -----|----------------------------------------------------------|---------
|
|
181
|
+
// 1 | No "CONTEXT" or "CONTEXT.$" | true
|
|
182
|
+
// 2 | Has "CONTEXT" | false
|
|
183
|
+
// 3.1 | "CONTEXT.$": "States.JsonMerge($$, $, false)" or | false
|
|
184
|
+
// | "CONTEXT.$": "$$['Execution', 'State', 'StateMachine']" |
|
|
185
|
+
// 3.2 | Custom "CONTEXT.$" | false
|
|
231
186
|
const injectContextForStepFunctions = (step, context, stepName) => {
|
|
232
|
-
|
|
233
|
-
|
|
187
|
+
var _a;
|
|
188
|
+
// not default lambda api
|
|
189
|
+
if (!((_a = step.Resource) === null || _a === void 0 ? void 0 : _a.startsWith('arn:aws:states:::states:startExecution'))) {
|
|
190
|
+
return false;
|
|
191
|
+
}
|
|
192
|
+
if (!step.Parameters) {
|
|
193
|
+
context.stdout
|
|
194
|
+
.write(`[Warn] Step ${stepName} does not have a Parameters field. Step Functions Context Object injection \
|
|
195
|
+
skipped. Your Step Functions trace will not be merged with downstream Step Function traces. To manually merge these \
|
|
196
|
+
traces, check out https://docs.datadoghq.com/serverless/step_functions/troubleshooting/\n`);
|
|
197
|
+
return false;
|
|
198
|
+
}
|
|
199
|
+
if (!step.Parameters.Input) {
|
|
200
|
+
step.Parameters.Input = { 'CONTEXT.$': `$$['Execution', 'State', 'StateMachine']` };
|
|
201
|
+
return true;
|
|
202
|
+
}
|
|
203
|
+
if (typeof step.Parameters.Input !== 'object') {
|
|
204
|
+
context.stdout
|
|
205
|
+
.write(`[Warn] Step ${stepName}'s Parameters.Input field is not a JSON object. Step Functions Context Object \
|
|
206
|
+
injection skipped. Your Step Functions trace will not be merged with downstream Step Function traces. To manually \
|
|
207
|
+
merge these traces, check out https://docs.datadoghq.com/serverless/step_functions/troubleshooting/\n`);
|
|
208
|
+
return false;
|
|
209
|
+
}
|
|
210
|
+
// Case 1: 'CONTEXT.$' and 'CONTEXT' fields are not set
|
|
211
|
+
if (!step.Parameters.Input['CONTEXT.$'] && !step.Parameters.Input['CONTEXT']) {
|
|
212
|
+
step.Parameters.Input['CONTEXT.$'] = `$$['Execution', 'State', 'StateMachine']`;
|
|
234
213
|
return true;
|
|
235
214
|
}
|
|
215
|
+
// Case 2: Has 'CONTEXT' field.
|
|
216
|
+
// This case should be rare so we don't support context injection for this case for now
|
|
217
|
+
if (step.Parameters.Input.hasOwnProperty('CONTEXT')) {
|
|
218
|
+
context.stdout.write(`[Warn] Step ${stepName}'s has custom CONTEXT field. Step Functions Context Object \
|
|
219
|
+
injection skipped. Your Step Functions trace will not be merged with downstream Step Function traces. To manually \
|
|
220
|
+
merge these traces, check out https://docs.datadoghq.com/serverless/step_functions/troubleshooting/\n`);
|
|
221
|
+
return false;
|
|
222
|
+
}
|
|
223
|
+
// Case 3.1 context injection is already set up
|
|
224
|
+
if (step.Parameters.Input['CONTEXT.$'] === 'States.JsonMerge($$, $, false)' ||
|
|
225
|
+
step.Parameters.Input['CONTEXT.$'] === `$$['Execution', 'State', 'StateMachine']`) {
|
|
226
|
+
context.stdout.write(` Step ${stepName}: Context injection is already set up. Skipping context injection.\n`);
|
|
227
|
+
return false;
|
|
228
|
+
}
|
|
229
|
+
// Case 3.2 custom CONTEXT.$ field
|
|
230
|
+
context.stdout
|
|
231
|
+
.write(`[Warn] Step ${stepName}'s Parameters.Input field has a custom CONTEXT.$ field. Step Functions Context \
|
|
232
|
+
Object injection skipped. Your Step Functions trace will not be merged with downstream Step Function traces. To \
|
|
233
|
+
manually merge these traces, check out https://docs.datadoghq.com/serverless/step_functions/troubleshooting/\n`);
|
|
236
234
|
return false;
|
|
237
235
|
};
|
|
238
236
|
exports.injectContextForStepFunctions = injectContextForStepFunctions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/commands/stepfunctions/helpers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/commands/stepfunctions/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ export type RetryPolicy = {
|
|
|
19
19
|
retryOn429?: boolean | undefined;
|
|
20
20
|
};
|
|
21
21
|
export declare const determineRetryDelay: (retries: number, error: Error, retryPolicy?: RetryPolicy) => number | undefined;
|
|
22
|
+
export declare const getErrorHttpStatus: (error: Error) => number | undefined;
|
|
22
23
|
export declare const isForbiddenError: (error: Error) => boolean;
|
|
23
24
|
export declare const isNotFoundError: (error: Error) => boolean;
|
|
24
25
|
export declare const isTooManyRequestsError: (error: Error) => boolean;
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.getApiHelper = exports.apiConstructor = exports.is5xxError = exports.isNodeError = exports.isTooManyRequestsError = exports.isNotFoundError = exports.isForbiddenError = exports.determineRetryDelay = exports.pollMobileApplicationUploadResponse = exports.completeMultipartMobileApplicationUpload = exports.formatBackendErrors = exports.EndpointError = void 0;
|
|
12
|
+
exports.getApiHelper = exports.apiConstructor = exports.is5xxError = exports.isNodeError = exports.isTooManyRequestsError = exports.isNotFoundError = exports.isForbiddenError = exports.getErrorHttpStatus = exports.determineRetryDelay = exports.pollMobileApplicationUploadResponse = exports.completeMultipartMobileApplicationUpload = exports.formatBackendErrors = exports.EndpointError = void 0;
|
|
13
13
|
const querystring_1 = require("querystring");
|
|
14
14
|
const axios_1 = require("axios");
|
|
15
15
|
const utils_1 = require("../../helpers/utils");
|
|
@@ -202,16 +202,17 @@ const determineRetryDelay = (retries, error, retryPolicy = { retryOn404: false,
|
|
|
202
202
|
exports.determineRetryDelay = determineRetryDelay;
|
|
203
203
|
const isEndpointError = (error) => error instanceof EndpointError;
|
|
204
204
|
const getErrorHttpStatus = (error) => { var _a; return isEndpointError(error) ? error.status : (0, axios_1.isAxiosError)(error) ? (_a = error.response) === null || _a === void 0 ? void 0 : _a.status : undefined; };
|
|
205
|
-
|
|
205
|
+
exports.getErrorHttpStatus = getErrorHttpStatus;
|
|
206
|
+
const isForbiddenError = (error) => (0, exports.getErrorHttpStatus)(error) === 403;
|
|
206
207
|
exports.isForbiddenError = isForbiddenError;
|
|
207
|
-
const isNotFoundError = (error) => getErrorHttpStatus(error) === 404;
|
|
208
|
+
const isNotFoundError = (error) => (0, exports.getErrorHttpStatus)(error) === 404;
|
|
208
209
|
exports.isNotFoundError = isNotFoundError;
|
|
209
|
-
const isTooManyRequestsError = (error) => getErrorHttpStatus(error) === 429;
|
|
210
|
+
const isTooManyRequestsError = (error) => (0, exports.getErrorHttpStatus)(error) === 429;
|
|
210
211
|
exports.isTooManyRequestsError = isTooManyRequestsError;
|
|
211
212
|
const isNodeError = (error) => !!error && 'code' in error;
|
|
212
213
|
exports.isNodeError = isNodeError;
|
|
213
214
|
const is5xxError = (error) => {
|
|
214
|
-
const statusCode = getErrorHttpStatus(error);
|
|
215
|
+
const statusCode = (0, exports.getErrorHttpStatus)(error);
|
|
215
216
|
return statusCode && statusCode >= 500 && statusCode <= 599 ? true : false;
|
|
216
217
|
};
|
|
217
218
|
exports.is5xxError = is5xxError;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/synthetics/api.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/synthetics/api.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,7 @@ const POLLING_INTERVAL = 5000; // In ms
|
|
|
22
22
|
const waitForBatchToFinish = (api, batchId, batchTimeout, resultDisplayInfo, reporter) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23
23
|
const safeDeadline = Date.now() + batchTimeout + 3 * POLLING_INTERVAL;
|
|
24
24
|
const emittedResultIds = new Set();
|
|
25
|
+
const backupPollResultMap = new Map();
|
|
25
26
|
let oldIncompleteResultIds = new Set();
|
|
26
27
|
while (true) {
|
|
27
28
|
const batch = yield getBatch(api, batchId);
|
|
@@ -31,7 +32,7 @@ const waitForBatchToFinish = (api, batchId, batchTimeout, resultDisplayInfo, rep
|
|
|
31
32
|
const shouldContinuePolling = batch.status === 'in_progress' && !safeDeadlineReached;
|
|
32
33
|
const newlyReceivedResults = (0, exports.reportReceivedResults)(batch, emittedResultIds, reporter);
|
|
33
34
|
const resultIdsToFetch = getResultIdsToFetch(shouldContinuePolling, batch, newlyReceivedResults, oldIncompleteResultIds);
|
|
34
|
-
const { pollResultMap, incompleteResultIds } = yield getPollResultMap(api, resultIdsToFetch);
|
|
35
|
+
const { pollResultMap, incompleteResultIds } = yield getPollResultMap(api, resultIdsToFetch, backupPollResultMap);
|
|
35
36
|
const resultsToReport = (0, exports.getResultsToReport)(shouldContinuePolling, batch, newlyReceivedResults, emittedResultIds, oldIncompleteResultIds, incompleteResultIds, reporter);
|
|
36
37
|
reportResults(batchId, resultsToReport, pollResultMap, resultDisplayInfo, safeDeadlineReached, reporter);
|
|
37
38
|
oldIncompleteResultIds = incompleteResultIds;
|
|
@@ -78,7 +79,7 @@ exports.getResultsToReport = getResultsToReport;
|
|
|
78
79
|
const reportReceivedResults = (batch, emittedResultIds, reporter) => {
|
|
79
80
|
const receivedResults = [];
|
|
80
81
|
for (const [index, result] of batch.results.entries()) {
|
|
81
|
-
// Skipped results
|
|
82
|
+
// Skipped results are only reported by `resultReceived()`, then they are excluded everywhere with `excludeSkipped()`.
|
|
82
83
|
const resultId = result.status === 'skipped' ? `skipped-${index}` : result.result_id;
|
|
83
84
|
// The result is reported if it has a final status, or if it's a non-final result.
|
|
84
85
|
if ((result.status !== 'in_progress' || (0, internal_1.isNonFinalResult)(result)) && !emittedResultIds.has(resultId)) {
|
|
@@ -122,11 +123,11 @@ const reportWaitingTests = (batchId, batch, resultDisplayInfo, reporter) => {
|
|
|
122
123
|
reporter.testsWait(remainingTests, baseUrl, batchId, skippedCount);
|
|
123
124
|
};
|
|
124
125
|
const getResultFromBatch = (resultInBatch, pollResultMap, resultDisplayInfo, safeDeadlineReached = false) => {
|
|
125
|
-
var _a, _b;
|
|
126
|
-
const {
|
|
126
|
+
var _a, _b, _c;
|
|
127
|
+
const { tests } = resultDisplayInfo;
|
|
128
|
+
const test = getTestByPublicId(resultInBatch.test_public_id, tests);
|
|
127
129
|
const hasTimedOut = (_a = resultInBatch.timed_out) !== null && _a !== void 0 ? _a : safeDeadlineReached;
|
|
128
130
|
const timedOutRetry = (0, internal_1.isTimedOutRetry)(resultInBatch.retries, resultInBatch.max_retries, resultInBatch.timed_out);
|
|
129
|
-
const test = getTestByPublicId(resultInBatch.test_public_id, tests);
|
|
130
131
|
if ((0, internal_1.isResultInBatchSkippedBySelectiveRerun)(resultInBatch)) {
|
|
131
132
|
return {
|
|
132
133
|
executionRule: resultInBatch.execution_rule,
|
|
@@ -137,7 +138,11 @@ const getResultFromBatch = (resultInBatch, pollResultMap, resultDisplayInfo, saf
|
|
|
137
138
|
timedOut: hasTimedOut,
|
|
138
139
|
};
|
|
139
140
|
}
|
|
140
|
-
const pollResult = pollResultMap
|
|
141
|
+
const pollResult = pollResultMap.get(resultInBatch.result_id);
|
|
142
|
+
const isUnhealthy = (_c = (_b = pollResult === null || pollResult === void 0 ? void 0 : pollResult.result) === null || _b === void 0 ? void 0 : _b.unhealthy) !== null && _c !== void 0 ? _c : false;
|
|
143
|
+
if (!(pollResult === null || pollResult === void 0 ? void 0 : pollResult.result)) {
|
|
144
|
+
return createResult(resultInBatch, pollResult, test, hasTimedOut, isUnhealthy, resultDisplayInfo);
|
|
145
|
+
}
|
|
141
146
|
if (safeDeadlineReached) {
|
|
142
147
|
pollResult.result.failure = new errors_1.BatchTimeoutRunawayError().toJson();
|
|
143
148
|
pollResult.result.passed = false;
|
|
@@ -150,21 +155,25 @@ const getResultFromBatch = (resultInBatch, pollResultMap, resultDisplayInfo, saf
|
|
|
150
155
|
pollResult.result.failure = { code: 'TIMEOUT', message: 'The batch timed out before receiving the result.' };
|
|
151
156
|
pollResult.result.passed = false;
|
|
152
157
|
}
|
|
153
|
-
|
|
158
|
+
return createResult(resultInBatch, pollResult, test, hasTimedOut, isUnhealthy, resultDisplayInfo);
|
|
159
|
+
};
|
|
160
|
+
const createResult = (resultInBatch, pollResult, test, hasTimedOut, isUnhealthy, { getLocation, options }) => {
|
|
161
|
+
var _a;
|
|
154
162
|
return {
|
|
163
|
+
duration: resultInBatch.duration,
|
|
155
164
|
executionRule: resultInBatch.execution_rule,
|
|
156
165
|
initialResultId: resultInBatch.initial_result_id,
|
|
157
166
|
isNonFinal: (0, internal_1.isNonFinalResult)(resultInBatch),
|
|
158
167
|
location: getLocation(resultInBatch.location, test),
|
|
159
168
|
passed: (0, internal_1.hasResultPassed)(resultInBatch, isUnhealthy, hasTimedOut, options),
|
|
160
|
-
result: pollResult.result,
|
|
169
|
+
result: pollResult === null || pollResult === void 0 ? void 0 : pollResult.result,
|
|
161
170
|
resultId: (0, internal_1.getResultIdOrLinkedResultId)(resultInBatch),
|
|
162
171
|
retries: resultInBatch.retries || 0,
|
|
163
172
|
maxRetries: resultInBatch.max_retries || 0,
|
|
164
173
|
selectiveRerun: resultInBatch.selective_rerun,
|
|
165
|
-
test: (0, deep_extend_1.default)({}, test, pollResult.check),
|
|
174
|
+
test: (0, deep_extend_1.default)({}, test, pollResult === null || pollResult === void 0 ? void 0 : pollResult.check),
|
|
166
175
|
timedOut: hasTimedOut,
|
|
167
|
-
timestamp: pollResult.timestamp,
|
|
176
|
+
timestamp: (_a = pollResult === null || pollResult === void 0 ? void 0 : pollResult.timestamp) !== null && _a !== void 0 ? _a : Date.now(),
|
|
168
177
|
};
|
|
169
178
|
};
|
|
170
179
|
const getBatch = (api, batchId) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -177,22 +186,43 @@ const getBatch = (api, batchId) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
177
186
|
throw new api_1.EndpointError(`Failed to get batch: ${(0, api_1.formatBackendErrors)(e)}\n`, (_a = e.response) === null || _a === void 0 ? void 0 : _a.status);
|
|
178
187
|
}
|
|
179
188
|
});
|
|
180
|
-
|
|
189
|
+
/**
|
|
190
|
+
* Returns fresh poll results, or reads the backup map in case of 404.
|
|
191
|
+
*/
|
|
192
|
+
const getPollResultMap = (api, resultIds, backupPollResultMap) => __awaiter(void 0, void 0, void 0, function* () {
|
|
181
193
|
var _b;
|
|
194
|
+
const pollResultMap = new Map();
|
|
195
|
+
const incompleteResultIds = new Set();
|
|
182
196
|
try {
|
|
183
197
|
const pollResults = yield api.pollResults(resultIds);
|
|
184
|
-
const pollResultMap = {};
|
|
185
|
-
const incompleteResultIds = new Set();
|
|
186
198
|
pollResults.forEach((r) => {
|
|
187
|
-
//
|
|
188
|
-
|
|
199
|
+
// Server results are initialized to `{"eventType": "created"}` in the backend, and they may take
|
|
200
|
+
// some time to be updated. In that case, we keep the `PollResult` information (e.g. `timestamp`)
|
|
201
|
+
// but remove the server result to avoid reporting an unexpected object shape.
|
|
202
|
+
if (r.result && 'eventType' in r.result && r.result.eventType === 'created') {
|
|
189
203
|
incompleteResultIds.add(r.resultID);
|
|
204
|
+
delete r.result;
|
|
190
205
|
}
|
|
191
|
-
pollResultMap
|
|
206
|
+
pollResultMap.set(r.resultID, r);
|
|
207
|
+
backupPollResultMap.set(r.resultID, r);
|
|
192
208
|
});
|
|
193
209
|
return { pollResultMap, incompleteResultIds };
|
|
194
210
|
}
|
|
195
211
|
catch (e) {
|
|
212
|
+
if ((0, api_1.getErrorHttpStatus)(e) === 404) {
|
|
213
|
+
// If some results have latency and retries were not enough, the whole request fails with "Test results not found".
|
|
214
|
+
// In that case, we mark results IDs that were never polled before as incomplete so they are fetched in the next polling cycles.
|
|
215
|
+
resultIds.forEach((resultId) => {
|
|
216
|
+
const backupPollResult = backupPollResultMap.get(resultId);
|
|
217
|
+
if (backupPollResult) {
|
|
218
|
+
pollResultMap.set(resultId, backupPollResult);
|
|
219
|
+
}
|
|
220
|
+
else {
|
|
221
|
+
incompleteResultIds.add(resultId);
|
|
222
|
+
}
|
|
223
|
+
});
|
|
224
|
+
return { pollResultMap, incompleteResultIds };
|
|
225
|
+
}
|
|
196
226
|
throw new api_1.EndpointError(`Failed to poll results: ${(0, api_1.formatBackendErrors)(e)}\n`, (_b = e.response) === null || _b === void 0 ? void 0 : _b.status);
|
|
197
227
|
}
|
|
198
228
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch.js","sourceRoot":"","sources":["../../../src/commands/synthetics/batch.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8DAAoC;AAEpC,+
|
|
1
|
+
{"version":3,"file":"batch.js","sourceRoot":"","sources":["../../../src/commands/synthetics/batch.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,13 +70,10 @@ export interface MultiStepsServerResult extends BaseServerResult {
|
|
|
70
70
|
export type ServerResult = BrowserServerResult | ApiServerResult | MultiStepsServerResult;
|
|
71
71
|
export interface PollResult {
|
|
72
72
|
check: Pick<Test, 'config' | 'subtype' | 'type'>;
|
|
73
|
-
result
|
|
73
|
+
result?: ServerResult;
|
|
74
74
|
resultID: string;
|
|
75
75
|
timestamp: number;
|
|
76
76
|
}
|
|
77
|
-
export type PollResultMap = {
|
|
78
|
-
[resultId: string]: PollResult;
|
|
79
|
-
};
|
|
80
77
|
/**
|
|
81
78
|
* Information required to convert a `PollResult` to a `Result`.
|
|
82
79
|
*/
|
|
@@ -110,6 +107,8 @@ export type SelectiveRerunDecision = {
|
|
|
110
107
|
linked_result_id: string;
|
|
111
108
|
};
|
|
112
109
|
export interface BaseResult {
|
|
110
|
+
/** Duration of the result in milliseconds. */
|
|
111
|
+
duration: number;
|
|
113
112
|
executionRule: ExecutionRule;
|
|
114
113
|
initialResultId?: string;
|
|
115
114
|
/** Whether the result is an intermediary result that is expected to be retried. */
|
|
@@ -117,7 +116,7 @@ export interface BaseResult {
|
|
|
117
116
|
location: string;
|
|
118
117
|
/** Whether the result is passed or not, according to `failOnCriticalErrors` and `failOnTimeout`. */
|
|
119
118
|
passed: boolean;
|
|
120
|
-
result
|
|
119
|
+
result?: ServerResult;
|
|
121
120
|
resultId: string;
|
|
122
121
|
/** Number of retries, including this result. */
|
|
123
122
|
retries: number;
|
|
@@ -128,7 +127,7 @@ export interface BaseResult {
|
|
|
128
127
|
timedOut: boolean;
|
|
129
128
|
timestamp: number;
|
|
130
129
|
}
|
|
131
|
-
export type ResultSkippedBySelectiveRerun = Omit<BaseResult, 'location' | 'result' | 'retries' | 'maxRetries' | 'timestamp'> & {
|
|
130
|
+
export type ResultSkippedBySelectiveRerun = Omit<BaseResult, 'duration' | 'location' | 'result' | 'retries' | 'maxRetries' | 'timestamp'> & {
|
|
132
131
|
executionRule: ExecutionRule.SKIPPED;
|
|
133
132
|
selectiveRerun: Extract<SelectiveRerunDecision, {
|
|
134
133
|
decision: 'skip';
|
|
@@ -138,6 +137,7 @@ export type Result = BaseResult | ResultSkippedBySelectiveRerun;
|
|
|
138
137
|
type Status = 'passed' | 'failed' | 'in_progress' | 'skipped';
|
|
139
138
|
type BatchStatus = 'passed' | 'failed' | 'in_progress';
|
|
140
139
|
export interface BaseResultInBatch {
|
|
140
|
+
duration: number;
|
|
141
141
|
execution_rule: ExecutionRule;
|
|
142
142
|
initial_result_id?: string;
|
|
143
143
|
location: string;
|
|
@@ -149,7 +149,7 @@ export interface BaseResultInBatch {
|
|
|
149
149
|
test_public_id: string;
|
|
150
150
|
timed_out: boolean | null;
|
|
151
151
|
}
|
|
152
|
-
type SkippedResultInBatch = Omit<BaseResultInBatch, 'location' | 'result_id'> & {
|
|
152
|
+
type SkippedResultInBatch = Omit<BaseResultInBatch, 'duration' | 'location' | 'result_id'> & {
|
|
153
153
|
execution_rule: ExecutionRule.SKIPPED;
|
|
154
154
|
status: 'skipped';
|
|
155
155
|
};
|
|
@@ -309,15 +309,17 @@ export interface MobileApplication {
|
|
|
309
309
|
referenceId: string;
|
|
310
310
|
referenceType: 'latest' | 'version' | 'temporary';
|
|
311
311
|
}
|
|
312
|
+
export interface CookiesObject {
|
|
313
|
+
append?: boolean;
|
|
314
|
+
value: string;
|
|
315
|
+
}
|
|
312
316
|
export interface BaseConfigOverride {
|
|
313
317
|
allowInsecureCertificates?: boolean;
|
|
314
318
|
basicAuth?: BasicAuthCredentials;
|
|
315
319
|
body?: string;
|
|
316
320
|
bodyType?: string;
|
|
317
|
-
cookies?: string |
|
|
318
|
-
|
|
319
|
-
value: string;
|
|
320
|
-
};
|
|
321
|
+
cookies?: string | CookiesObject;
|
|
322
|
+
setCookies?: string | CookiesObject;
|
|
321
323
|
defaultStepTimeout?: number;
|
|
322
324
|
deviceIds?: string[];
|
|
323
325
|
executionRule?: ExecutionRule;
|
|
@@ -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":";;;AAsSA,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;AAiID,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,sCAAqB,CAAA;IACrB,8CAA6B,CAAA;IAC7B,oCAAmB,CAAA;AACrB,CAAC,EAJW,aAAa,6BAAb,aAAa,QAIxB"}
|