snyk 1.764.0 → 1.765.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/cli/293.index.js +61 -55
- package/dist/cli/293.index.js.map +1 -1
- package/dist/cli/409.index.js +2 -2
- package/dist/cli/409.index.js.map +1 -1
- package/dist/cli/64.index.js +41 -38
- package/dist/cli/64.index.js.map +1 -1
- package/dist/cli/959.index.js +12 -12
- package/dist/cli/959.index.js.map +1 -1
- package/dist/cli/index.js +25 -41
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/thirdPartyNotice.json +2 -2
- package/dist/lib/ecosystems/types.d.ts +7 -0
- package/dist/lib/snyk-test/legacy.d.ts +2 -1
- package/dist/lib/spinner.d.ts +3 -4
- package/help/commands-docs/_SNYK_COMMAND_OPTIONS.md +1 -1
- package/help/commands-man/snyk-auth.1 +3 -3
- package/help/commands-man/snyk-code.1 +3 -3
- package/help/commands-man/snyk-config.1 +4 -4
- package/help/commands-man/snyk-container.1 +4 -4
- package/help/commands-man/snyk-help.1 +3 -3
- package/help/commands-man/snyk-iac.1 +3 -3
- package/help/commands-man/snyk-ignore.1 +5 -5
- package/help/commands-man/snyk-monitor.1 +8 -8
- package/help/commands-man/snyk-policy.1 +3 -3
- package/help/commands-man/snyk-protect.1 +5 -5
- package/help/commands-man/snyk-test.1 +8 -8
- package/help/commands-man/snyk-wizard.1 +5 -5
- package/help/commands-man/snyk-woof.1 +3 -3
- package/help/commands-man/snyk.1 +8 -8
- package/help/commands-md/snyk-monitor.md +1 -1
- package/help/commands-md/snyk-test.md +1 -1
- package/help/commands-md/snyk.md +1 -1
- package/help/commands-txt/snyk-auth.txt +2 -2
- package/help/commands-txt/snyk-code.txt +4 -4
- package/help/commands-txt/snyk-config.txt +4 -4
- package/help/commands-txt/snyk-container.txt +4 -4
- package/help/commands-txt/snyk-help.txt +2 -2
- package/help/commands-txt/snyk-iac.txt +23 -23
- package/help/commands-txt/snyk-ignore.txt +23 -23
- package/help/commands-txt/snyk-monitor.txt +92 -92
- package/help/commands-txt/snyk-policy.txt +2 -2
- package/help/commands-txt/snyk-protect.txt +2 -2
- package/help/commands-txt/snyk-test.txt +92 -92
- package/help/commands-txt/snyk-wizard.txt +4 -4
- package/help/commands-txt/snyk-woof.txt +2 -2
- package/help/commands-txt/snyk.txt +95 -95
- package/package.json +2 -2
package/dist/cli/293.index.js
CHANGED
|
@@ -48,7 +48,7 @@ const options_validator_1 = __webpack_require__(1570);
|
|
|
48
48
|
const types_1 = __webpack_require__(94055);
|
|
49
49
|
const config_1 = __webpack_require__(22541);
|
|
50
50
|
const detect = __webpack_require__(45318);
|
|
51
|
-
const
|
|
51
|
+
const spinner_1 = __webpack_require__(86766);
|
|
52
52
|
const analytics = __webpack_require__(82744);
|
|
53
53
|
const api_token_1 = __webpack_require__(95181);
|
|
54
54
|
const print_deps_1 = __webpack_require__(79792);
|
|
@@ -138,7 +138,7 @@ async function monitor(...args0) {
|
|
|
138
138
|
(packageManager ? packageManager : analysisType) +
|
|
139
139
|
' dependencies for ' +
|
|
140
140
|
displayPath;
|
|
141
|
-
await spinner(analyzingDepsSpinnerLabel);
|
|
141
|
+
await spinner_1.spinner(analyzingDepsSpinnerLabel);
|
|
142
142
|
// Scan the project dependencies via a plugin
|
|
143
143
|
debug('getDepsFromPlugin ...');
|
|
144
144
|
// each plugin will be asked to scan once per path
|
|
@@ -147,7 +147,7 @@ async function monitor(...args0) {
|
|
|
147
147
|
...options,
|
|
148
148
|
path,
|
|
149
149
|
packageManager,
|
|
150
|
-
}), spinner.clear(analyzingDepsSpinnerLabel));
|
|
150
|
+
}), spinner_1.spinner.clear(analyzingDepsSpinnerLabel));
|
|
151
151
|
analytics.add('pluginName', inspectResult.plugin.name);
|
|
152
152
|
// We send results from "all-sub-projects" scanning as different Monitor objects
|
|
153
153
|
// multi result will become default, so start migrating code to always work with it
|
|
@@ -170,7 +170,7 @@ async function monitor(...args0) {
|
|
|
170
170
|
});
|
|
171
171
|
}
|
|
172
172
|
const postingMonitorSpinnerLabel = 'Posting monitor snapshot for ' + displayPath + ' ...';
|
|
173
|
-
await spinner(postingMonitorSpinnerLabel);
|
|
173
|
+
await spinner_1.spinner(postingMonitorSpinnerLabel);
|
|
174
174
|
// Post the project dependencies to the Registry
|
|
175
175
|
for (const projectDeps of perProjectResult.scannedProjects) {
|
|
176
176
|
try {
|
|
@@ -193,7 +193,7 @@ async function monitor(...args0) {
|
|
|
193
193
|
const targetFileRelativePath = projectDeps.plugin.targetFile ||
|
|
194
194
|
(tFile && pathUtil.join(pathUtil.resolve(path), tFile)) ||
|
|
195
195
|
'';
|
|
196
|
-
const res = await promiseOrCleanup(monitor_1.monitor(path, generateMonitorMeta(options, extractedPackageManager), projectDeps, options, projectDeps.plugin, targetFileRelativePath, contributors, generateProjectAttributes(options), generateTags(options)), spinner.clear(postingMonitorSpinnerLabel));
|
|
196
|
+
const res = await promiseOrCleanup(monitor_1.monitor(path, generateMonitorMeta(options, extractedPackageManager), projectDeps, options, projectDeps.plugin, targetFileRelativePath, contributors, generateProjectAttributes(options), generateTags(options)), spinner_1.spinner.clear(postingMonitorSpinnerLabel));
|
|
197
197
|
res.path = path;
|
|
198
198
|
const monOutput = formatters_1.formatMonitorOutput(extractedPackageManager, res, options, projectName, await get_extra_project_count_1.getExtraProjectCount(path, options, inspectResult));
|
|
199
199
|
// push a good result
|
|
@@ -211,7 +211,7 @@ async function monitor(...args0) {
|
|
|
211
211
|
results.push({ ok: false, data: err, path });
|
|
212
212
|
}
|
|
213
213
|
finally {
|
|
214
|
-
spinner.clearAll();
|
|
214
|
+
spinner_1.spinner.clearAll();
|
|
215
215
|
}
|
|
216
216
|
}
|
|
217
217
|
// Part 2: process the output from the Registry
|
|
@@ -584,7 +584,7 @@ const chalk_1 = __webpack_require__(32589);
|
|
|
584
584
|
const config_1 = __webpack_require__(22541);
|
|
585
585
|
const is_ci_1 = __webpack_require__(10090);
|
|
586
586
|
const promise_1 = __webpack_require__(90430);
|
|
587
|
-
const
|
|
587
|
+
const spinner_1 = __webpack_require__(86766);
|
|
588
588
|
const plugins_1 = __webpack_require__(78053);
|
|
589
589
|
const formatters_1 = __webpack_require__(81329);
|
|
590
590
|
const get_extra_project_count_1 = __webpack_require__(34355);
|
|
@@ -601,7 +601,7 @@ async function monitorEcosystem(ecosystem, paths, options) {
|
|
|
601
601
|
const scanResultsByPath = {};
|
|
602
602
|
for (const path of paths) {
|
|
603
603
|
try {
|
|
604
|
-
await spinner(`Analyzing dependencies in ${path}`);
|
|
604
|
+
await spinner_1.spinner(`Analyzing dependencies in ${path}`);
|
|
605
605
|
options.path = path;
|
|
606
606
|
const pluginResponse = await plugin.scan(options);
|
|
607
607
|
scanResultsByPath[path] = pluginResponse.scanResults;
|
|
@@ -618,7 +618,7 @@ async function monitorEcosystem(ecosystem, paths, options) {
|
|
|
618
618
|
throw error;
|
|
619
619
|
}
|
|
620
620
|
finally {
|
|
621
|
-
spinner.clearAll();
|
|
621
|
+
spinner_1.spinner.clearAll();
|
|
622
622
|
}
|
|
623
623
|
}
|
|
624
624
|
const [monitorResults, errors] = await selectAndExecuteMonitorStrategy(ecosystem, scanResultsByPath, options);
|
|
@@ -653,7 +653,7 @@ async function monitorDependencies(scans, options) {
|
|
|
653
653
|
const results = [];
|
|
654
654
|
const errors = [];
|
|
655
655
|
for (const [path, scanResults] of Object.entries(scans)) {
|
|
656
|
-
await spinner(`Monitoring dependencies in ${path}`);
|
|
656
|
+
await spinner_1.spinner(`Monitoring dependencies in ${path}`);
|
|
657
657
|
for (const scanResult of scanResults) {
|
|
658
658
|
const monitorDependenciesRequest = await generateMonitorDependenciesRequest(scanResult, options);
|
|
659
659
|
const configOrg = config_1.default.org ? decodeURIComponent(config_1.default.org) : undefined;
|
|
@@ -692,7 +692,7 @@ async function monitorDependencies(scans, options) {
|
|
|
692
692
|
});
|
|
693
693
|
}
|
|
694
694
|
}
|
|
695
|
-
spinner.clearAll();
|
|
695
|
+
spinner_1.spinner.clearAll();
|
|
696
696
|
}
|
|
697
697
|
return [results, errors];
|
|
698
698
|
}
|
|
@@ -827,7 +827,7 @@ exports.findAndLoadPolicyForScanResult = findAndLoadPolicyForScanResult;
|
|
|
827
827
|
|
|
828
828
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
829
829
|
exports.resolveAndMonitorFacts = void 0;
|
|
830
|
-
const
|
|
830
|
+
const spinner_1 = __webpack_require__(86766);
|
|
831
831
|
const polling_monitor_1 = __webpack_require__(59354);
|
|
832
832
|
const plugin_analytics_1 = __webpack_require__(33077);
|
|
833
833
|
const errors_1 = __webpack_require__(55191);
|
|
@@ -836,7 +836,7 @@ async function resolveAndMonitorFacts(scans, options) {
|
|
|
836
836
|
const results = [];
|
|
837
837
|
const errors = [];
|
|
838
838
|
for (const [path, scanResults] of Object.entries(scans)) {
|
|
839
|
-
await spinner(`Resolving and Monitoring fileSignatures in ${path}`);
|
|
839
|
+
await spinner_1.spinner(`Resolving and Monitoring fileSignatures in ${path}`);
|
|
840
840
|
for (const scanResult of scanResults) {
|
|
841
841
|
try {
|
|
842
842
|
const res = await polling_monitor_1.requestMonitorPollingToken(options, true, scanResult);
|
|
@@ -868,7 +868,7 @@ async function resolveAndMonitorFacts(scans, options) {
|
|
|
868
868
|
});
|
|
869
869
|
}
|
|
870
870
|
}
|
|
871
|
-
spinner.clearAll();
|
|
871
|
+
spinner_1.spinner.clearAll();
|
|
872
872
|
}
|
|
873
873
|
return [results, errors];
|
|
874
874
|
}
|
|
@@ -884,14 +884,14 @@ exports.resolveAndMonitorFacts = resolveAndMonitorFacts;
|
|
|
884
884
|
|
|
885
885
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
886
886
|
exports.resolveAndTestFacts = void 0;
|
|
887
|
-
const
|
|
887
|
+
const spinner_1 = __webpack_require__(86766);
|
|
888
888
|
const polling_test_1 = __webpack_require__(77584);
|
|
889
889
|
const plugin_analytics_1 = __webpack_require__(33077);
|
|
890
890
|
async function resolveAndTestFacts(ecosystem, scans, options) {
|
|
891
891
|
const results = [];
|
|
892
892
|
const errors = [];
|
|
893
893
|
for (const [path, scanResults] of Object.entries(scans)) {
|
|
894
|
-
await spinner(`Resolving and Testing fileSignatures in ${path}`);
|
|
894
|
+
await spinner_1.spinner(`Resolving and Testing fileSignatures in ${path}`);
|
|
895
895
|
for (const scanResult of scanResults) {
|
|
896
896
|
try {
|
|
897
897
|
const res = await polling_test_1.requestTestPollingToken(options, true, scanResult);
|
|
@@ -906,6 +906,7 @@ async function resolveAndTestFacts(ecosystem, scans, options) {
|
|
|
906
906
|
issuesData: response === null || response === void 0 ? void 0 : response.issuesData,
|
|
907
907
|
depGraphData: response === null || response === void 0 ? void 0 : response.depGraphData,
|
|
908
908
|
depsFilePaths: response === null || response === void 0 ? void 0 : response.depsFilePaths,
|
|
909
|
+
fileSignaturesDetails: response === null || response === void 0 ? void 0 : response.fileSignaturesDetails,
|
|
909
910
|
});
|
|
910
911
|
}
|
|
911
912
|
catch (error) {
|
|
@@ -919,7 +920,7 @@ async function resolveAndTestFacts(ecosystem, scans, options) {
|
|
|
919
920
|
}
|
|
920
921
|
}
|
|
921
922
|
}
|
|
922
|
-
spinner.clearAll();
|
|
923
|
+
spinner_1.spinner.clearAll();
|
|
923
924
|
return [results, errors];
|
|
924
925
|
}
|
|
925
926
|
exports.resolveAndTestFacts = resolveAndTestFacts;
|
|
@@ -938,7 +939,7 @@ const config_1 = __webpack_require__(22541);
|
|
|
938
939
|
const is_ci_1 = __webpack_require__(10090);
|
|
939
940
|
const promise_1 = __webpack_require__(90430);
|
|
940
941
|
const types_1 = __webpack_require__(55246);
|
|
941
|
-
const
|
|
942
|
+
const spinner_1 = __webpack_require__(86766);
|
|
942
943
|
const plugins_1 = __webpack_require__(78053);
|
|
943
944
|
const common_1 = __webpack_require__(53110);
|
|
944
945
|
const api_token_1 = __webpack_require__(95181);
|
|
@@ -953,12 +954,12 @@ async function testEcosystem(ecosystem, paths, options) {
|
|
|
953
954
|
}
|
|
954
955
|
const scanResultsByPath = {};
|
|
955
956
|
for (const path of paths) {
|
|
956
|
-
await spinner(`Scanning dependencies in ${path}`);
|
|
957
|
+
await spinner_1.spinner(`Scanning dependencies in ${path}`);
|
|
957
958
|
options.path = path;
|
|
958
959
|
const pluginResponse = await plugin.scan(options);
|
|
959
960
|
scanResultsByPath[path] = pluginResponse.scanResults;
|
|
960
961
|
}
|
|
961
|
-
spinner.clearAll();
|
|
962
|
+
spinner_1.spinner.clearAll();
|
|
962
963
|
const [testResults, errors] = await selectAndExecuteTestStrategy(ecosystem, scanResultsByPath, options);
|
|
963
964
|
const stringifiedData = JSON.stringify(testResults, null, 2);
|
|
964
965
|
if (options.json) {
|
|
@@ -981,7 +982,7 @@ async function testDependencies(scans, options) {
|
|
|
981
982
|
const results = [];
|
|
982
983
|
const errors = [];
|
|
983
984
|
for (const [path, scanResults] of Object.entries(scans)) {
|
|
984
|
-
await spinner(`Testing dependencies in ${path}`);
|
|
985
|
+
await spinner_1.spinner(`Testing dependencies in ${path}`);
|
|
985
986
|
for (const scanResult of scanResults) {
|
|
986
987
|
const payload = {
|
|
987
988
|
method: 'POST',
|
|
@@ -1012,7 +1013,7 @@ async function testDependencies(scans, options) {
|
|
|
1012
1013
|
}
|
|
1013
1014
|
}
|
|
1014
1015
|
}
|
|
1015
|
-
spinner.clearAll();
|
|
1016
|
+
spinner_1.spinner.clearAll();
|
|
1016
1017
|
return [results, errors];
|
|
1017
1018
|
}
|
|
1018
1019
|
|
|
@@ -4258,7 +4259,7 @@ exports.parse = void 0;
|
|
|
4258
4259
|
const baseDebug = __webpack_require__(15158);
|
|
4259
4260
|
const debug = baseDebug('snyk-test');
|
|
4260
4261
|
const path = __webpack_require__(85622);
|
|
4261
|
-
const
|
|
4262
|
+
const spinner_1 = __webpack_require__(86766);
|
|
4262
4263
|
const analytics = __webpack_require__(82744);
|
|
4263
4264
|
const fs = __webpack_require__(35747);
|
|
4264
4265
|
const lockFileParser = __webpack_require__(423);
|
|
@@ -4288,12 +4289,12 @@ async function parse(root, targetFile, options) {
|
|
|
4288
4289
|
const resolveModuleSpinnerLabel = `Analyzing npm dependencies for ${lockFileFullPath}`;
|
|
4289
4290
|
debug(resolveModuleSpinnerLabel);
|
|
4290
4291
|
try {
|
|
4291
|
-
await spinner(resolveModuleSpinnerLabel);
|
|
4292
|
+
await spinner_1.spinner(resolveModuleSpinnerLabel);
|
|
4292
4293
|
const strictOutOfSync = options.strictOutOfSync !== false;
|
|
4293
4294
|
return lockFileParser.buildDepTreeFromFiles(root, manifestFileFullPath, lockFileFullPath, options.dev, strictOutOfSync);
|
|
4294
4295
|
}
|
|
4295
4296
|
finally {
|
|
4296
|
-
await spinner.clear(resolveModuleSpinnerLabel)();
|
|
4297
|
+
await spinner_1.spinner.clear(resolveModuleSpinnerLabel)();
|
|
4297
4298
|
}
|
|
4298
4299
|
}
|
|
4299
4300
|
exports.parse = parse;
|
|
@@ -4313,7 +4314,7 @@ const fs = __webpack_require__(35747);
|
|
|
4313
4314
|
const resolveNodeDeps = __webpack_require__(40068);
|
|
4314
4315
|
const baseDebug = __webpack_require__(15158);
|
|
4315
4316
|
const isEmpty = __webpack_require__(99245);
|
|
4316
|
-
const
|
|
4317
|
+
const spinner_1 = __webpack_require__(86766);
|
|
4317
4318
|
const analytics = __webpack_require__(82744);
|
|
4318
4319
|
const get_file_contents_1 = __webpack_require__(84210);
|
|
4319
4320
|
const debug = baseDebug('snyk-nodejs-plugin');
|
|
@@ -4362,12 +4363,12 @@ async function parse(root, targetFile, options) {
|
|
|
4362
4363
|
const resolveModuleSpinnerLabel = 'Analyzing npm dependencies for ' +
|
|
4363
4364
|
path.dirname(path.resolve(root, targetFile));
|
|
4364
4365
|
try {
|
|
4365
|
-
await spinner.clear(resolveModuleSpinnerLabel)();
|
|
4366
|
-
await spinner(resolveModuleSpinnerLabel);
|
|
4366
|
+
await spinner_1.spinner.clear(resolveModuleSpinnerLabel)();
|
|
4367
|
+
await spinner_1.spinner(resolveModuleSpinnerLabel);
|
|
4367
4368
|
return resolveNodeDeps(root, Object.assign({}, options, { noFromArrays: true }));
|
|
4368
4369
|
}
|
|
4369
4370
|
finally {
|
|
4370
|
-
await spinner.clear(resolveModuleSpinnerLabel)();
|
|
4371
|
+
await spinner_1.spinner.clear(resolveModuleSpinnerLabel)();
|
|
4371
4372
|
}
|
|
4372
4373
|
}
|
|
4373
4374
|
exports.parse = parse;
|
|
@@ -4696,16 +4697,16 @@ const code_client_1 = __webpack_require__(95951);
|
|
|
4696
4697
|
const legacy_1 = __webpack_require__(34013);
|
|
4697
4698
|
const api_token_1 = __webpack_require__(95181);
|
|
4698
4699
|
const config_1 = __webpack_require__(22541);
|
|
4699
|
-
const
|
|
4700
|
+
const spinner_1 = __webpack_require__(86766);
|
|
4700
4701
|
const utils_1 = __webpack_require__(33113);
|
|
4701
4702
|
const unsupported_feature_snyk_code_error_1 = __webpack_require__(90551);
|
|
4702
4703
|
const proxy_from_env_1 = __webpack_require__(21394);
|
|
4703
4704
|
const global_agent_1 = __webpack_require__(97959);
|
|
4704
4705
|
async function getCodeAnalysisAndParseResults(root, options) {
|
|
4705
|
-
await spinner.clearAll();
|
|
4706
|
+
await spinner_1.spinner.clearAll();
|
|
4706
4707
|
utils_1.analysisProgressUpdate();
|
|
4707
4708
|
const codeAnalysis = await getCodeAnalysis(root, options);
|
|
4708
|
-
spinner.clearAll();
|
|
4709
|
+
spinner_1.spinner.clearAll();
|
|
4709
4710
|
return parseSecurityResults(codeAnalysis);
|
|
4710
4711
|
}
|
|
4711
4712
|
exports.getCodeAnalysisAndParseResults = getCodeAnalysisAndParseResults;
|
|
@@ -5089,15 +5090,15 @@ Object.defineProperty(exports, "analysisProgressUpdate", ({ enumerable: true, ge
|
|
|
5089
5090
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
5090
5091
|
exports.analysisProgressUpdate = void 0;
|
|
5091
5092
|
const code_client_1 = __webpack_require__(95951);
|
|
5092
|
-
const
|
|
5093
|
+
const spinner_1 = __webpack_require__(86766);
|
|
5093
5094
|
function analysisProgressUpdate() {
|
|
5094
5095
|
let currentMessage = '';
|
|
5095
5096
|
const showSpinner = (message) => {
|
|
5096
5097
|
if (currentMessage === message)
|
|
5097
5098
|
return;
|
|
5098
|
-
spinner.clear(currentMessage)();
|
|
5099
|
+
spinner_1.spinner.clear(currentMessage)();
|
|
5099
5100
|
currentMessage = message;
|
|
5100
|
-
return spinner(message);
|
|
5101
|
+
return spinner_1.spinner(message);
|
|
5101
5102
|
};
|
|
5102
5103
|
code_client_1.emitter.on('supportedFilesLoaded', () => showSpinner(`Supported extensions loaded`));
|
|
5103
5104
|
code_client_1.emitter.on('scanFilesProgress', (processed) => showSpinner(`Scanning files: ${Math.round(processed / 100)}00`));
|
|
@@ -5386,8 +5387,14 @@ async function pollingTestWithTokenUntilDone(token, type, options, pollInterval,
|
|
|
5386
5387
|
};
|
|
5387
5388
|
const response = await promise_1.makeRequest(payload);
|
|
5388
5389
|
if (response.result) {
|
|
5389
|
-
const { issues, issuesData, depGraphData, depsFilePaths } = response.result;
|
|
5390
|
-
return {
|
|
5390
|
+
const { issues, issuesData, depGraphData, depsFilePaths, fileSignaturesDetails, } = response.result;
|
|
5391
|
+
return {
|
|
5392
|
+
issues,
|
|
5393
|
+
issuesData,
|
|
5394
|
+
depGraphData,
|
|
5395
|
+
depsFilePaths,
|
|
5396
|
+
fileSignaturesDetails,
|
|
5397
|
+
};
|
|
5391
5398
|
}
|
|
5392
5399
|
await common_2.delayNextStep(attemptsCount, maxAttempts, pollInterval);
|
|
5393
5400
|
return await pollingTestWithTokenUntilDone(token, type, options, pollInterval, attemptsCount, maxAttempts);
|
|
@@ -5746,7 +5753,7 @@ const config_1 = __webpack_require__(22541);
|
|
|
5746
5753
|
const is_ci_1 = __webpack_require__(10090);
|
|
5747
5754
|
const ecosystems_1 = __webpack_require__(5168);
|
|
5748
5755
|
const common_1 = __webpack_require__(53110);
|
|
5749
|
-
const
|
|
5756
|
+
const spinner_1 = __webpack_require__(86766);
|
|
5750
5757
|
const policy_1 = __webpack_require__(4669);
|
|
5751
5758
|
const api_token_1 = __webpack_require__(95181);
|
|
5752
5759
|
const errors_1 = __webpack_require__(55191);
|
|
@@ -5766,9 +5773,9 @@ async function assembleEcosystemPayloads(ecosystem, options) {
|
|
|
5766
5773
|
analysisTypeText +
|
|
5767
5774
|
(path.relative('.', path.join(options.path, options.file || '')) ||
|
|
5768
5775
|
path.relative('..', '.') + ' project dir');
|
|
5769
|
-
spinner.clear(spinnerLbl)();
|
|
5776
|
+
spinner_1.spinner.clear(spinnerLbl)();
|
|
5770
5777
|
if (!options.quiet) {
|
|
5771
|
-
await spinner(spinnerLbl);
|
|
5778
|
+
await spinner_1.spinner(spinnerLbl);
|
|
5772
5779
|
}
|
|
5773
5780
|
try {
|
|
5774
5781
|
const plugin = ecosystems_1.getPlugin(ecosystem);
|
|
@@ -5811,7 +5818,7 @@ async function assembleEcosystemPayloads(ecosystem, options) {
|
|
|
5811
5818
|
throw error;
|
|
5812
5819
|
}
|
|
5813
5820
|
finally {
|
|
5814
|
-
spinner.clear(spinnerLbl)();
|
|
5821
|
+
spinner_1.spinner.clear(spinnerLbl)();
|
|
5815
5822
|
}
|
|
5816
5823
|
}
|
|
5817
5824
|
exports.assembleEcosystemPayloads = assembleEcosystemPayloads;
|
|
@@ -6129,7 +6136,7 @@ const api_token_1 = __webpack_require__(95181);
|
|
|
6129
6136
|
const ecosystems_1 = __webpack_require__(5168);
|
|
6130
6137
|
const assemble_payloads_1 = __webpack_require__(38080);
|
|
6131
6138
|
const request_1 = __webpack_require__(52050);
|
|
6132
|
-
const
|
|
6139
|
+
const spinner_1 = __webpack_require__(86766);
|
|
6133
6140
|
const debug = debugModule('snyk:run-test');
|
|
6134
6141
|
const ANALYTICS_PAYLOAD_MAX_LENGTH = 1024;
|
|
6135
6142
|
function prepareResponseForParsing(payload, response, options) {
|
|
@@ -6237,9 +6244,9 @@ async function sendAndParseResults(payloads, spinnerLbl, root, options) {
|
|
|
6237
6244
|
const maxConcurrent = 25;
|
|
6238
6245
|
const queue = new Queue(maxConcurrent);
|
|
6239
6246
|
const iacResults = [];
|
|
6240
|
-
await spinner.clear(spinnerLbl)();
|
|
6247
|
+
await spinner_1.spinner.clear(spinnerLbl)();
|
|
6241
6248
|
if (!options.quiet) {
|
|
6242
|
-
await spinner(spinnerLbl);
|
|
6249
|
+
await spinner_1.spinner(spinnerLbl);
|
|
6243
6250
|
}
|
|
6244
6251
|
for (const payload of payloads) {
|
|
6245
6252
|
iacResults.push(queue.add(async () => {
|
|
@@ -6254,9 +6261,9 @@ async function sendAndParseResults(payloads, spinnerLbl, root, options) {
|
|
|
6254
6261
|
}
|
|
6255
6262
|
const results = [];
|
|
6256
6263
|
for (const payload of payloads) {
|
|
6257
|
-
await spinner.clear(spinnerLbl)();
|
|
6264
|
+
await spinner_1.spinner.clear(spinnerLbl)();
|
|
6258
6265
|
if (!options.quiet) {
|
|
6259
|
-
await spinner(spinnerLbl);
|
|
6266
|
+
await spinner_1.spinner(spinnerLbl);
|
|
6260
6267
|
}
|
|
6261
6268
|
/** sendTestPayload() deletes the request.body from the payload once completed. */
|
|
6262
6269
|
const payloadCopy = Object.assign({}, payload);
|
|
@@ -6264,7 +6271,7 @@ async function sendAndParseResults(payloads, spinnerLbl, root, options) {
|
|
|
6264
6271
|
const { depGraph, payloadPolicy, pkgManager, targetFile, projectName, foundProjectCount, displayTargetFile, dockerfilePackages, platform, scanResult, } = prepareResponseForParsing(payloadCopy, res, options);
|
|
6265
6272
|
const ecosystem = ecosystems_1.getEcosystem(options);
|
|
6266
6273
|
if (ecosystem && options['print-deps']) {
|
|
6267
|
-
await spinner.clear(spinnerLbl)();
|
|
6274
|
+
await spinner_1.spinner.clear(spinnerLbl)();
|
|
6268
6275
|
await print_deps_1.maybePrintDepGraph(options, depGraph);
|
|
6269
6276
|
}
|
|
6270
6277
|
const legacyRes = convertIssuesToAffectedPkgs(res);
|
|
@@ -6315,7 +6322,7 @@ async function runTest(projectType, root, options) {
|
|
|
6315
6322
|
`Failed to test ${projectType} project`, error.code);
|
|
6316
6323
|
}
|
|
6317
6324
|
finally {
|
|
6318
|
-
spinner.clear(spinnerLbl)();
|
|
6325
|
+
spinner_1.spinner.clear(spinnerLbl)();
|
|
6319
6326
|
}
|
|
6320
6327
|
}
|
|
6321
6328
|
exports.runTest = runTest;
|
|
@@ -6458,9 +6465,9 @@ async function assembleLocalPayloads(root, options) {
|
|
|
6458
6465
|
path.relative('..', '.') + ' project dir');
|
|
6459
6466
|
try {
|
|
6460
6467
|
const payloads = [];
|
|
6461
|
-
await spinner.clear(spinnerLbl)();
|
|
6468
|
+
await spinner_1.spinner.clear(spinnerLbl)();
|
|
6462
6469
|
if (!options.quiet) {
|
|
6463
|
-
await spinner(spinnerLbl);
|
|
6470
|
+
await spinner_1.spinner(spinnerLbl);
|
|
6464
6471
|
}
|
|
6465
6472
|
if (options.iac) {
|
|
6466
6473
|
return run_iac_test_1.assembleIacLocalPayloads(root, options);
|
|
@@ -6468,7 +6475,7 @@ async function assembleLocalPayloads(root, options) {
|
|
|
6468
6475
|
const deps = await get_deps_from_plugin_1.getDepsFromPlugin(root, options);
|
|
6469
6476
|
const failedResults = deps.failedResults;
|
|
6470
6477
|
if (failedResults === null || failedResults === void 0 ? void 0 : failedResults.length) {
|
|
6471
|
-
await spinner.clear(spinnerLbl)();
|
|
6478
|
+
await spinner_1.spinner.clear(spinnerLbl)();
|
|
6472
6479
|
if (!options.json && !options.quiet) {
|
|
6473
6480
|
console.warn(chalk_1.default.bold.red(`${theme_1.icon.ISSUE} ${failedResults.length}/${failedResults.length +
|
|
6474
6481
|
deps.scannedProjects
|
|
@@ -6510,11 +6517,11 @@ async function assembleLocalPayloads(root, options) {
|
|
|
6510
6517
|
: scannedProject.depTree;
|
|
6511
6518
|
if (options['print-deps']) {
|
|
6512
6519
|
if (scannedProject.depGraph) {
|
|
6513
|
-
await spinner.clear(spinnerLbl)();
|
|
6520
|
+
await spinner_1.spinner.clear(spinnerLbl)();
|
|
6514
6521
|
print_deps_1.maybePrintDepGraph(options, pkg);
|
|
6515
6522
|
}
|
|
6516
6523
|
else {
|
|
6517
|
-
await spinner.clear(spinnerLbl)();
|
|
6524
|
+
await spinner_1.spinner.clear(spinnerLbl)();
|
|
6518
6525
|
print_deps_1.maybePrintDepTree(options, pkg);
|
|
6519
6526
|
}
|
|
6520
6527
|
}
|
|
@@ -6660,7 +6667,7 @@ async function assembleLocalPayloads(root, options) {
|
|
|
6660
6667
|
return payloads;
|
|
6661
6668
|
}
|
|
6662
6669
|
finally {
|
|
6663
|
-
await spinner.clear(spinnerLbl)();
|
|
6670
|
+
await spinner_1.spinner.clear(spinnerLbl)();
|
|
6664
6671
|
}
|
|
6665
6672
|
}
|
|
6666
6673
|
// Payload to send to the Registry for scanning a remote package.
|
|
@@ -6772,7 +6779,6 @@ Object.defineProperty(snyk, 'api', {
|
|
|
6772
6779
|
|
|
6773
6780
|
snyk.test = __webpack_require__(53378);
|
|
6774
6781
|
snyk.policy = __webpack_require__(70535);
|
|
6775
|
-
snyk.isRequired = true; // changed to false when loaded via cli
|
|
6776
6782
|
|
|
6777
6783
|
// this is the user config, and not the internal config
|
|
6778
6784
|
snyk.config = __webpack_require__(28137).config;
|