Skip to content

Commit

Permalink
Merge pull request snyk#767 from snyk/fix/actionableCliRemediation-wi…
Browse files Browse the repository at this point in the history
…th-severity-threshold

fix: actionableCliRemediation FF with severity treshold flag
  • Loading branch information
carlos-snyk committed Sep 17, 2019
2 parents d3d47e3 + 1ad7165 commit cdf6ff9
Showing 1 changed file with 9 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import chalk from 'chalk';
import * as wrap from 'wrap-ansi';
import * as config from '../../../../lib/config';
import { TestOptions, ShowVulnPaths } from '../../../../lib/types';
import { TestOptions } from '../../../../lib/types';
import {
RemediationChanges, PatchRemediation,
DependencyUpdates, IssueData, SEVERITY, GroupedVuln,
Expand Down Expand Up @@ -192,6 +192,7 @@ function constructPatchesText(

function thisUpgradeFixes(vulnIds: string[], basicVulnInfo: Record<string, BasicVulnInfo>, testOptions: TestOptions) {
return vulnIds
.filter((id) => basicVulnInfo[id]) // basicVulnInfo only contains issues with the specified severity levels
.sort((a, b) => getSeverityValue(basicVulnInfo[a].severity) - getSeverityValue(basicVulnInfo[b].severity))
.filter((id) => basicVulnInfo[id].type !== 'license')
.map((id) => formatIssue(
Expand Down Expand Up @@ -300,6 +301,12 @@ function constructUnfixableText(unresolved: IssueData[], basicVulnInfo: Record<s
}
const unfixableIssuesTextArray = [chalk.bold.white('\nIssues with no direct upgrade or patch:')];
for (const issue of unresolved) {
const issueInfo = basicVulnInfo[issue.id];
if (!issueInfo) {
// basicVulnInfo only contains issues with the specified severity levels
continue;
}

const extraInfo = issue.fixedIn && issue.fixedIn.length
? `\n This issue was fixed in versions: ${chalk.bold(issue.fixedIn.join(', '))}`
: '\n No upgrade or patch available';
Expand All @@ -311,7 +318,7 @@ function constructUnfixableText(unresolved: IssueData[], basicVulnInfo: Record<s
issue.isNew,
undefined,
`${issue.packageName}@${issue.version}`,
basicVulnInfo[issue.id].paths,
issueInfo.paths,
testOptions,
) + `${extraInfo}`);
}
Expand Down

0 comments on commit cdf6ff9

Please sign in to comment.