Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14164 from heww/update-report-improve 

fix: 404 if report not found when updating report
This commit is contained in:
Wenkai Yin(尹文开) 2021-02-04 16:30:18 +08:00 committed by GitHub
parent 885a268268 060a282e71
commit 99bc251a13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/controller/scan/base_controller.go
View File

@ -659,11 +659,21 @@ func (bc *basicController) UpdateReport(ctx context.Context, report *sca.CheckIn
return errors.Wrap(err, "scan controller: handle job hook")
}
logger := log.G(ctx)
if len(rpl) == 0 {
return errors.New("no report found to update data")
fields := log.Fields{
"report_digest": report.Digest,
"registration_uuid": report.RegistrationUUID,
"mime_type": report.MimeType,
}
logger.WithFields(fields).Warningf("no report found to update data")
return errors.NotFoundError(nil).WithMessage("no report found to update data")
}
log.Infof("Converting report ID %s to the new V2 schema", rpl[0].UUID)
logger.Debugf("Converting report ID %s to the new V2 schema", rpl[0].UUID)
_, reportData, err := bc.reportConverter.ToRelationalSchema(ctx, rpl[0].UUID, rpl[0].RegistrationUUID, rpl[0].Digest, report.RawReport)
if err != nil {
return errors.Wrapf(err, "Failed to convert vulnerability data to new schema for report UUID : %s", rpl[0].UUID)
@ -675,7 +685,9 @@ func (bc *basicController) UpdateReport(ctx context.Context, report *sca.CheckIn
if err := bc.manager.UpdateReportData(ctx, rpl[0].UUID, reportData); err != nil {
return errors.Wrap(err, "scan controller: handle job hook")
}
log.Infof("Converted report ID %s to the new V2 schema", rpl[0].UUID)
logger.Debugf("Converted report ID %s to the new V2 schema", rpl[0].UUID)
return nil
}