Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-24 17:47:46 +01:00
Code Issues Projects Releases Wiki Activity

fix(scan): dump nil slice of vulnerabilities as empty slice in report

Browse Source 
Closes #11131

Signed-off-by: He Weiwei <hweiwei@vmware.com>
This commit is contained in:
He Weiwei 2020-04-07 06:20:16 +00:00
parent 8ddfe2d0a5
commit e1ab30dadf
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pkg/scan/vuln/report.go
View File

@ -15,6 +15,8 @@
package vuln
import (
"encoding/json"
v1 "github.com/goharbor/harbor/src/pkg/scan/rest/v1"
)
@ -30,6 +32,24 @@ type Report struct {
Vulnerabilities []*VulnerabilityItem `json:"vulnerabilities"`
}
// MarshalJSON custom function to dump nil slice of Vulnerabilities as empty slice
// See https://github.com/goharbor/harbor/issues/11131 to get more details
func (report *Report) MarshalJSON() ([]byte, error) {
type Alias Report
aux := &struct {
*Alias
}{
Alias: (*Alias)(report),
}
if aux.Vulnerabilities == nil {
aux.Vulnerabilities = []*VulnerabilityItem{}
}
return json.Marshal(aux)
}
// Merge ...
func (report *Report) Merge(another *Report) *Report {
generatedAt := report.GeneratedAt