snyk 1.1201.0 → 1.1202.0

package/dist/cli/784.index.js

@@ -1276,7 +1276,6 @@ const api_token_1 = __webpack_require__(95181);
 const resolve_test_facts_1 = __webpack_require__(85164);
 const common_2 = __webpack_require__(69813);
 const utils_1 = __webpack_require__(97875);
-const json_1 = __webpack_require__(27019);
 async function testEcosystem(ecosystem, paths, options) {
     const plugin = plugins_1.getPlugin(ecosystem);
     // TODO: this is an intermediate step before consolidating ecosystem plugins
@@ -1317,12 +1316,7 @@ exports.selectAndExecuteTestStrategy = selectAndExecuteTestStrategy;
 async function formatUnmanagedResults(results, target) {
     const [result] = await utils_1.getUnmanagedDepGraph(results);
     const depGraph = utils_1.convertDepGraph(result);
-    const template = `DepGraph data:
-${json_1.jsonStringifyLargeObject(depGraph)}
-DepGraph target:
-${target}
-DepGraph end`;
-    return types_1.TestCommandResult.createJsonTestCommandResult(template);
+    return types_1.TestCommandResult.createJsonTestCommandResult(common_1.depGraphToOutputString(depGraph, target));
 }
 exports.formatUnmanagedResults = formatUnmanagedResults;
 async function testDependencies(scans, options) {
@@ -2722,38 +2716,6 @@ function isMultiProjectScan(options) {
 exports.isMultiProjectScan = isMultiProjectScan;
 
 
-/***/ }),
-
-/***/ 27019:
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.jsonStringifyLargeObject = void 0;
-const debug = __webpack_require__(15158)('snyk-json');
-/**
- * Attempt to json-stringify an object which is potentially very large and might exceed the string limit.
- * If it does exceed the string limit, try again without pretty-print to hopefully come out below the string limit.
- * @param obj the object from which you want to get a JSON string
- */
-function jsonStringifyLargeObject(obj) {
-    let res = '';
-    try {
-        // first try pretty-print
-        res = JSON.stringify(obj, null, 2);
-        return res;
-    }
-    catch (err) {
-        // if that doesn't work, try non-pretty print
-        debug('JSON.stringify failed - trying again without pretty print', err);
-        res = JSON.stringify(obj);
-        return res;
-    }
-}
-exports.jsonStringifyLargeObject = jsonStringifyLargeObject;
-
-
 /***/ }),
 
 /***/ 80777:
@@ -6148,6 +6110,15 @@ async function assembleEcosystemPayloads(ecosystem, options) {
             // WARNING! This mutates the payload. The project name logic should be handled in the plugin.
             scanResult.name =
                 options['project-name'] || config_1.default.PROJECT_NAME || scanResult.name;
+            if (options['print-graph'] && !options['print-deps']) {
+                // not every scanResult has a 'depGraph' fact, for example the JAR
+                // fingerprints. I don't think we have another option than to skip
+                // those.
+                const dg = scanResult.facts.find((dg) => dg.type === 'depGraph');
+                if (dg) {
+                    console.log(common_1.depGraphToOutputString(dg.data.toJSON(), constructProjectName(scanResult)));
+                }
+            }
             payloads.push({
                 method: 'POST',
                 url: `${config_1.default.API}${options.testDepGraphDockerEndpoint ||
@@ -6179,6 +6150,32 @@ async function assembleEcosystemPayloads(ecosystem, options) {
     }
 }
 exports.assembleEcosystemPayloads = assembleEcosystemPayloads;
+// constructProjectName attempts to construct the project name the same way that
+// registry does. This is a bit difficult because in Registry, the code is
+// distributed over multiple functions and files that need to be kept in sync...
+function constructProjectName(sr) {
+    var _a, _b;
+    let suffix = '';
+    if (sr.identity.targetFile) {
+        suffix = ':' + sr.identity.targetFile;
+    }
+    if (sr.name) {
+        return sr.name + suffix;
+    }
+    const targetImage = (_a = sr.target) === null || _a === void 0 ? void 0 : _a.image;
+    if (targetImage) {
+        return targetImage + suffix;
+    }
+    const dgFact = sr.facts.find((d) => d.type === 'depGraph');
+    // not every scanResult has a depGraph, for example the JAR fingerprints.
+    if (dgFact) {
+        const name = (_b = dgFact.data) === null || _b === void 0 ? void 0 : _b.rootPkg.name;
+        if (name) {
+            return name + suffix;
+        }
+    }
+    return 'no-name' + suffix;
+}
 
 
 /***/ }),
@@ -6356,7 +6353,6 @@ const theme_1 = __webpack_require__(86988);
 const snyk_module_1 = __webpack_require__(60390);
 const depGraphLib = __webpack_require__(71479);
 const theme = __webpack_require__(86988);
-const json_1 = __webpack_require__(27019);
 const pMap = __webpack_require__(86301);
 const legacy_1 = __webpack_require__(34013);
 const errors_1 = __webpack_require__(55191);
@@ -6837,7 +6833,7 @@ async function assembleLocalPayloads(root, options) {
                 : pkg.name;
             // print dep graph if `--print-graph` is set
             if (options['print-graph'] && !options['print-deps']) {
-                await spinner_1.spinner.clear(spinnerLbl)();
+                spinner_1.spinner.clear(spinnerLbl)();
                 let root;
                 if (scannedProject.depGraph) {
                     root = pkg;
@@ -6846,9 +6842,7 @@ async function assembleLocalPayloads(root, options) {
                     const tempDepTree = pkg;
                     root = await depGraphLib.legacy.depTreeToGraph(tempDepTree, packageManager ? packageManager : '');
                 }
-                console.log('DepGraph data:');
-                console.log(json_1.jsonStringifyLargeObject(root.toJSON()));
-                console.log('DepGraph target:\n' + targetFile + '\nDepGraph end');
+                console.log(common.depGraphToOutputString(root.toJSON(), targetFile || ''));
             }
             const body = {
                 // WARNING: be careful changing this as it affects project uniqueness