From 27b3e17b79f5cf0d79ae3b1103b0e827f383fb3f Mon Sep 17 00:00:00 2001 From: Kota Kanbe Date: Thu, 15 Apr 2021 05:58:41 +0900 Subject: [PATCH] feat(saas): delete json dir automatically after upload (#1212) * feat(saas): delete json dir automatically after upload * fix lint err --- detector/msf.go | 2 +- oval/redhat.go | 2 +- oval/suse.go | 2 +- subcmds/saas.go | 11 +++++++++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/detector/msf.go b/detector/msf.go index 90cce6ca..76ce6e1f 100644 --- a/detector/msf.go +++ b/detector/msf.go @@ -22,7 +22,7 @@ func FillWithMetasploit(r *models.ScanResult, cnf config.MetasploitConf) (nMetas } defer func() { if err := driver.CloseDB(); err != nil { - logging.Log.Errorf("Failed to close DB. err: %+v") + logging.Log.Errorf("Failed to close DB. err: %+v", err) } }() diff --git a/oval/redhat.go b/oval/redhat.go index effcbc72..9cc6019d 100644 --- a/oval/redhat.go +++ b/oval/redhat.go @@ -33,7 +33,7 @@ func (o RedHatBase) FillWithOval(r *models.ScanResult) (nCVEs int, err error) { } defer func() { if err := driver.CloseDB(); err != nil { - logging.Log.Errorf("Failed to close DB. err: %+v") + logging.Log.Errorf("Failed to close DB. err: %+v", err) } }() diff --git a/oval/suse.go b/oval/suse.go index d1e6b956..bf598061 100644 --- a/oval/suse.go +++ b/oval/suse.go @@ -40,7 +40,7 @@ func (o SUSE) FillWithOval(r *models.ScanResult) (nCVEs int, err error) { } defer func() { if err := driver.CloseDB(); err != nil { - logging.Log.Errorf("Failed to close DB. err: %+v") + logging.Log.Errorf("Failed to close DB. err: %+v", err) } }() diff --git a/subcmds/saas.go b/subcmds/saas.go index fd53ab61..927013df 100644 --- a/subcmds/saas.go +++ b/subcmds/saas.go @@ -125,5 +125,16 @@ func (p *SaaSCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) 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) + } + symlink := filepath.Join(config.Conf.ResultsDir, "current") + err := os.Remove(symlink) + if err != nil { + logging.Log.Warnf("Failed to remove %s. err: %+v", dir, err) + } + } + return subcommands.ExitSuccess }