Merge pull request #2100 from snyk/fix/propagate-error-message

fix: propagate userMessage to 404 errors

src/lib/errors/index.ts

@@ -28,3 +28,4 @@ export {
   IllegalIacFileErrorMsg,
   NotSupportedIacAllProjects,
 } from './invalid-iac-file';
+export { NotFoundError } from './not-found-error';

src/lib/errors/not-found-error.ts

@@ -0,0 +1,12 @@
+import { CustomError } from './custom-error';
+
+export class NotFoundError extends CustomError {
+  private static ERROR_CODE = 404;
+  private static ERROR_MESSAGE = "Couldn't find the requested resource";
+
+  constructor(userMessage) {
+    super(userMessage || NotFoundError.ERROR_MESSAGE);
+    this.code = NotFoundError.ERROR_CODE;
+    this.userMessage = userMessage || NotFoundError.ERROR_MESSAGE;
+  }
+}

src/lib/snyk-test/run-test.ts

@@ -29,6 +29,7 @@ import {
   InternalServerError,
   NoSupportedManifestsFoundError,
   UnsupportedFeatureFlagError,
+  NotFoundError,
 } from '../errors';
 import * as snyk from '../';
 import { isCI } from '../is-ci';
@@ -70,7 +71,6 @@ import { getAuthHeader } from '../api-token';
 import { getEcosystem } from '../ecosystems';
 import { Issue } from '../ecosystems/types';
 import { assembleEcosystemPayloads } from './assemble-payloads';
-import { NonExistingPackageError } from '../errors/non-existing-package-error';
 import request = require('../request');
 import spinner = require('../spinner');
 
@@ -495,7 +495,7 @@ function handleTestHttpErrorResponse(res, body) {
       err.innerError = body.stack;
       break;
     case 404:
-      err = new NonExistingPackageError();
+      err = new NotFoundError(userMessage);
       err.innerError = body.stack;
       break;
     case 405:

test/acceptance/cli-test/cli-test.generic.spec.ts

@@ -60,7 +60,7 @@ export const GenericTests: AcceptanceTests = {
       } catch (err) {
         t.equal(
           err.userMessage,
-          "Couldn't find the requested package",
+          'Org missing-org was not found or you may not have the correct permissions',
           'got correct err message',
         );
         t.equal(err.code, 404);
@@ -82,7 +82,7 @@ export const GenericTests: AcceptanceTests = {
       } catch (err) {
         t.has(
           err.jsonStringifiedResults,
-          "Couldn't find the requested package",
+          'Org missing-org was not found or you may not have the correct permissions',
           'got correct err message',
         );
         t.equal(err.code, 404);
@@ -101,7 +101,7 @@ export const GenericTests: AcceptanceTests = {
       } catch (err) {
         t.equal(
           err.userMessage,
-          "Couldn't find the requested package",
+          'Org missing-org was not found or you may not have the correct permissions',
           'got correct err message',
         );
       }

test/acceptance/fake-server.ts

@@ -91,7 +91,8 @@ export function fakeServer(root, apikey) {
       res.status(404);
       res.send({
         code: 404,
-        userMessage: 'cli error message',
+        userMessage:
+          'Org missing-org was not found or you may not have the correct permissions',
       });
       return next();
     }
@@ -115,7 +116,8 @@ export function fakeServer(root, apikey) {
       res.status(404);
       res.send({
         code: 404,
-        userMessage: 'cli error message',
+        userMessage:
+          'Org missing-org was not found or you may not have the correct permissions',
       });
       return next();
     }
@@ -185,7 +187,8 @@ export function fakeServer(root, apikey) {
       res.status(404);
       res.send({
         code: 404,
-        userMessage: 'cli error message',
+        userMessage:
+          'Org missing-org was not found or you may not have the correct permissions',
       });
       return next();
     }
@@ -234,7 +237,8 @@ export function fakeServer(root, apikey) {
       res.status(404);
       res.send({
         code: 404,
-        userMessage: 'cli error message',
+        userMessage:
+          'Org missing-org was not found or you may not have the correct permissions',
       });
       return next();
     }
@@ -258,7 +262,8 @@ export function fakeServer(root, apikey) {
       res.status(404);
       res.send({
         code: 404,
-        userMessage: 'cli error message',
+        userMessage:
+          'Org missing-org was not found or you may not have the correct permissions',
       });
       return next();
     }

test/smoke/spec/snyk_test_spec.sh

@@ -49,6 +49,30 @@ Describe "Snyk test command"
       The output should include "https://snyk.io/vuln/npm:minimatch:20160620"
       The stderr should equal ""
     End
+
+    It "tests a library on a specific version when passed a library@version"
+      Skip if "execute only in regression test" check_if_regression_test
+      When run snyk test lodash@4.17.15
+      The status should be failure # issues found
+      The output should include "Testing lodash@4.17.15"
+      The stderr should equal ""
+    End
+
+    It "fails with a correct user message on a non-existent library"
+      Skip if "execute only in regression test" check_if_regression_test
+      When run snyk test nonexistentpackage123456789
+      The status should be failure
+      The output should include "Couldn't find the requested package or version"
+      The stderr should equal ""
+    End
+
+    It "fails with a correct user message on a non-existent library"
+      Skip if "execute only in regression test" check_if_regression_test
+      When run snyk test lodash --org=nope
+      The status should be failure
+      The output should include "Org nope was not found or you may not have the correct permissions"
+      The stderr should equal ""
+    End
   End
 
   Describe "npm test with JSON output"