@redocly/respect-core 0.0.0-snapshot.1740152436 → 0.0.0-snapshot.1740488474
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 +3 -11
- package/lib/handlers/run.d.ts +1 -0
- package/lib/handlers/run.d.ts.map +1 -1
- package/lib/handlers/run.js +1 -1
- package/lib/handlers/run.js.map +1 -1
- package/lib/modules/cli-output/calculate-tests-passed.d.ts.map +1 -1
- package/lib/modules/cli-output/calculate-tests-passed.js +19 -16
- package/lib/modules/cli-output/calculate-tests-passed.js.map +1 -1
- package/lib/modules/cli-output/display-checks.d.ts.map +1 -1
- package/lib/modules/cli-output/display-checks.js +13 -7
- package/lib/modules/cli-output/display-checks.js.map +1 -1
- package/lib/modules/cli-output/display-errors.js +2 -2
- package/lib/modules/cli-output/display-errors.js.map +1 -1
- package/lib/modules/cli-output/display-files-summary-table.d.ts.map +1 -1
- package/lib/modules/cli-output/display-files-summary-table.js +0 -6
- package/lib/modules/cli-output/display-files-summary-table.js.map +1 -1
- package/lib/modules/cli-output/json-logs.d.ts.map +1 -1
- package/lib/modules/cli-output/json-logs.js +18 -16
- package/lib/modules/cli-output/json-logs.js.map +1 -1
- package/lib/modules/cli-output/mask-secrets.d.ts +2 -2
- package/lib/modules/cli-output/mask-secrets.d.ts.map +1 -1
- package/lib/modules/cli-output/mask-secrets.js.map +1 -1
- package/lib/modules/config-parser/handle-request-body-replacements.d.ts +2 -2
- package/lib/modules/config-parser/handle-request-body-replacements.d.ts.map +1 -1
- package/lib/modules/config-parser/handle-request-body-replacements.js +7 -2
- package/lib/modules/config-parser/handle-request-body-replacements.js.map +1 -1
- package/lib/modules/config-parser/parse-request-body.d.ts +4 -4
- package/lib/modules/config-parser/parse-request-body.d.ts.map +1 -1
- package/lib/modules/config-parser/parse-request-body.js +12 -21
- package/lib/modules/config-parser/parse-request-body.js.map +1 -1
- package/lib/modules/flow-runner/call-api-and-analyze-results.js +3 -3
- package/lib/modules/flow-runner/call-api-and-analyze-results.js.map +1 -1
- package/lib/modules/flow-runner/get-server-url.d.ts.map +1 -1
- package/lib/modules/flow-runner/get-server-url.js +8 -1
- package/lib/modules/flow-runner/get-server-url.js.map +1 -1
- package/lib/modules/flow-runner/get-test-description-from-file.d.ts.map +1 -1
- package/lib/modules/flow-runner/get-test-description-from-file.js +1 -1
- package/lib/modules/flow-runner/get-test-description-from-file.js.map +1 -1
- package/lib/modules/flow-runner/prepare-request.d.ts.map +1 -1
- package/lib/modules/flow-runner/prepare-request.js +20 -6
- package/lib/modules/flow-runner/prepare-request.js.map +1 -1
- package/lib/modules/flow-runner/run-step.d.ts.map +1 -1
- package/lib/modules/flow-runner/run-step.js +25 -7
- package/lib/modules/flow-runner/run-step.js.map +1 -1
- package/lib/modules/flow-runner/runner.d.ts.map +1 -1
- package/lib/modules/flow-runner/runner.js +7 -2
- package/lib/modules/flow-runner/runner.js.map +1 -1
- package/lib/modules/flow-runner/schema/schema-checker.js +8 -8
- package/lib/modules/flow-runner/schema/schema-checker.js.map +1 -1
- package/lib/modules/flow-runner/success-criteria/check-success-criteria.d.ts +1 -1
- package/lib/modules/flow-runner/success-criteria/check-success-criteria.d.ts.map +1 -1
- package/lib/modules/flow-runner/success-criteria/check-success-criteria.js +13 -9
- package/lib/modules/flow-runner/success-criteria/check-success-criteria.js.map +1 -1
- package/lib/types.d.ts +10 -3
- package/lib/types.d.ts.map +1 -1
- package/lib/utils/cli-outputs.d.ts +2 -1
- package/lib/utils/cli-outputs.d.ts.map +1 -1
- package/lib/utils/cli-outputs.js +5 -0
- package/lib/utils/cli-outputs.js.map +1 -1
- package/package.json +9 -19
- package/LICENSE +0 -18
package/README.md
CHANGED
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
## `@redocly/respect-core`
|
|
4
4
|
|
|
5
|
-
Continuous API monitoring powered by OpenAPI Arazzo workflows.
|
|
5
|
+
Continuous API monitoring powered by OpenAPI Arazzo workflows.
|
|
6
|
+
|
|
7
|
+
This package cannot be used standalone. Please install and use [@redocly/cli](https://github.com/Redocly/redocly-cli) to run API tests.
|
|
6
8
|
|
|
7
9
|
The key benefits of `respect`:
|
|
8
10
|
|
|
@@ -13,13 +15,3 @@ The key benefits of `respect`:
|
|
|
13
15
|
- Shift left to catch problems fast before they are costly. Run on developer laptops and CICD.
|
|
14
16
|
|
|
15
17
|
You **MUST** have a working API server running in order to run the tests because it sends real HTTP requests.
|
|
16
|
-
|
|
17
|
-
## License
|
|
18
|
-
|
|
19
|
-
See LICENSE included with package.
|
|
20
|
-
|
|
21
|
-
For more details and beta access, contact team@redocly.com
|
|
22
|
-
|
|
23
|
-
## Get started
|
|
24
|
-
|
|
25
|
-
Contact team@redocly.com to request beta access.
|
package/lib/handlers/run.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/handlers/run.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAY,WAAW,EAAW,MAAM,UAAU,CAAC;AAE/D,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,KAAK,CAAC;CAChB,CAAC;AAGF,wBAAsB,SAAS,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,WAAW,CAAC,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/handlers/run.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAY,WAAW,EAAW,MAAM,UAAU,CAAC;AAE/D,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,KAAK,CAAC;CAChB,CAAC;AAGF,wBAAsB,SAAS,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,WAAW,CAAC,cAAc,CAAC,iBA6ErF"}
|
package/lib/handlers/run.js
CHANGED
|
@@ -50,7 +50,7 @@ async function handleRun({ argv, collectSpecData }) {
|
|
|
50
50
|
files: (0, cli_output_1.composeJsonLogsFiles)(runAllFilesResult),
|
|
51
51
|
status: hasProblems ? 'error' : hasWarnings ? 'warn' : 'success',
|
|
52
52
|
totalTime: performance.now() - startedAt,
|
|
53
|
-
}), 'utf-8');
|
|
53
|
+
}, null, 2), 'utf-8');
|
|
54
54
|
logger.log((0, colorette_1.blue)((0, cli_outputs_1.indent)(`JSON logs saved in ${(0, colorette_1.green)(jsonOutputFile)}`, 2)));
|
|
55
55
|
logger.printNewLine();
|
|
56
56
|
logger.printNewLine();
|
package/lib/handlers/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/handlers/run.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/handlers/run.ts"],"names":[],"mappings":";;AAmCA,8BA6EC;AAhHD,yCAA6C;AAE7C,wDAAqD;AACrD,sDAM+B;AAC/B,mDAAuD;AACvD,8DAAyD;AACzD,qCAAwC;AACxC,sDAA8C;AAqB9C,MAAM,MAAM,GAAG,sBAAa,CAAC,WAAW,EAAE,CAAC;AACpC,KAAK,UAAU,SAAS,CAAC,EAAE,IAAI,EAAE,eAAe,EAA+B;IACpF,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;IACzC,IAAI,aAAa,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;IAC3C,IAAI,cAAc,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IAEhC,IAAI,IAAI,IAAI,QAAQ,EAAE,CAAC;QACrB,MAAM,CAAC,YAAY,EAAE,CAAC;QACtB,MAAM,CAAC,GAAG,CAAC,IAAA,eAAG,EAAC,+DAA+D,CAAC,CAAC,CAAC;QACjF,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QACpC,MAAM,sBAAsB,GAAc,EAAE,CAAC;QAC7C,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QACvB,MAAM,iBAAiB,GAAG,EAAE,CAAC;QAE7B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,cAAc,IAAI,aAAa,CAAC,EAAE,CAAC;YAC1D,iDAAiD;YACjD,MAAM,IAAI,KAAK,CACb,iHAAiH,CAClH,CAAC;QACJ,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,MAAM,GAAG,MAAM,OAAO,CAC1B,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EACvB,WAAW,CAAC,GAAG,EAAE,EACjB;gBACE,OAAO,EAAE,aAAa;aACvB,EACD,eAAe,CAChB,CAAC;YACF,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAChD,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC;QAED,MAAM,WAAW,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC3E,MAAM,WAAW,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAE3E,MAAM,CAAC,YAAY,EAAE,CAAC;QACtB,IAAA,qCAAwB,EAAC,iBAAiB,CAAC,CAAC;QAC5C,MAAM,CAAC,YAAY,EAAE,CAAC;QAEtB,IAAI,cAAc,EAAE,CAAC;YACnB,IAAA,uBAAa,EACX,cAAc,EACd,IAAI,CAAC,SAAS,CACZ;gBACE,KAAK,EAAE,IAAA,iCAAoB,EAAC,iBAAiB,CAAC;gBAC9C,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;gBAChE,SAAS,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,SAAS;aAC7B,EACb,IAAI,EACJ,CAAC,CACF,EACD,OAAO,CACR,CAAC;YACF,MAAM,CAAC,GAAG,CAAC,IAAA,gBAAI,EAAC,IAAA,oBAAM,EAAC,sBAAsB,IAAA,iBAAK,EAAC,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3E,MAAM,CAAC,YAAY,EAAE,CAAC;YACtB,MAAM,CAAC,YAAY,EAAE,CAAC;QACxB,CAAC;QAED,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,+BAAa,EAAE,GAAa,EAAE,OAAO,IAAI,GAAG,CAAC,CAAC;IAChD,CAAC;AACH,CAAC;AAED,KAAK,UAAU,OAAO,CACpB,IAAa,EACb,SAAiB,EACjB,MAAuC,EACvC,eAA2B;IAE3B,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,yBAAW,EAAC,IAAI,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;IAEpF,MAAM,MAAM,GAAG,IAAA,4BAAe,EAAC,iBAAiB,CAAC,CAAC;IAClD,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;IAChD,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,GAAG,CAAC,CAAC;IAElD,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,QAAQ,GAAG,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;QACrF,IAAA,0BAAa,EAAC,iBAAiB,CAAC,CAAC;IACnC,CAAC;IAED,IAAA,2BAAc,EAAC,SAAS,EAAE,iBAAiB,EAAE,IAAI,CAAC,CAAC;IAEnD,OAAO;QACL,WAAW;QACX,WAAW;QACX,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,iBAAiB;QACjB,IAAI;QACJ,GAAG;QACH,WAAW,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,SAAS;QAC1C,aAAa,EAAE,MAAM,CAAC,aAAa;KACpC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculate-tests-passed.d.ts","sourceRoot":"","sources":["../../../src/modules/cli-output/calculate-tests-passed.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAQ,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEpF,wBAAgB,eAAe,CAAC,SAAS,EAAE,uBAAuB,EAAE,GAAG,iBAAiB,
|
|
1
|
+
{"version":3,"file":"calculate-tests-passed.d.ts","sourceRoot":"","sources":["../../../src/modules/cli-output/calculate-tests-passed.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAQ,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEpF,wBAAgB,eAAe,CAAC,SAAS,EAAE,uBAAuB,EAAE,GAAG,iBAAiB,CA8EvF"}
|
|
@@ -9,26 +9,24 @@ function calculateTotals(workflows) {
|
|
|
9
9
|
let totalRequests = 0;
|
|
10
10
|
let totalWarnings = 0;
|
|
11
11
|
let totalSkipped = 0;
|
|
12
|
-
|
|
13
|
-
const workflowsWithSkippedStepsChecks = new Set();
|
|
12
|
+
let failedWorkflows = 0;
|
|
14
13
|
const workflowsWithWarningsStepsChecks = new Set();
|
|
15
|
-
|
|
14
|
+
let failedSteps = 0;
|
|
16
15
|
const skippedSteps = new Set();
|
|
17
16
|
const warningsSteps = new Set();
|
|
18
17
|
for (const workflow of workflows) {
|
|
19
18
|
const steps = flattenNestedSteps(workflow.executedSteps);
|
|
19
|
+
let hasFailedSteps = false;
|
|
20
20
|
for (const step of steps) {
|
|
21
|
-
|
|
22
|
-
// we count request only if we received a response to prevent counting network errors or step with broken inputs
|
|
23
|
-
totalRequests++;
|
|
24
|
-
}
|
|
21
|
+
totalRequests++;
|
|
25
22
|
if (step.retriesLeft && step.retriesLeft !== 0) {
|
|
26
23
|
continue; // do not count retried steps as a step
|
|
27
24
|
}
|
|
28
25
|
totalSteps++;
|
|
26
|
+
let hasFailedChecks = false;
|
|
29
27
|
for (const check of step.checks) {
|
|
30
28
|
totalChecks++;
|
|
31
|
-
if (!check.
|
|
29
|
+
if (!check.passed) {
|
|
32
30
|
switch (check.severity) {
|
|
33
31
|
case 'warn':
|
|
34
32
|
totalWarnings++;
|
|
@@ -37,29 +35,34 @@ function calculateTotals(workflows) {
|
|
|
37
35
|
break;
|
|
38
36
|
case 'off':
|
|
39
37
|
totalSkipped++;
|
|
40
|
-
workflowsWithSkippedStepsChecks.add(workflow.workflowId);
|
|
41
38
|
skippedSteps.add(workflow.workflowId + ':' + step.stepId);
|
|
42
39
|
break;
|
|
43
40
|
default:
|
|
44
41
|
failedChecks++;
|
|
45
|
-
|
|
46
|
-
failedSteps.add(workflow.workflowId + ':' + step.stepId);
|
|
42
|
+
hasFailedChecks = true;
|
|
47
43
|
}
|
|
48
44
|
}
|
|
49
45
|
}
|
|
46
|
+
if (hasFailedChecks) {
|
|
47
|
+
failedSteps++;
|
|
48
|
+
hasFailedSteps = true;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
if (hasFailedSteps) {
|
|
52
|
+
failedWorkflows++;
|
|
50
53
|
}
|
|
51
54
|
}
|
|
52
55
|
return {
|
|
53
56
|
workflows: {
|
|
54
|
-
passed: totalWorkflows - failedWorkflows
|
|
55
|
-
failed: failedWorkflows
|
|
57
|
+
passed: totalWorkflows - failedWorkflows,
|
|
58
|
+
failed: failedWorkflows,
|
|
56
59
|
warnings: workflowsWithWarningsStepsChecks.size,
|
|
57
|
-
skipped:
|
|
60
|
+
skipped: 0,
|
|
58
61
|
total: totalWorkflows,
|
|
59
62
|
},
|
|
60
63
|
steps: {
|
|
61
|
-
passed: totalSteps - failedSteps
|
|
62
|
-
failed: failedSteps
|
|
64
|
+
passed: totalSteps - failedSteps,
|
|
65
|
+
failed: failedSteps,
|
|
63
66
|
warnings: warningsSteps.size,
|
|
64
67
|
skipped: skippedSteps.size,
|
|
65
68
|
total: totalSteps,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculate-tests-passed.js","sourceRoot":"","sources":["../../../src/modules/cli-output/calculate-tests-passed.ts"],"names":[],"mappings":";;AAGA,
|
|
1
|
+
{"version":3,"file":"calculate-tests-passed.js","sourceRoot":"","sources":["../../../src/modules/cli-output/calculate-tests-passed.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"display-checks.d.ts","sourceRoot":"","sources":["../../../src/modules/cli-output/display-checks.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"display-checks.d.ts","sourceRoot":"","sources":["../../../src/modules/cli-output/display-checks.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKrD,wBAAgB,aAAa,CAC3B,iBAAiB,EAAE,MAAM,EACzB,MAAM,EAAE,KAAK,EAAE,EACf,WAAW,CAAC,EAAE,UAAU,EACxB,mBAAmB,CAAC,EAAE,UAAU,QAoBjC"}
|
|
@@ -8,8 +8,9 @@ const is_json_1 = require("../../utils/is-json");
|
|
|
8
8
|
const cli_outputs_1 = require("../../utils/cli-outputs");
|
|
9
9
|
const logger_1 = require("../../utils/logger/logger");
|
|
10
10
|
const logger = logger_1.DefaultLogger.getInstance();
|
|
11
|
+
const MAX_CRITERIA_CONDITION_DISPLAY_LENGTH = 50;
|
|
11
12
|
function displayChecks(testNameToDisplay, checks, verboseLogs, verboseResponseLogs) {
|
|
12
|
-
const allChecksPassed = checks.every(({
|
|
13
|
+
const allChecksPassed = checks.every(({ passed }) => passed);
|
|
13
14
|
logger.log(` ${allChecksPassed ? (0, colorette_1.green)('✓') : (0, colorette_1.red)('✗')} ${(0, colorette_1.blue)(testNameToDisplay)}`);
|
|
14
15
|
if (verboseLogs) {
|
|
15
16
|
logger.log(`${cli_outputs_1.RESET_ESCAPE_CODE}\n` + (displayVerboseLogs(verboseLogs) || ''));
|
|
@@ -21,14 +22,19 @@ function displayChecks(testNameToDisplay, checks, verboseLogs, verboseResponseLo
|
|
|
21
22
|
}
|
|
22
23
|
logger.printNewLine();
|
|
23
24
|
for (const check of checks) {
|
|
24
|
-
|
|
25
|
-
const passTestMessage = (checkName) => `${(0, colorette_1.green)('✓')} ${(0, colorette_1.gray)(checkName.toLowerCase())}${check?.additionalMessage ? ` (${check.additionalMessage})` : ''}`;
|
|
26
|
-
const failTestMessage = (checkName, severity) => `${severity === 'warn' ? (0, colorette_1.yellow)('⚠') : (0, colorette_1.red)('✗')} ${(0, colorette_1.gray)(checkName.toLowerCase())}${check?.additionalMessage ? ' (' + check.additionalMessage + ')' : ''}`;
|
|
27
|
-
logger.log(`${pass
|
|
28
|
-
? (0, cli_outputs_1.indent)(passTestMessage(checkName), 4)
|
|
29
|
-
: (0, cli_outputs_1.indent)(failTestMessage(checkName, severity), 4)}\n`);
|
|
25
|
+
logger.log(`${(0, cli_outputs_1.indent)(displayCheckInfo(check, check.severity), 4)}\n`);
|
|
30
26
|
}
|
|
31
27
|
}
|
|
28
|
+
function displayCheckInfo(check, severity) {
|
|
29
|
+
const { name: checkName, passed, condition } = check;
|
|
30
|
+
const icon = passed ? (0, colorette_1.green)('✓') : severity === 'warn' ? (0, colorette_1.yellow)('⚠') : (0, colorette_1.red)('✗');
|
|
31
|
+
const color = passed ? colorette_1.green : colorette_1.red;
|
|
32
|
+
return `${icon} ${(0, colorette_1.gray)(checkName.toLowerCase())}${condition
|
|
33
|
+
? ` - ${color(condition.length > MAX_CRITERIA_CONDITION_DISPLAY_LENGTH
|
|
34
|
+
? condition.slice(0, MAX_CRITERIA_CONDITION_DISPLAY_LENGTH) + '...'
|
|
35
|
+
: condition)}`
|
|
36
|
+
: ''}`;
|
|
37
|
+
}
|
|
32
38
|
function displayVerboseLogs(logs, type = 'request') {
|
|
33
39
|
const { path, host, headerParams, body, statusCode } = logs;
|
|
34
40
|
const responseTime = process.env.NODE_ENV === 'test' ? '<test>' : logs.responseTime;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"display-checks.js","sourceRoot":"","sources":["../../../src/modules/cli-output/display-checks.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"display-checks.js","sourceRoot":"","sources":["../../../src/modules/cli-output/display-checks.ts"],"names":[],"mappings":";;AAaA,sCAwBC;AArCD,yCAA2D;AAC3D,qCAAkC;AAClC,yCAA6C;AAC7C,iDAA6C;AAC7C,yDAAoE;AACpE,sDAA0D;AAK1D,MAAM,MAAM,GAAG,sBAAa,CAAC,WAAW,EAAE,CAAC;AAC3C,MAAM,qCAAqC,GAAG,EAAE,CAAC;AAEjD,SAAgB,aAAa,CAC3B,iBAAyB,EACzB,MAAe,EACf,WAAwB,EACxB,mBAAgC;IAEhC,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;IAC7D,MAAM,CAAC,GAAG,CAAC,KAAK,eAAe,CAAC,CAAC,CAAC,IAAA,iBAAK,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,eAAG,EAAC,GAAG,CAAC,IAAI,IAAA,gBAAI,EAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;IAEtF,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,CAAC,GAAG,CAAC,GAAG,+BAAiB,IAAI,GAAG,CAAC,kBAAkB,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC/E,MAAM,CAAC,YAAY,EAAE,CAAC;IACxB,CAAC;IACD,IAAI,mBAAmB,EAAE,CAAC;QACxB,MAAM,CAAC,GAAG,CACR,GAAG,+BAAiB,IAAI,GAAG,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CACvF,CAAC;QACF,MAAM,CAAC,YAAY,EAAE,CAAC;IACxB,CAAC;IACD,MAAM,CAAC,YAAY,EAAE,CAAC;IAEtB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,CAAC,GAAG,CAAC,GAAG,IAAA,oBAAM,EAAC,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IACxE,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAY,EAAE,QAAsB;IAC5D,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAErD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,IAAA,iBAAK,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,IAAA,kBAAM,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,eAAG,EAAC,GAAG,CAAC,CAAC;IAChF,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,iBAAK,CAAC,CAAC,CAAC,eAAG,CAAC;IAEnC,OAAO,GAAG,IAAI,IAAI,IAAA,gBAAI,EAAC,SAAS,CAAC,WAAW,EAAE,CAAC,GAC7C,SAAS;QACP,CAAC,CAAC,MAAM,KAAK,CACT,SAAS,CAAC,MAAM,GAAG,qCAAqC;YACtD,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,qCAAqC,CAAC,GAAG,KAAK;YACnE,CAAC,CAAC,SAAS,CACd,EAAE;QACL,CAAC,CAAC,EACN,EAAE,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAgB,EAAE,OAA+B,SAAS;IACpF,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IAC5D,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC;IAEpF,MAAM,SAAS,GAAG,IAAA,oBAAM,EAAC,gBAAgB,IAAA,gBAAI,EAAC,IAAA,gBAAU,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAC5E,MAAM,oBAAoB,GAAG,IAAA,oBAAM,EAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;IAC3D,MAAM,qBAAqB,GAAG,IAAA,oBAAM,EAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC;IAC7D,MAAM,iBAAiB,GAAG,IAAA,oBAAM,EAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IACrD,MAAM,kBAAkB,GAAG,IAAA,oBAAM,EAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;IACvD,MAAM,aAAa,GAAG,oBAAoB,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IAC/D,MAAM,aAAa,GAAG,IAAI;QACxB,CAAC,CAAC,IAAA,gBAAM,EAAC,IAAI,CAAC;YACZ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3C,CAAC,CAAC,IAAI;QACR,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,YAAY,GAAG,aAAa;QAChC,CAAC,CAAC,aAAa;aACV,KAAK,CAAC,IAAI,CAAC;aACX,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAA,gBAAI,EAAC,IAAA,oBAAM,EAAC,GAAG,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;aACjD,IAAI,CAAC,IAAI,CAAC;QACf,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,UAAU,GAAG,YAAY,CAAC;IAEhC,MAAM,aAAa,GAAG;QACpB,MAAM,CAAC,YAAY,EAAE;QACrB,IAAA,gBAAI,EAAC,SAAS,CAAC;QACf,aAAa,IAAI,IAAA,gBAAI,EAAC,oBAAoB,CAAC;QAC3C,aAAa,IAAI,IAAA,gBAAI,EAAC,aAAa,CAAC;QACpC,IAAI,IAAI,IAAA,gBAAI,EAAC,iBAAiB,CAAC;QAC/B,IAAI,IAAI,UAAU;KACnB;SACE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,GAAG,+BAAiB,IAAI,CAAC,CAAC;IAElC,MAAM,cAAc,GAAG;QACrB,IAAA,gBAAI,EAAC,IAAA,oBAAM,EAAC,wBAAwB,GAAG,IAAA,gBAAI,EAAC,UAAoB,CAAC,EAAE,CAAC,CAAC,CAAC;QACtE,IAAA,gBAAI,EAAC,IAAA,oBAAM,EAAC,iBAAiB,GAAG,IAAA,gBAAI,EAAC,YAAsB,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC;QACzE,aAAa,IAAI,IAAA,gBAAI,EAAC,qBAAqB,CAAC;QAC5C,aAAa,IAAI,IAAA,gBAAI,EAAC,aAAa,CAAC;QACpC,IAAI,IAAI,IAAA,gBAAI,EAAC,kBAAkB,CAAC;QAChC,IAAI,IAAI,UAAU;KACnB;SACE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,GAAG,+BAAiB,IAAI,CAAC,CAAC;IAElC,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAA,iBAAO,EAAA,GAAG,aAAa,EAAE,CAAC,CAAC,CAAC,IAAA,iBAAO,EAAA,GAAG,cAAc,EAAE,CAAC;AACrF,CAAC;AAED,SAAS,oBAAoB,CAAC,YAAoC;IAChE,IAAI,cAAc,GAAG,EAAE,CAAC;IACxB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAE7C,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE;QACtC,cAAc,GAAG,cAAc,GAAG,IAAA,oBAAM,EAAC,GAAG,IAAA,kBAAM,EAAC,GAAG,CAAC,KAAK,IAAA,gBAAI,EAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAE9E,IAAI,KAAK,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,cAAc,IAAI,GAAG,+BAAiB,IAAI,CAAC;QAC7C,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,cAAc,CAAC;AACxB,CAAC"}
|
|
@@ -18,12 +18,12 @@ function displayErrors(workflows) {
|
|
|
18
18
|
logger.log(`${cli_outputs_1.RESET_ESCAPE_CODE}\n${(0, cli_outputs_1.indent)((0, colorette_1.red)('Failed tests info:'), 2)}\n`);
|
|
19
19
|
for (const workflow of workflows) {
|
|
20
20
|
const steps = flattenNestedSteps(workflow.executedSteps);
|
|
21
|
-
const hasProblems = steps.some((step) => step.checks.some((check) => !check.
|
|
21
|
+
const hasProblems = steps.some((step) => step.checks.some((check) => !check.passed) && (!step.retriesLeft || step.retriesLeft === 0));
|
|
22
22
|
if (!hasProblems)
|
|
23
23
|
continue;
|
|
24
24
|
logger.log(`${cli_outputs_1.RESET_ESCAPE_CODE}\n${(0, cli_outputs_1.indent)((0, colorette_1.gray)('Workflow name:'), 2)} ${(0, colorette_1.underline)(workflow.workflowId)}${cli_outputs_1.RESET_ESCAPE_CODE}\n`);
|
|
25
25
|
for (const step of steps) {
|
|
26
|
-
const failedStepChecks = step.checks.filter((check) => !check.
|
|
26
|
+
const failedStepChecks = step.checks.filter((check) => !check.passed);
|
|
27
27
|
if (!failedStepChecks.length)
|
|
28
28
|
continue;
|
|
29
29
|
if (step.retriesLeft && step.retriesLeft !== 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"display-errors.js","sourceRoot":"","sources":["../../../src/modules/cli-output/display-errors.ts"],"names":[],"mappings":";;AAkBA,sCAmDC;AArED,yCAA+D;AAC/D,sCAAmC;AACnC,yDAA4F;AAC5F,sDAA0D;AAI1D,MAAM,MAAM,GAAG,sBAAa,CAAC,WAAW,EAAE,CAAC;AAE3C,SAAS,kBAAkB,CAAC,KAAyC;IACnE,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC5B,IAAI,eAAe,IAAI,IAAI,EAAE,CAAC;YAC5B,OAAO,kBAAkB,CAAE,IAAgC,CAAC,aAAa,CAAC,CAAC;QAC7E,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,aAAa,CAAC,SAAoC;IAChE,MAAM,CAAC,GAAG,CAAC,GAAG,+BAAiB,KAAK,IAAA,oBAAM,EAAC,IAAA,eAAG,EAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IAE9E,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,kBAAkB,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QACzD,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAC5B,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"display-errors.js","sourceRoot":"","sources":["../../../src/modules/cli-output/display-errors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"display-files-summary-table.d.ts","sourceRoot":"","sources":["../../../src/modules/cli-output/display-files-summary-table.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAI3D,wBAAgB,wBAAwB,CACtC,WAAW,EAAE;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,OAAO,CAAC;IACrB,iBAAiB,EAAE,uBAAuB,EAAE,CAAC;IAC7C,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CACjD,EAAE,
|
|
1
|
+
{"version":3,"file":"display-files-summary-table.d.ts","sourceRoot":"","sources":["../../../src/modules/cli-output/display-files-summary-table.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAI3D,wBAAgB,wBAAwB,CACtC,WAAW,EAAE;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,OAAO,CAAC;IACrB,iBAAiB,EAAE,uBAAuB,EAAE,CAAC;IAC7C,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CACjD,EAAE,QAiFJ"}
|
|
@@ -39,7 +39,6 @@ function displayFilesSummaryTable(filesResult) {
|
|
|
39
39
|
{ name: 'Passed', width: 7 },
|
|
40
40
|
{ name: 'Failed', width: 7 },
|
|
41
41
|
{ name: 'Warnings', width: 8 },
|
|
42
|
-
{ name: 'Skipped', width: 7 },
|
|
43
42
|
];
|
|
44
43
|
let output = '';
|
|
45
44
|
// Top line
|
|
@@ -69,9 +68,6 @@ function displayFilesSummaryTable(filesResult) {
|
|
|
69
68
|
const warnings = testWorkflows.warnings > 0
|
|
70
69
|
? (0, colorette_1.yellow)(testWorkflows.warnings.toString().padEnd(9))
|
|
71
70
|
: (0, colorette_1.gray)('-'.padEnd(9));
|
|
72
|
-
const skipped = testWorkflows.skipped > 0
|
|
73
|
-
? (0, colorette_1.gray)(testWorkflows.skipped.toString().padEnd(8))
|
|
74
|
-
: (0, colorette_1.gray)('-'.padEnd(8));
|
|
75
71
|
// First pad the content, then add colors
|
|
76
72
|
const statusSymbol = testWorkflows.failed > 0 ? 'x' : '✓';
|
|
77
73
|
const paddedContent = `${statusSymbol} ${fileName}`.padEnd(maxFilenameLength + 1);
|
|
@@ -88,8 +84,6 @@ function displayFilesSummaryTable(filesResult) {
|
|
|
88
84
|
(0, colorette_1.gray)('│') +
|
|
89
85
|
` ${warnings}` +
|
|
90
86
|
(0, colorette_1.gray)('│') +
|
|
91
|
-
` ${skipped}` +
|
|
92
|
-
(0, colorette_1.gray)('│') +
|
|
93
87
|
'\n';
|
|
94
88
|
});
|
|
95
89
|
// Bottom line
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"display-files-summary-table.js","sourceRoot":"","sources":["../../../src/modules/cli-output/display-files-summary-table.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAUA,
|
|
1
|
+
{"version":3,"file":"display-files-summary-table.js","sourceRoot":"","sources":["../../../src/modules/cli-output/display-files-summary-table.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-logs.d.ts","sourceRoot":"","sources":["../../../src/modules/cli-output/json-logs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,WAAW,EACX,QAAQ,EACR,uBAAuB,
|
|
1
|
+
{"version":3,"file":"json-logs.d.ts","sourceRoot":"","sources":["../../../src/modules/cli-output/json-logs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,WAAW,EACX,QAAQ,EACR,uBAAuB,EAKxB,MAAM,aAAa,CAAC;AAErB,wBAAgB,oBAAoB,CAClC,WAAW,EAAE;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,uBAAuB,EAAE,CAAC;IAC7C,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAChD,GAAG,EAAE,WAAW,CAAC;CAClB,EAAE,GACF,QAAQ,CAAC,OAAO,CAAC,CA8BnB"}
|
|
@@ -7,17 +7,19 @@ function composeJsonLogsFiles(filesResult) {
|
|
|
7
7
|
for (const fileResult of filesResult) {
|
|
8
8
|
const { executedWorkflows } = fileResult;
|
|
9
9
|
const { secretFields } = fileResult.ctx;
|
|
10
|
-
files[fileResult.file] = (0, mask_secrets_1.maskSecrets)(
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
10
|
+
files[fileResult.file] = (0, mask_secrets_1.maskSecrets)({
|
|
11
|
+
totalRequests: fileResult.totalRequests,
|
|
12
|
+
executedWorkflows: executedWorkflows.map((workflow) => {
|
|
13
|
+
const steps = workflow.executedSteps.map((step) => composeJsonSteps(step, workflow.workflowId, fileResult.ctx));
|
|
14
|
+
const result = {
|
|
15
|
+
...workflow,
|
|
16
|
+
executedSteps: steps,
|
|
17
|
+
status: fileResult.hasProblems ? 'error' : fileResult.hasWarnings ? 'warn' : 'success',
|
|
18
|
+
totalTimeMs: fileResult.totalTimeMs,
|
|
19
|
+
};
|
|
20
|
+
return result;
|
|
21
|
+
}),
|
|
22
|
+
}, secretFields || new Set());
|
|
21
23
|
}
|
|
22
24
|
return files;
|
|
23
25
|
}
|
|
@@ -34,11 +36,11 @@ function composeJsonSteps(step, workflowId, ctx) {
|
|
|
34
36
|
method: publicStep.request?.method || '',
|
|
35
37
|
url: step.response?.requestUrl || '',
|
|
36
38
|
headers: publicStep.request?.header || {},
|
|
37
|
-
body: publicStep.request?.body
|
|
39
|
+
body: publicStep.request?.body,
|
|
38
40
|
},
|
|
39
41
|
response: {
|
|
40
42
|
statusCode: step.response?.statusCode || 0,
|
|
41
|
-
body: publicStep.response?.body
|
|
43
|
+
body: publicStep.response?.body,
|
|
42
44
|
headers: step.response?.header || {},
|
|
43
45
|
time: step.response?.time || 0,
|
|
44
46
|
},
|
|
@@ -52,7 +54,7 @@ function composeJsonSteps(step, workflowId, ctx) {
|
|
|
52
54
|
};
|
|
53
55
|
}
|
|
54
56
|
function calculateCheckStatus(check) {
|
|
55
|
-
if (check.
|
|
57
|
+
if (check.passed) {
|
|
56
58
|
return 'success';
|
|
57
59
|
}
|
|
58
60
|
if (check.severity === 'error') {
|
|
@@ -63,10 +65,10 @@ function calculateCheckStatus(check) {
|
|
|
63
65
|
function calculateStepStatus(checks) {
|
|
64
66
|
let hasWarning = false;
|
|
65
67
|
for (const check of checks) {
|
|
66
|
-
if (!check.
|
|
68
|
+
if (!check.passed && check.severity === 'error') {
|
|
67
69
|
return 'error';
|
|
68
70
|
}
|
|
69
|
-
if (!check.
|
|
71
|
+
if (!check.passed && check.severity === 'warn') {
|
|
70
72
|
hasWarning = true;
|
|
71
73
|
}
|
|
72
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-logs.js","sourceRoot":"","sources":["../../../src/modules/cli-output/json-logs.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"json-logs.js","sourceRoot":"","sources":["../../../src/modules/cli-output/json-logs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export declare function maskSecrets
|
|
1
|
+
export declare function maskSecrets<T extends {
|
|
2
2
|
[x: string]: any;
|
|
3
|
-
} | string, secretValues: Set<string>):
|
|
3
|
+
} | string>(target: T, secretValues: Set<string>): T;
|
|
4
4
|
export declare function containsSecret(value: string, secretValues: Set<string>): boolean;
|
|
5
5
|
//# sourceMappingURL=mask-secrets.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mask-secrets.d.ts","sourceRoot":"","sources":["../../../src/modules/cli-output/mask-secrets.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"mask-secrets.d.ts","sourceRoot":"","sources":["../../../src/modules/cli-output/mask-secrets.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,CAAC,SAAS;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,MAAM,EACjE,MAAM,EAAE,CAAC,EACT,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,GACxB,CAAC,CA4BH;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,OAAO,CAEhF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mask-secrets.js","sourceRoot":"","sources":["../../../src/modules/cli-output/mask-secrets.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"mask-secrets.js","sourceRoot":"","sources":["../../../src/modules/cli-output/mask-secrets.ts"],"names":[],"mappings":";;AAAA,kCA+BC;AAED,wCAEC;AAnCD,SAAgB,WAAW,CACzB,MAAS,EACT,YAAyB;IAEzB,MAAM,SAAS,GAAG,GAAW,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAE9C,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,IAAI,YAAY,GAAG,MAAgB,CAAC;QACpC,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC9B,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;QACH,OAAO,YAAiB,CAAC;IAC3B,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAClD,MAAM,oBAAoB,GAAG,CAAC,KAAa,EAAU,EAAE;QACrD,OAAO,cAAc,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IACnE,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,CAAC,OAAY,EAAE,EAAE;QACrC,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,IAAI,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACrC,OAAO,CAAC,GAAG,CAAC,GAAG,oBAAoB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;YACpD,CAAC;iBAAM,IAAI,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;gBACrE,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IACF,aAAa,CAAC,MAAM,CAAC,CAAC;IAEtB,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,cAAc,CAAC,KAAa,EAAE,YAAyB;IACrE,OAAO,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;AAC3E,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { type Replacement } from '../../types';
|
|
2
|
-
export declare function handlePayloadReplacements(payload: object, replacements: Replacement[]): void;
|
|
1
|
+
import { type RuntimeExpressionContext, type Replacement } from '../../types';
|
|
2
|
+
export declare function handlePayloadReplacements(payload: object, replacements: Replacement[], expressionContext: RuntimeExpressionContext): void;
|
|
3
3
|
//# sourceMappingURL=handle-request-body-replacements.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handle-request-body-replacements.d.ts","sourceRoot":"","sources":["../../../src/modules/config-parser/handle-request-body-replacements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"handle-request-body-replacements.d.ts","sourceRoot":"","sources":["../../../src/modules/config-parser/handle-request-body-replacements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,wBAAwB,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAK9E,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,WAAW,EAAE,EAC3B,iBAAiB,EAAE,wBAAwB,QAyB5C"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.handlePayloadReplacements = handlePayloadReplacements;
|
|
4
|
+
const runtime_expressions_1 = require("../runtime-expressions");
|
|
4
5
|
const JsonPointerLib = require('json-pointer');
|
|
5
|
-
function handlePayloadReplacements(payload, replacements) {
|
|
6
|
+
function handlePayloadReplacements(payload, replacements, expressionContext) {
|
|
6
7
|
for (const replacement of replacements) {
|
|
7
8
|
const { target, value } = replacement;
|
|
8
9
|
if (typeof target !== 'string') {
|
|
@@ -11,9 +12,13 @@ function handlePayloadReplacements(payload, replacements) {
|
|
|
11
12
|
try {
|
|
12
13
|
// Get the current value using JSON Pointer
|
|
13
14
|
const currentValue = JsonPointerLib.get(payload, target);
|
|
15
|
+
const evaluatedValue = (0, runtime_expressions_1.evaluateRuntimeExpressionPayload)({
|
|
16
|
+
payload: value,
|
|
17
|
+
context: expressionContext,
|
|
18
|
+
});
|
|
14
19
|
if (currentValue !== undefined) {
|
|
15
20
|
// Replace the value using JSON Pointer
|
|
16
|
-
JsonPointerLib.set(payload, target,
|
|
21
|
+
JsonPointerLib.set(payload, target, evaluatedValue);
|
|
17
22
|
}
|
|
18
23
|
}
|
|
19
24
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handle-request-body-replacements.js","sourceRoot":"","sources":["../../../src/modules/config-parser/handle-request-body-replacements.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"handle-request-body-replacements.js","sourceRoot":"","sources":["../../../src/modules/config-parser/handle-request-body-replacements.ts"],"names":[],"mappings":";;AAKA,8DA4BC;AAhCD,gEAA0E;AAE1E,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAE/C,SAAgB,yBAAyB,CACvC,OAAe,EACf,YAA2B,EAC3B,iBAA2C;IAE3C,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACvC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,WAAW,CAAC;QAEtC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,yBAAyB,MAAM,EAAE,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC;YACH,2CAA2C;YAC3C,MAAM,YAAY,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACzD,MAAM,cAAc,GAAG,IAAA,sDAAgC,EAAC;gBACtD,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,iBAAiB;aAC3B,CAAC,CAAC;YAEH,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;gBAC/B,uCAAuC;gBACvC,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,yBAAyB,MAAM,EAAE,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
+
import { type ReadStream } from 'node:fs';
|
|
2
|
+
import FormData = require('form-data');
|
|
1
3
|
import { type TestContext, type RequestBody } from '../../types';
|
|
2
4
|
export declare function stripFileDecorator(payload: string): string;
|
|
3
|
-
export declare function parseRequestBody(stepRequestBody: RequestBody | undefined, ctx: TestContext): Promise<{
|
|
4
|
-
payload: any | undefined;
|
|
5
|
-
contentType: string | undefined;
|
|
6
|
-
encoding: string | undefined;
|
|
5
|
+
export declare function parseRequestBody(stepRequestBody: RequestBody | undefined, ctx: TestContext): Promise<Omit<RequestBody, 'payload'> & {
|
|
6
|
+
payload: string | number | boolean | Record<string, any> | ReadStream | FormData | undefined;
|
|
7
7
|
}>;
|
|
8
8
|
//# sourceMappingURL=parse-request-body.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-request-body.d.ts","sourceRoot":"","sources":["../../../src/modules/config-parser/parse-request-body.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parse-request-body.d.ts","sourceRoot":"","sources":["../../../src/modules/config-parser/parse-request-body.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,UAAU,EAAE,MAAM,SAAS,CAAC;AAG/E,OAAO,QAAQ,GAAG,QAAQ,WAAW,CAAC,CAAC;AACvC,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAKjE,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,UAIjD;AAmFD,wBAAsB,gBAAgB,CACpC,eAAe,EAAE,WAAW,GAAG,SAAS,EACxC,GAAG,EAAE,WAAW,GACf,OAAO,CACR,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,GAAG;IAC7B,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAC;CAC9F,CACF,CAyCA"}
|
|
@@ -26,10 +26,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
26
26
|
exports.stripFileDecorator = stripFileDecorator;
|
|
27
27
|
exports.parseRequestBody = parseRequestBody;
|
|
28
28
|
const node_fs_1 = require("node:fs");
|
|
29
|
+
const querystring = __importStar(require("node:querystring"));
|
|
29
30
|
const path = __importStar(require("node:path"));
|
|
30
31
|
const FormData = require("form-data");
|
|
31
|
-
const handle_request_body_replacements_1 = require("./handle-request-body-replacements");
|
|
32
|
-
const querystring = __importStar(require("node:querystring"));
|
|
33
32
|
const KNOWN_BINARY_CONTENT_TYPES_REGEX = /^image\/(png|jpeg|gif|bmp|webp|svg\+xml)|application\/pdf$/;
|
|
34
33
|
function stripFileDecorator(payload) {
|
|
35
34
|
return payload.startsWith('$file(') && payload.endsWith(')')
|
|
@@ -108,43 +107,35 @@ async function parseRequestBody(stepRequestBody, ctx) {
|
|
|
108
107
|
payload: undefined,
|
|
109
108
|
contentType: undefined,
|
|
110
109
|
encoding: undefined,
|
|
110
|
+
replacements: undefined,
|
|
111
111
|
};
|
|
112
112
|
}
|
|
113
|
-
const { payload,
|
|
113
|
+
const { payload, contentType } = stepRequestBody;
|
|
114
114
|
if (contentType === 'multipart/form-data') {
|
|
115
115
|
const formData = new FormData();
|
|
116
116
|
const workflowFilePath = path.resolve(ctx.options.workflowPath);
|
|
117
117
|
await getRequestBodyMultipartFormData(payload, formData, workflowFilePath);
|
|
118
118
|
return {
|
|
119
|
+
...stepRequestBody,
|
|
119
120
|
payload: formData,
|
|
120
121
|
contentType: `multipart/form-data; boundary=${formData.getBoundary()}`,
|
|
121
|
-
encoding,
|
|
122
122
|
};
|
|
123
123
|
}
|
|
124
124
|
else if (contentType === 'application/octet-stream' ||
|
|
125
125
|
(typeof contentType === 'string' && KNOWN_BINARY_CONTENT_TYPES_REGEX.test(contentType))) {
|
|
126
126
|
return {
|
|
127
|
+
...stepRequestBody,
|
|
127
128
|
payload: await getRequestBodyOctetStream(payload),
|
|
128
129
|
contentType: 'application/octet-stream',
|
|
129
|
-
encoding,
|
|
130
130
|
};
|
|
131
131
|
}
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
resolvedPayload = querystring.parse(resolvedPayload);
|
|
139
|
-
}
|
|
140
|
-
if (typeof resolvedPayload === 'object') {
|
|
141
|
-
(0, handle_request_body_replacements_1.handlePayloadReplacements)(resolvedPayload, replacements);
|
|
142
|
-
}
|
|
132
|
+
else if (contentType === 'application/x-www-form-urlencoded' && typeof payload === 'string') {
|
|
133
|
+
return {
|
|
134
|
+
...stepRequestBody,
|
|
135
|
+
payload: querystring.parse(payload),
|
|
136
|
+
contentType: 'application/x-www-form-urlencoded',
|
|
137
|
+
};
|
|
143
138
|
}
|
|
144
|
-
return
|
|
145
|
-
payload: resolvedPayload,
|
|
146
|
-
contentType,
|
|
147
|
-
encoding,
|
|
148
|
-
};
|
|
139
|
+
return stepRequestBody;
|
|
149
140
|
}
|
|
150
141
|
//# sourceMappingURL=parse-request-body.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-request-body.js","sourceRoot":"","sources":["../../../src/modules/config-parser/parse-request-body.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"parse-request-body.js","sourceRoot":"","sources":["../../../src/modules/config-parser/parse-request-body.ts"],"names":[],"mappings":"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"}
|