Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-07-04 18:55:36 +02:00
Code Issues Projects Releases Wiki Activity

remove duplicate codes in notification handler (#2828)

Browse Source
This commit is contained in:
Wenkai Yin 2017-07-20 18:10:52 +08:00 committed by Yan
parent e0040a09b6
commit 1c4a42009d
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ui/service/notifications/registry/handler.go
View File

@ -107,7 +107,7 @@ func (n *NotificationHandler) Post() {
go api.TriggerReplicationByRepository(pro.ProjectID, repository, []string{tag}, models.RepOpTransfer) go api.TriggerReplicationByRepository(pro.ProjectID, repository, []string{tag}, models.RepOpTransfer)
if autoScanEnabled(project) { if autoScanEnabled(pro) {
last, err := clairdao.GetLastUpdate() last, err := clairdao.GetLastUpdate()
if err != nil { if err != nil {
log.Errorf("Failed to get last update from Clair DB, error: %v, the auto scan will be skipped.", err) log.Errorf("Failed to get last update from Clair DB, error: %v, the auto scan will be skipped.", err)
@ -165,21 +165,13 @@ func filterEvents(notification *models.Notification) ([]*models.Event, error) {
return events, nil return events, nil
} }
func autoScanEnabled(projectName string) bool { func autoScanEnabled(project *models.Project) bool {
if !config.WithClair() { if !config.WithClair() {
log.Debugf("Auto Scan disabled because Harbor is not deployed with Clair") log.Debugf("Auto Scan disabled because Harbor is not deployed with Clair")
return false return false
} }
if config.WithAdmiral() { if config.WithAdmiral() {
p, err := config.GlobalProjectMgr.Get(projectName) return project.AutomaticallyScanImagesOnPush
if err != nil {
log.Warningf("failed to get project, error: %v", err)
return false
} else if p == nil {
log.Warningf("project with name: %s not found.", projectName)
return false
}
return p.AutomaticallyScanImagesOnPush
} }
return os.Getenv("ENABLE_HARBOR_SCAN_ON_PUSH") == "1" return os.Getenv("ENABLE_HARBOR_SCAN_ON_PUSH") == "1"
} }