Rename PackageInfoList to Packages

This commit is contained in:
Kota Kanbe
2017-05-06 04:59:12 +09:00
committed by kota kanbe
parent f26b61d773
commit d626cc8a8b
17 changed files with 168 additions and 189 deletions

View File

@@ -69,7 +69,7 @@ func (o Debian) fillOvalInfo(r *models.ScanResult, definition *ovalmodels.Defini
vinfo = models.VulnInfo{
CveID: definition.Debian.CveID,
Confidence: models.OvalMatch,
Packages: getPackageInfoList(r, definition),
Packages: getPackages(r, definition),
CveContents: models.NewCveContents(ovalContent),
}
} else {

View File

@@ -10,16 +10,16 @@ type Client interface {
FillCveInfoFromOvalDB(r *models.ScanResult) error
}
func getPackageInfoList(r *models.ScanResult, d *ovalmodels.Definition) models.PackageInfoList {
var packageInfoList models.PackageInfoList
func getPackages(r *models.ScanResult, d *ovalmodels.Definition) models.Packages {
var packages models.Packages
for _, pack := range d.AffectedPacks {
for _, p := range r.Packages {
if pack.Name == p.Name {
p.Changelog = models.Changelog{}
packageInfoList = append(packageInfoList, p)
packages = append(packages, p)
break
}
}
}
return packageInfoList
return packages
}

View File

@@ -65,7 +65,7 @@ func (o Redhat) fillOvalInfo(r *models.ScanResult, definition *ovalmodels.Defini
vinfo = models.VulnInfo{
CveID: cve.CveID,
Confidence: models.OvalMatch,
Packages: getPackageInfoList(r, definition),
Packages: getPackages(r, definition),
CveContents: models.NewCveContents(ovalContent),
}
} else {