@soos-io/api-client
Advanced tools
Comparing version 0.2.3-pre.1 to 0.2.3-pre.2
@@ -55,5 +55,2 @@ import FormData from "form-data"; | ||
isSuccess: boolean; | ||
hasIssues: boolean; | ||
violations: number; | ||
vulnerabilities: number; | ||
issues: IIssuesModel; | ||
@@ -64,8 +61,2 @@ errors: ICodedMessageModel[]; | ||
status: ScanStatus; | ||
violations: { | ||
count: number; | ||
} | null; | ||
vulnerabilities: { | ||
count: number; | ||
} | null; | ||
issues: IIssuesModel; | ||
@@ -72,0 +63,0 @@ clientHash: string; |
@@ -65,4 +65,2 @@ "use strict"; | ||
const response = await this.client.get(scanStatusUrl); | ||
const violationCount = response.data.violations?.count ?? 0; | ||
const vulnerabilityCount = response.data.vulnerabilities?.count ?? 0; | ||
return { | ||
@@ -72,6 +70,3 @@ status: response.data.status, | ||
isSuccess: response.data.status === enums_1.ScanStatus.Finished, | ||
hasIssues: violationCount > 0 || vulnerabilityCount > 0, | ||
violations: violationCount, | ||
issues: response.data.issues, | ||
vulnerabilities: vulnerabilityCount, | ||
errors: response.data.errors ?? [], | ||
@@ -78,0 +73,0 @@ }; |
@@ -133,14 +133,9 @@ "use strict"; | ||
} | ||
if (scanStatus.isSuccess) { | ||
scanStatus.vulnerabilities > 0 || scanStatus.violations > 0; | ||
} | ||
let statusMessage = `Scan ${scanStatus.isSuccess ? "passed" : "failed"}`; | ||
if (scanStatus.hasIssues) { | ||
const vulnerabilities = StringUtilities_1.default.pluralizeTemplate(scanStatus.issues.vulnerabilities?.count ?? 0, "vulnerability", "vulnerabilities"); | ||
const violations = StringUtilities_1.default.pluralizeTemplate(scanStatus.issues.violations?.count ?? 0, "violation"); | ||
const substitutions = StringUtilities_1.default.pluralizeTemplate(scanStatus.issues.dependencySubstitution?.count ?? 0, "DependencySubstitution"); | ||
const typos = StringUtilities_1.default.pluralizeTemplate(scanStatus.issues.dependencyTypos?.count ?? 0, "DependencyTypo"); | ||
statusMessage = statusMessage.concat(`${scanStatus.isSuccess ? ", but had" : " because of"} ${vulnerabilities} and ${violations} ${substitutions ? `(${substitutions})` : ""} ${typos ? `(${typos})` : ""}. | ||
const vulnerabilities = StringUtilities_1.default.pluralizeTemplate(scanStatus.issues.vulnerabilities?.count ?? 0, "vulnerability", "vulnerabilities"); | ||
const violations = StringUtilities_1.default.pluralizeTemplate(scanStatus.issues.violations?.count ?? 0, "violation"); | ||
const substitutions = StringUtilities_1.default.pluralizeTemplate(scanStatus.issues.dependencySubstitution?.count ?? 0, "DependencySubstitution"); | ||
const typos = StringUtilities_1.default.pluralizeTemplate(scanStatus.issues.dependencyTypos?.count ?? 0, "DependencyTypo"); | ||
statusMessage = statusMessage.concat(`${scanStatus.isSuccess ? ", but had" : " because of"} ${vulnerabilities} and ${violations} ${substitutions ? `(${substitutions})` : ""} ${typos ? `(${typos})` : ""}. | ||
`); | ||
} | ||
const resultMessage = `${statusMessage}. View the results at: ${scanUrl}`; | ||
@@ -147,0 +142,0 @@ logging_1.soosLogger.info(resultMessage); |
{ | ||
"name": "@soos-io/api-client", | ||
"version": "0.2.3-pre.1", | ||
"version": "0.2.3-pre.2", | ||
"description": "This is the SOOS API Client for registered clients leveraging the various integrations to the SOOS platform.", | ||
@@ -5,0 +5,0 @@ "main": "dist/index.js", |
63320
1421