diff --git a/subcmds/report.go b/subcmds/report.go index 828bd1052b..2f9696c63d 100644 --- a/subcmds/report.go +++ b/subcmds/report.go @@ -237,14 +237,11 @@ func (p *ReportCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{} logging.Log.Infof("Loaded: %s", dir) var res models.ScanResults - hasError := false for _, r := range loaded { if len(r.Errors) == 0 { res = append(res, r) } else { - logging.Log.Errorf("Ignored since errors occurred during scanning: %s, err: %v", - r.ServerName, r.Errors) - hasError = true + logging.Log.Errorf("Ignored since errors occurred during scanning: %s, err: %v", r.ServerName, r.Errors) } } @@ -361,9 +358,5 @@ func (p *ReportCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{} } } - if hasError { - return subcommands.ExitFailure - } - return subcommands.ExitSuccess } diff --git a/subcmds/saas.go b/subcmds/saas.go index 185091321c..aa7500db13 100644 --- a/subcmds/saas.go +++ b/subcmds/saas.go @@ -8,7 +8,6 @@ import ( "github.com/future-architect/vuls/config" "github.com/future-architect/vuls/logging" - "github.com/future-architect/vuls/models" "github.com/future-architect/vuls/reporter" "github.com/future-architect/vuls/saas" "github.com/google/subcommands" @@ -81,25 +80,12 @@ func (p *SaaSCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) return subcommands.ExitUsageError } - var loaded models.ScanResults - if loaded, err = reporter.LoadScanResults(dir); err != nil { + res, err := reporter.LoadScanResults(dir) + if err != nil { logging.Log.Error(err) return subcommands.ExitFailure } logging.Log.Infof("Loaded: %s", dir) - - var res models.ScanResults - hasError := false - for _, r := range loaded { - if len(r.Errors) == 0 { - res = append(res, r) - } else { - logging.Log.Errorf("Ignored since errors occurred during scanning: %s, err: %v", - r.ServerName, r.Errors) - hasError = true - } - } - if len(res) == 0 { return subcommands.ExitFailure } @@ -121,10 +107,6 @@ func (p *SaaSCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) return subcommands.ExitFailure } - if hasError { - return subcommands.ExitFailure - } - if !config.Conf.Debug { if err := os.RemoveAll(dir); err != nil { logging.Log.Warnf("Failed to remove %s. err: %+v", dir, err)