Skip to content

Commit b5e2a00

Browse files
authored
Refactor CxManifestStatus to CxRealtimeEngineStatus and update related references (#849)
* Refactor CxManifestStatus to CxRealtimeEngineStatus and update related references * Update ScanSecrets test case to use correct file path and enable the test
1 parent 94899b6 commit b5e2a00

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

src/main/oss/CxOss.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { CxManifestStatus } from './CxManifestStatus';
1+
import { CxRealtimeEngineStatus } from './CxRealtimeEngineStatus';
22

33
export interface Location {
44
line: number;
@@ -12,7 +12,7 @@ export default class CxOssResult {
1212
version: string;
1313
filepath: string;
1414
locations: Location[];
15-
status: CxManifestStatus;
15+
status: CxRealtimeEngineStatus;
1616
vulnerabilities: { cve: string, description: string, severity: string }[];
1717

1818
static parseResult(resultObject: any): CxOssResult[] {
@@ -32,7 +32,7 @@ export default class CxOssResult {
3232
endIndex: loc.EndIndex
3333
}))
3434
: [];
35-
ossResult.status = member.Status as CxManifestStatus;
35+
ossResult.status = member.Status as CxRealtimeEngineStatus;
3636
ossResult.vulnerabilities = Array.isArray(member.Vulnerabilities)
3737
? member.Vulnerabilities.map((vul: any) => ({
3838
cve: vul.CVE,
@@ -55,7 +55,7 @@ export default class CxOssResult {
5555
endIndex: loc.EndIndex
5656
}))
5757
: [];
58-
ossResult.status = packages.Status as CxManifestStatus;
58+
ossResult.status = packages.Status as CxRealtimeEngineStatus;
5959
ossResult.vulnerabilities = Array.isArray(packages.Vulnerabilities)
6060
? packages.Vulnerabilities.map((vul: any) => ({
6161
cve: vul.CVE,

src/main/oss/CxManifestStatus.ts renamed to src/main/oss/CxRealtimeEngineStatus.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export enum CxManifestStatus {
1+
export enum CxRealtimeEngineStatus {
22
malicious = "Malicious",
33
ok = "OK",
44
unknown = "Unknown",

src/main/secrets/CxSecrets.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
import {CxRealtimeEngineStatus} from "../oss/CxRealtimeEngineStatus";
2+
13
export default class CxSecretsResult {
24
title: string;
35
description: string;
46
filepath: string;
5-
severity: string;
7+
severity: CxRealtimeEngineStatus;
68
locations: { line: number, startIndex: number, endIndex: number }[];
79

810
static parseResult(resultObject: any): CxSecretsResult[] {
@@ -13,7 +15,7 @@ export default class CxSecretsResult {
1315
secretsResult.title = member.Title;
1416
secretsResult.description = member.Description;
1517
secretsResult.filepath = member.FilePath;
16-
secretsResult.severity = member.Severity;
18+
secretsResult.severity = member.Severity as CxRealtimeEngineStatus;
1719
secretsResult.locations = Array.isArray(member.Locations)
1820
? member.Locations.map((l: any) => ({
1921
line: l.Line,

src/tests/ScanTest.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ describe("ScanCreate cases", () => {
184184

185185
it.skip('ScanSecrets Successful case', async () => {
186186
const wrapper = new CxWrapper(cxScanConfig);
187-
const cxCommandOutput: CxCommandOutput = await wrapper.secretsScanResults("tsc/tests/data/secret-exposed.txt");
187+
const cxCommandOutput: CxCommandOutput = await wrapper.secretsScanResults("src/tests/data/secret-exposed.txt");
188188
console.log("Json object from scanOSS successful case: " + JSON.stringify(cxCommandOutput));
189189
expect(cxCommandOutput.payload).toBeDefined();
190190
expect(cxCommandOutput.exitCode).toBe(0);

0 commit comments

Comments
 (0)