From 144edcc0c4ac3a930ca081a712730cd1f6726ba8 Mon Sep 17 00:00:00 2001 From: Steven Zou Date: Mon, 20 Jul 2020 16:08:58 +0800 Subject: [PATCH] fix(preheat):fix ctl ut failure case Signed-off-by: Steven Zou --- src/controller/p2p/preheat/controllor_test.go | 6 +++++- src/controller/p2p/preheat/enforcer.go | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/controller/p2p/preheat/controllor_test.go b/src/controller/p2p/preheat/controllor_test.go index ea3955e21..001598783 100644 --- a/src/controller/p2p/preheat/controllor_test.go +++ b/src/controller/p2p/preheat/controllor_test.go @@ -7,6 +7,8 @@ import ( "net/http/httptest" "testing" + "github.com/goharbor/harbor/src/lib/q" + "github.com/goharbor/harbor/src/pkg/p2p/preheat/provider/auth" "github.com/goharbor/harbor/src/core/config" @@ -66,7 +68,9 @@ func (s *preheatSuite) SetupSuite() { }, }, nil) s.fakeInstanceMgr.On("Save", mock.Anything, mock.Anything).Return(int64(1), nil) - s.fakeInstanceMgr.On("Count", mock.Anything, &providerModel.Instance{Endpoint: "http://localhost"}).Return(int64(1), nil) + s.fakeInstanceMgr.On("Count", mock.Anything, &q.Query{Keywords: map[string]interface{}{ + "endpoint": "http://localhost", + }}).Return(int64(1), nil) s.fakeInstanceMgr.On("Count", mock.Anything, mock.Anything).Return(int64(0), nil) s.fakeInstanceMgr.On("Delete", mock.Anything, int64(1)).Return(nil) s.fakeInstanceMgr.On("Delete", mock.Anything, int64(0)).Return(errors.New("not found")) diff --git a/src/controller/p2p/preheat/enforcer.go b/src/controller/p2p/preheat/enforcer.go index 0d794cb02..6ba0d3112 100644 --- a/src/controller/p2p/preheat/enforcer.go +++ b/src/controller/p2p/preheat/enforcer.go @@ -603,7 +603,7 @@ func overrideSecuritySettings(p *pol.Schema, pro *models.Project) [][]interface{ case pol.FilterTypeVulnerability: if v, ok := pro.Metadata[proMetaKeyVulnerability]; ok && v == "true" { if se, ok := pro.Metadata[proMetaKeySeverity]; ok && len(se) > 0 { - se = strings.ToTitle(strings.ToLower(se)) + se = strings.Title(strings.ToLower(se)) code := vuln.Severity(se).Code() if sev, ok := fl.Value.(int); !ok || (ok && sev < code) {