From 76a79869dfbd3c6ee5e4e7cfd4c39917a2960fcf Mon Sep 17 00:00:00 2001 From: Daniel Jiang Date: Wed, 4 Sep 2019 17:59:56 +0800 Subject: [PATCH] The default item list should be empty list,not null This commit make sure that the "items" in response of project level CVE_whitelist is not null, even when it's null in the DB the API will return an empty list Signed-off-by: Daniel Jiang --- src/pkg/scan/whitelist/manager.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pkg/scan/whitelist/manager.go b/src/pkg/scan/whitelist/manager.go index d582e3f10..2d244bdb2 100644 --- a/src/pkg/scan/whitelist/manager.go +++ b/src/pkg/scan/whitelist/manager.go @@ -41,6 +41,7 @@ type defaultManager struct{} func (d *defaultManager) CreateEmpty(projectID int64) error { l := models.CVEWhitelist{ ProjectID: projectID, + Items: []models.CVEWhitelistItem{}, } _, err := dao.CreateCVEWhitelist(l) if err != nil { @@ -66,6 +67,9 @@ func (d *defaultManager) Get(projectID int64) (*models.CVEWhitelist, error) { log.Debugf("No CVE whitelist found for project %d, returning empty list.", projectID) return &models.CVEWhitelist{ProjectID: projectID, Items: []models.CVEWhitelistItem{}}, nil } + if wl.Items == nil { + wl.Items = []models.CVEWhitelistItem{} + } return wl, err }