Skip to content

Commit

Permalink
Merge pull request #1557 from snyk/fix/indicative-message-for-missing…
Browse files Browse the repository at this point in the history
…-packages

fix: allow indicative messages for CLI users
  • Loading branch information
Aviad Hahami committed Dec 8, 2020
2 parents 47eaff9 + 9b26e2b commit 4b7ab8a
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
12 changes: 12 additions & 0 deletions src/lib/errors/non-existing-package-error.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { CustomError } from './custom-error';

export class NonExistingPackageError extends CustomError {
private static ERROR_CODE = 404;
private static ERROR_MESSAGE = "Couldn't find the requested package";

constructor() {
super(NonExistingPackageError.ERROR_MESSAGE);
this.code = NonExistingPackageError.ERROR_CODE;
this.userMessage = NonExistingPackageError.ERROR_MESSAGE;
}
}
5 changes: 5 additions & 0 deletions src/lib/snyk-test/run-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ import { authHeaderWithApiTokenOrDockerJWT } 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';

const debug = debugModule('snyk:run-test');

Expand Down Expand Up @@ -467,6 +468,10 @@ function handleTestHttpErrorResponse(res, body) {
err = AuthFailedError(userMessage, statusCode);
err.innerError = body.stack;
break;
case 404:
err = new NonExistingPackageError();
err.innerError = body.stack;
break;
case 405:
err = new UnsupportedFeatureFlagError('reachableVulns');
err.innerError = body.stack;
Expand Down
4 changes: 2 additions & 2 deletions test/acceptance/cli-test/cli-test.generic.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const GenericTests: AcceptanceTests = {
} catch (err) {
t.equal(
err.userMessage,
'cli error message',
"Couldn't find the requested package",
'got correct err message',
);
}
Expand All @@ -58,7 +58,7 @@ export const GenericTests: AcceptanceTests = {
} catch (err) {
t.equal(
err.userMessage,
'cli error message',
"Couldn't find the requested package",
'got correct err message',
);
}
Expand Down

0 comments on commit 4b7ab8a

Please sign in to comment.