Update contrib/trivy/pkg/converter.go

shino · Copilot · shino · commit 25dd677411c4 · 2026-03-27T13:35:13.000+09:00
Co-authored-by: Copilot &lt;175728472+Copilot@users.noreply.github.com&gt;
diff --git a/contrib/trivy/pkg/converter.go b/contrib/trivy/pkg/converter.go
@@ -200,10 +200,11 @@ func Convert(results types.Results, artifactType ftypes.ArtifactType, artifactNa
 
 				if existing, ok := pkgs[p.Name]; ok {
 					if existing.Version != pv {
-						if _, seen := dupPkgs[p.Name]; !seen {
-							dupPkgs[p.Name] = []string{existing.Version}
+						if versions, seen := dupPkgs[p.Name]; !seen {
+							dupPkgs[p.Name] = []string{existing.Version, pv}
+						} else if !slices.Contains(versions, pv) {
+							dupPkgs[p.Name] = append(versions, pv)
 						}
-						dupPkgs[p.Name] = append(dupPkgs[p.Name], pv)
 					}
 					if compareVersions(trivyResult.Type, pv, existing.Version) >= 0 {
 						pkgs[p.Name] = models.Package{

Original file line number	Diff line number	Diff line change
`@@ -200,10 +200,11 @@ func Convert(results types.Results, artifactType ftypes.ArtifactType, artifactNa`
`200`	`200`
`201`	`201`	`if existing, ok := pkgs[p.Name]; ok {`
`202`	`202`	`if existing.Version != pv {`
`203`		`- if _, seen := dupPkgs[p.Name]; !seen {`
`204`		`- dupPkgs[p.Name] = []string{existing.Version}`
	`203`	`+ if versions, seen := dupPkgs[p.Name]; !seen {`
	`204`	`+ dupPkgs[p.Name] = []string{existing.Version, pv}`
	`205`	`+ } else if !slices.Contains(versions, pv) {`
	`206`	`+ dupPkgs[p.Name] = append(versions, pv)`
`205`	`207`	`}`
`206`		`- dupPkgs[p.Name] = append(dupPkgs[p.Name], pv)`
`207`	`208`	`}`
`208`	`209`	`if compareVersions(trivyResult.Type, pv, existing.Version) >= 0 {`
`209`	`210`	`pkgs[p.Name] = models.Package{`