Skip to content

Commit 8f882c3

Browse files
committed
refactor: use source.Name instead of new Path field
1 parent c4694a9 commit 8f882c3

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

internal/output/output_result.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ type PackageResult struct {
6666
VulnCount VulnCount
6767
Licenses []models.License
6868
LicenseViolations []models.License
69-
Path string `json:"-"`
7069
DepGroups []string `json:"-"`
7170
}
7271

@@ -399,7 +398,7 @@ func processSource(packageSource models.PackageSource) map[string]SourceResult {
399398
continue // Skip processing this vulnPkg as it was already added
400399
}
401400

402-
packageResult := processPackage(vulnPkg, packageSource.Source.Path)
401+
packageResult := processPackage(vulnPkg)
403402
if vulnPkg.Package.ImageOrigin != nil {
404403
packageResult.LayerDetail = PackageContainerInfo{
405404
LayerIndex: vulnPkg.Package.ImageOrigin.Index,
@@ -449,7 +448,7 @@ func processSource(packageSource models.PackageSource) map[string]SourceResult {
449448
// This function processes the vulnerability groups, updates vulnerability details,
450449
// and constructs the final output result for the package, including details about
451450
// called and uncalled vulnerabilities, fixable counts, and layer information (if available).
452-
func processPackage(vulnPkg models.PackageVulns, path string) PackageResult {
451+
func processPackage(vulnPkg models.PackageVulns) PackageResult {
453452
regularVulnMap, hiddenVulnMap := processVulnGroups(vulnPkg)
454453
updateVuln(regularVulnMap, vulnPkg)
455454
updateVuln(hiddenVulnMap, vulnPkg)
@@ -473,7 +472,6 @@ func processPackage(vulnPkg models.PackageVulns, path string) PackageResult {
473472
Licenses: vulnPkg.Licenses,
474473
LicenseViolations: vulnPkg.LicenseViolations,
475474
DepGroups: vulnPkg.DepGroups,
476-
Path: path,
477475
}
478476

479477
return packageResult

internal/output/table.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ func tableBuilderInner(result Result, vulnAnalysisType VulnAnalysisType) []tbInn
259259
}
260260
outputRow = append(outputRow, name)
261261
outputRow = append(outputRow, pkg.InstalledVersion)
262-
outputRow = append(outputRow, pkg.Path)
262+
outputRow = append(outputRow, strings.TrimPrefix(source.Name, ":"))
263263

264264
allOutputRows = append(allOutputRows, tbInnerResponse{
265265
row: outputRow,

0 commit comments

Comments
 (0)