fix: allows scanning even if a single proj import fails

Mattlk13 · Jun 18, 2020 · f451ee7 · f451ee7
1 parent aeee8c8
commit f451ee7
Showing 1 changed file with 61 additions and 55 deletions.
diff --git a/src/cli/commands/monitor/index.ts b/src/cli/commands/monitor/index.ts
@@ -182,65 +182,71 @@ async function monitor(...args0: MethodArgs): Promise<any> {
 
       // Post the project dependencies to the Registry
       for (const projectDeps of perProjectResult.scannedProjects) {
-        if (!projectDeps.depGraph && !projectDeps.depTree) {
-          debug(
-            'scannedProject is missing depGraph or depTree, cannot run test/monitor',
-          );
-          throw new FailedToRunTestError(
-            'Your monitor request could not be completed. Please email support@snyk.io',
+        try {
+          if (!projectDeps.depGraph && !projectDeps.depTree) {
+            debug(
+              'scannedProject is missing depGraph or depTree, cannot run test/monitor',
+            );
+            throw new FailedToRunTestError(
+              'Your monitor request could not be completed. Please email support@snyk.io',
+            );
+          }
+          const extractedPackageManager = extractPackageManager(
+            projectDeps,
+            perProjectResult,
+            options as MonitorOptions & Options,
           );
-        }
-        const extractedPackageManager = extractPackageManager(
-          projectDeps,
-          perProjectResult,
-          options as MonitorOptions & Options,
-        );
-
-        analytics.add('packageManager', extractedPackageManager);
-
-        let projectName;
-
-        if (projectDeps.depGraph) {
-          debug(`Processing ${projectDeps.depGraph.rootPkg.name}...`);
-          maybePrintDepGraph(options, projectDeps.depGraph);
-          projectName = projectDeps.depGraph.rootPkg.name;
-        }
 
-        if (projectDeps.depTree) {
-          debug(`Processing ${projectDeps.depTree.name}...`);
-          maybePrintDepTree(options, projectDeps.depTree);
-          projectName = projectDeps.depTree.name;
-        }
-
-        const tFile = projectDeps.targetFile || targetFile;
-        const targetFileRelativePath =
-          projectDeps.plugin.targetFile ||
-          (tFile && pathUtil.join(pathUtil.resolve(path), tFile)) ||
-          '';
+          analytics.add('packageManager', extractedPackageManager);
+
+          let projectName;
+
+          if (projectDeps.depGraph) {
+            debug(`Processing ${projectDeps.depGraph.rootPkg.name}...`);
+            maybePrintDepGraph(options, projectDeps.depGraph);
+            projectName = projectDeps.depGraph.rootPkg.name;
+          }
+
+          if (projectDeps.depTree) {
+            debug(`Processing ${projectDeps.depTree.name}...`);
+            maybePrintDepTree(options, projectDeps.depTree);
+            projectName = projectDeps.depTree.name;
+          }
+
+          const tFile = projectDeps.targetFile || targetFile;
+          const targetFileRelativePath =
+            projectDeps.plugin.targetFile ||
+            (tFile && pathUtil.join(pathUtil.resolve(path), tFile)) ||
+            '';
+
+          const res: MonitorResult = await promiseOrCleanup(
+            snykMonitor(
+              path,
+              generateMonitorMeta(options, extractedPackageManager),
+              projectDeps,
+              options,
+              projectDeps.plugin as PluginMetadata,
+              targetFileRelativePath,
+              contributors,
+            ),
+            spinner.clear(postingMonitorSpinnerLabel),
+          );
 
-        const res: MonitorResult = await promiseOrCleanup(
-          snykMonitor(
-            path,
-            generateMonitorMeta(options, extractedPackageManager),
-            projectDeps,
+          res.path = path;
+          const monOutput = formatMonitorOutput(
+            extractedPackageManager,
+            res,
             options,
-            projectDeps.plugin as PluginMetadata,
-            targetFileRelativePath,
-            contributors,
-          ),
-          spinner.clear(postingMonitorSpinnerLabel),
-        );
-
-        res.path = path;
-        const monOutput = formatMonitorOutput(
-          extractedPackageManager,
-          res,
-          options,
-          projectName,
-          getSubProjectCount(inspectResult),
-        );
-        // push a good result
-        results.push({ ok: true, data: monOutput, path, projectName });
+            projectName,
+            getSubProjectCount(inspectResult),
+          );
+          // push a good result
+          results.push({ ok: true, data: monOutput, path, projectName });
+        } catch (err) {
+          // pushing this error allow this inner loop to keep scanning the projects
+          // even if 1 in 100 fails
+          results.push({ ok: false, data: err, path });
+        }
       }
     } catch (err) {
       // push this error, the loop continues