Stage/vuls
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert: gost/Ubuntu.ConvertToModel() is public method now (#1597)

Browse Source
This commit is contained in:
Sinclair
2023-02-08 11:36:36 +09:00
committed by GitHub
parent 1927ed344c
commit 704492963c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gost/ubuntu.go
View File

@@ -233,7 +233,7 @@ func detect(cves map[string]gostmodels.UbuntuCVE, fixed bool, srcPkg models.SrcP
var contents []cveContent
for _, cve := range cves {
c := cveContent{
cveContent: *convertToModel(&cve),
cveContent: *(Ubuntu{}).ConvertToModel(&cve),
}
if fixed {
@@ -296,7 +296,8 @@ func detect(cves map[string]gostmodels.UbuntuCVE, fixed bool, srcPkg models.SrcP
return contents
}
func convertToModel(cve *gostmodels.UbuntuCVE) *models.CveContent {
// ConvertToModel converts gost model to vuls model
func (ubu Ubuntu) ConvertToModel(cve *gostmodels.UbuntuCVE) *models.CveContent {
references := []models.Reference{}
for _, r := range cve.References {
if strings.Contains(r.Reference, "https://cve.mitre.org/cgi-bin/cvename.cgi?name=") {

2
gost/ubuntu_test.go
View File

@@ -127,7 +127,7 @@ func TestUbuntuConvertToModel(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := convertToModel(&tt.input); !reflect.DeepEqual(got, &tt.expected) {
if got := (Ubuntu{}).ConvertToModel(&tt.input); !reflect.DeepEqual(got, &tt.expected) {
t.Errorf("Ubuntu.ConvertToModel() = %#v, want %#v", got, &tt.expected)
}
})