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

Merge pull request #9637 from steven-zou/fix/bug_#9629

Browse Source 
fix the bug of returning errors when nothing is updated
This commit is contained in:
Steven Zou 2019-10-29 17:37:06 +08:00 committed by GitHub
commit 19eb0ae7f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/service/notifications/jobs/handler.go
View File

@ -93,10 +93,12 @@ func (h *Handler) Prepare() {
// HandleScan handles the webhook of scan job
func (h *Handler) HandleScan() {
log.Debugf("Received scan job status update event: job UUID: %s, status: %s, track_id: %s, is checkin: %v",
log.Debugf(
"Received scan job status update event: job UUID: %s, status: %s, track_id: %s, revision: %d, is checkin: %v",
h.change.JobID,
h.status,
h.trackID,
h.revision,
len(h.checkIn) > 0,
)

9
src/pkg/scan/dao/scan/report.go
View File

@ -20,6 +20,7 @@ import (
"github.com/astaxie/beego/orm"
"github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/common/utils/log"
"github.com/goharbor/harbor/src/pkg/q"
"github.com/pkg/errors"
)
@ -97,8 +98,10 @@ func UpdateReportData(uuid string, report string, statusRev int64) error {
return err
}
// Update has preconditions which may NOT be matched, and then count may equal 0.
// Just need log, no error need to be returned.
if count == 0 {
return errors.Errorf("no report with uuid %s updated", uuid)
log.Warningf("Data of report with uuid %s is not updated as preconditions may not be matched: status change revision %d", uuid, statusRev)
}
return nil
@ -128,8 +131,10 @@ func UpdateReportStatus(trackID string, status string, statusCode int, statusRev
return err
}
// Update has preconditions which may NOT be matched, and then count may equal 0.
// Just need log, no error need to be returned.
if count == 0 {
return errors.Errorf("no report with track_id %s updated", trackID)
log.Warningf("Status of report with track ID %s is not updated as preconditions may not be matched: status change revision %d, status code %d", trackID, statusRev, statusCode)
}
return nil

6
src/pkg/scan/dao/scan/report_test.go
View File

@ -116,7 +116,7 @@ func (suite *ReportTestSuite) TestReportUpdateReportData() {
assert.Equal(suite.T(), "{}", l[0].Report)
err = UpdateReportData("uuid", "{\"a\": 900}", 900)
require.Error(suite.T(), err)
require.NoError(suite.T(), err)
}
// TestReportUpdateStatus tests update the report status.
@ -125,8 +125,8 @@ func (suite *ReportTestSuite) TestReportUpdateStatus() {
require.NoError(suite.T(), err)
err = UpdateReportStatus("track-uuid", job.RunningStatus.String(), job.RunningStatus.Code(), 900)
require.Error(suite.T(), err)
require.NoError(suite.T(), err)
err = UpdateReportStatus("track-uuid", job.PendingStatus.String(), job.PendingStatus.Code(), 1000)
require.Error(suite.T(), err)
require.NoError(suite.T(), err)
}