feat(libscan): support trivy v0.23.0 (#1377)

* feat(libscan): support trivy v0.23.0

* fix lint err

* review
This commit is contained in:
Kota Kanbe
2022-02-01 10:40:16 +09:00
committed by GitHub
parent b4c23c158b
commit 77049d6cbb
6 changed files with 187 additions and 112 deletions

View File

@@ -4,8 +4,6 @@ import (
"sort"
"strings"
"time"
"github.com/aquasecurity/trivy-db/pkg/vulnsrc/vulnerability"
)
// CveContents has CveContent
@@ -325,7 +323,7 @@ func NewCveContentType(name string) CveContentType {
return Oracle
case "ubuntu":
return Ubuntu
case "debian", vulnerability.DebianOVAL:
case "debian", "debian-oval":
return Debian
case "redhat_api":
return RedHatAPI

View File

@@ -64,7 +64,7 @@ func (s LibraryScanner) Scan() ([]VulnInfo, error) {
}
var vulnerabilities = []VulnInfo{}
for _, pkg := range s.Libs {
tvulns, err := scanner.Detect(pkg.Name, pkg.Version)
tvulns, err := scanner.DetectVulnerabilities(pkg.Name, pkg.Version)
if err != nil {
return nil, xerrors.Errorf("failed to detect %s vulnerabilities: %w", scanner.Type(), err)
}