fix(report): generate report even if some scan-err-jsons are included #685 (#686)

This commit is contained in:
Kota Kanbe
2018-07-24 22:26:46 +09:00
committed by GitHub
parent fe582ac635
commit ea800e04bc
2 changed files with 26 additions and 16 deletions

View File

@@ -476,13 +476,23 @@ func (p *ReportCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}
}
}
var res models.ScanResults
if res, err = report.LoadScanResults(dir); err != nil {
var loaded models.ScanResults
if loaded, err = report.LoadScanResults(dir); err != nil {
util.Log.Error(err)
return subcommands.ExitFailure
}
util.Log.Infof("Loaded: %s", dir)
var res models.ScanResults
for _, r := range loaded {
if len(r.Errors) == 0 {
res = append(res, r)
} else {
util.Log.Warnf("Ignored since errors occurred during scanning: %s",
r.ServerName)
}
}
if res, err = report.FillCveInfos(res, dir); err != nil {
util.Log.Error(err)
return subcommands.ExitFailure