fix: Error output for mismatched options

snyk · Nov 24, 2020 · d79edf6 · d79edf6
1 parent 3e22db5
commit d79edf6
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/src/cli/index.ts b/src/cli/index.ts
@@ -105,7 +105,10 @@ async function handleError(args, error) {
   if (args.options.debug && !args.options.json) {
     const output = vulnsFound ? error.message : error.stack;
     console.log(output);
-  } else if (args.options.json) {
+  } else if (
+    args.options.json &&
+    !(error instanceof UnsupportedOptionCombinationError)
+  ) {
     console.log(stripAnsi(error.json || error.stack));
   } else {
     if (!args.options.quiet) {

diff --git a/test/acceptance/cli-args.test.ts b/test/acceptance/cli-args.test.ts
@@ -454,8 +454,26 @@ test(
 );
 
 test('flags not allowed with --sarif', (t) => {
-  t.plan(1);
-  exec(`node ${main} test --sarif --json`, (err, stdout) => {
+  t.plan(4);
+  exec(`node ${main} test iac --sarif --json`, (err, stdout) => {
+    if (err) {
+      console.log('CLI stdout: ', stdout);
+      throw err;
+    }
+    t.match(
+      stdout.trim(),
+      new UnsupportedOptionCombinationError(['test', 'sarif', 'json'])
+        .userMessage,
+      'Display unsupported combination error message (iac)',
+    );
+    t.equal(
+      stdout.trim().split('\n').length,
+      1,
+      'Error message should not include stacktrace (iac)',
+    );
+  });
+
+  exec(`node ${main} test container --sarif --json`, (err, stdout) => {
     if (err) {
       console.log('CLI stdout: ', stdout);
       throw err;
@@ -464,6 +482,12 @@ test('flags not allowed with --sarif', (t) => {
       stdout.trim(),
       new UnsupportedOptionCombinationError(['test', 'sarif', 'json'])
         .userMessage,
+      'Display unsupported combination error message (container)',
+    );
+    t.equal(
+      stdout.trim().split('\n').length,
+      1,
+      'Error message should not include stacktrace (container)',
     );
   });
 });