Skip to content

Update CxOssResult to support multiple locations per package (AST-99484) #845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 11, 2025
Merged

Update CxOssResult to support multiple locations per package (AST-99484) #845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a136bd1
Update CxOssResult to support multiple locations per package
cx-elchanan-arbiv Jun 11, 2025
99ae0ab
Merge branch 'main' into feature/elchanan/oss-result-multiple-locations
cx-elchanan-arbiv Jun 11, 2025
ef4196d
rm skip from test for oss
cx-elchanan-arbiv Jun 11, 2025
81ad45b
Update ScanTest.test.ts
cx-elchanan-arbiv Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 23 additions & 14 deletions src/main/oss/CxOss.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
import { CxManifestStatus } from './CxManifestStatus';

export interface Location {
line: number;
startIndex: number;
endIndex: number;
}

export default class CxOssResult {
packageManager: string;
packageName: string;
version: string;
filepath: string;
lineStart: number;
lineEnd: number;
startIndex: number;
endIndex: number;
locations: Location[];
status: CxManifestStatus;
vulnerabilities: { cve: string, description: string, severity: string }[];

Expand All @@ -20,12 +23,15 @@ export default class CxOssResult {
const ossResult = new CxOssResult();
ossResult.packageManager = member.PackageManager;
ossResult.packageName = member.PackageName;
ossResult.version = member.PackageVersion;
ossResult.version = member.Version;
ossResult.filepath = member.FilePath;
ossResult.lineStart = member.LineStart;
ossResult.lineEnd = member.LineEnd;
ossResult.startIndex = member.StartIndex;
ossResult.endIndex = member.EndIndex;
ossResult.locations = Array.isArray(member.Locations)
? member.Locations.map((loc: any) => ({
line: loc.Line,
startIndex: loc.StartIndex,
endIndex: loc.EndIndex
}))
: [];
ossResult.status = member.Status as CxManifestStatus;
ossResult.vulnerabilities = Array.isArray(member.Vulnerabilities)
? member.Vulnerabilities.map((vul: any) => ({
Expand All @@ -40,12 +46,15 @@ export default class CxOssResult {
const ossResult = new CxOssResult();
ossResult.packageManager = packages.PackageManager;
ossResult.packageName = packages.PackageName;
ossResult.version = packages.PackageVersion;
ossResult.version = packages.Version;
ossResult.filepath = packages.FilePath;
ossResult.lineStart = packages.LineStart;
ossResult.lineEnd = packages.LineEnd;
ossResult.startIndex = packages.StartIndex;
ossResult.endIndex = packages.EndIndex;
ossResult.locations = Array.isArray(packages.Locations)
? packages.Locations.map((loc: any) => ({
line: loc.Line,
startIndex: loc.StartIndex,
endIndex: loc.EndIndex
}))
: [];
ossResult.status = packages.Status as CxManifestStatus;
ossResult.vulnerabilities = Array.isArray(packages.Vulnerabilities)
? packages.Vulnerabilities.map((vul: any) => ({
Expand Down
2 changes: 1 addition & 1 deletion src/tests/ScanTest.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ describe("ScanCreate cases", () => {
expect(typeof scanObject.scanDetails[0].description).toBe('string');
});

it.skip('ScanOss Successful case', async () => {
it('ScanOss Successful case', async () => {
const wrapper = new CxWrapper(cxScanConfig);
const cxCommandOutput: CxCommandOutput = await wrapper.ossScanResults("tsc/tests/data/package.json");
console.log("Json object from scanOSS successful case: " + JSON.stringify(cxCommandOutput));
Expand Down