diff --git a/src/main/oss/CxOss.ts b/src/main/oss/CxOss.ts index 104b77ba..3f7ca026 100644 --- a/src/main/oss/CxOss.ts +++ b/src/main/oss/CxOss.ts @@ -1,4 +1,4 @@ -import { CxManifestStatus } from './CxManifestStatus'; +import { CxRealtimeEngineStatus } from './CxRealtimeEngineStatus'; export interface Location { line: number; @@ -12,7 +12,7 @@ export default class CxOssResult { version: string; filepath: string; locations: Location[]; - status: CxManifestStatus; + status: CxRealtimeEngineStatus; vulnerabilities: { cve: string, description: string, severity: string }[]; static parseResult(resultObject: any): CxOssResult[] { @@ -32,7 +32,7 @@ export default class CxOssResult { endIndex: loc.EndIndex })) : []; - ossResult.status = member.Status as CxManifestStatus; + ossResult.status = member.Status as CxRealtimeEngineStatus; ossResult.vulnerabilities = Array.isArray(member.Vulnerabilities) ? member.Vulnerabilities.map((vul: any) => ({ cve: vul.CVE, @@ -55,7 +55,7 @@ export default class CxOssResult { endIndex: loc.EndIndex })) : []; - ossResult.status = packages.Status as CxManifestStatus; + ossResult.status = packages.Status as CxRealtimeEngineStatus; ossResult.vulnerabilities = Array.isArray(packages.Vulnerabilities) ? packages.Vulnerabilities.map((vul: any) => ({ cve: vul.CVE, diff --git a/src/main/oss/CxManifestStatus.ts b/src/main/oss/CxRealtimeEngineStatus.ts similarity index 80% rename from src/main/oss/CxManifestStatus.ts rename to src/main/oss/CxRealtimeEngineStatus.ts index 9947cf3d..dd66d043 100644 --- a/src/main/oss/CxManifestStatus.ts +++ b/src/main/oss/CxRealtimeEngineStatus.ts @@ -1,4 +1,4 @@ -export enum CxManifestStatus { +export enum CxRealtimeEngineStatus { malicious = "Malicious", ok = "OK", unknown = "Unknown", diff --git a/src/main/secrets/CxSecrets.ts b/src/main/secrets/CxSecrets.ts index 3c1dd557..632be078 100644 --- a/src/main/secrets/CxSecrets.ts +++ b/src/main/secrets/CxSecrets.ts @@ -1,8 +1,10 @@ +import {CxRealtimeEngineStatus} from "../oss/CxRealtimeEngineStatus"; + export default class CxSecretsResult { title: string; description: string; filepath: string; - severity: string; + severity: CxRealtimeEngineStatus; locations: { line: number, startIndex: number, endIndex: number }[]; static parseResult(resultObject: any): CxSecretsResult[] { @@ -13,7 +15,7 @@ export default class CxSecretsResult { secretsResult.title = member.Title; secretsResult.description = member.Description; secretsResult.filepath = member.FilePath; - secretsResult.severity = member.Severity; + secretsResult.severity = member.Severity as CxRealtimeEngineStatus; secretsResult.locations = Array.isArray(member.Locations) ? member.Locations.map((l: any) => ({ line: l.Line, diff --git a/src/tests/ScanTest.test.ts b/src/tests/ScanTest.test.ts index d4b3e439..781b0f12 100644 --- a/src/tests/ScanTest.test.ts +++ b/src/tests/ScanTest.test.ts @@ -184,7 +184,7 @@ describe("ScanCreate cases", () => { it.skip('ScanSecrets Successful case', async () => { const wrapper = new CxWrapper(cxScanConfig); - const cxCommandOutput: CxCommandOutput = await wrapper.secretsScanResults("tsc/tests/data/secret-exposed.txt"); + const cxCommandOutput: CxCommandOutput = await wrapper.secretsScanResults("src/tests/data/secret-exposed.txt"); console.log("Json object from scanOSS successful case: " + JSON.stringify(cxCommandOutput)); expect(cxCommandOutput.payload).toBeDefined(); expect(cxCommandOutput.exitCode).toBe(0);