remove log finished content before output print

Author: attiasas

cli/gitcommands.go

@@ -99,7 +99,6 @@ func GitAuditCmd(c *components.Context) error {
 	gitAuditCmd.SetUploadCdxResults(uploadResults).SetRtResultRepository(c.GetStringFlagValue(flags.UploadRtRepoPath))
 	// Run the command with progress bar if needed, Reporting error if Xsc service is enabled
 	err = reportErrorIfExists(xrayVersion, xscVersion, serverDetails, gitAuditCmd.GetProjectKey(), progressbar.ExecWithProgress(gitAuditCmd))
-	log.Info("####### jf git audit Scan Finished #######")
 	return err
 }
 

cli/scancommands.go

@@ -433,7 +433,6 @@ func AuditCmd(c *components.Context) error {
 	auditCmd.SetThreads(threads)
 	// Reporting error if Xsc service is enabled
 	err = reportErrorIfExists(xrayVersion, xscVersion, serverDetails, auditCmd.GetProjectKey(), progressbar.ExecWithProgress(auditCmd))
-	log.Info("####### jf audit Scan Finished #######")
 	return err
 }
 

commands/audit/audit.go

@@ -242,7 +242,7 @@ func (auditCmd *AuditCommand) Run() (err error) {
 			return errors.Join(err, auditResults.GetErrors())
 		}
 	}
-
+	log.Info("####### jf audit Scan Finished #######")
 	return OutputResultsAndCmdError(auditResults, auditCmd.getResultWriter(auditResults), auditCmd.Fail)
 }
 

commands/git/audit/gitaudit.go

@@ -62,6 +62,7 @@ func (gaCmd *GitAuditCommand) Run() (err error) {
 			return errors.Join(err, auditResults.GetErrors())
 		}
 	}
+	log.Info("####### jf git audit Scan Finished #######")
 	return sourceAudit.OutputResultsAndCmdError(auditResults, gaCmd.getResultWriter(auditResults), gaCmd.failBuild)
 }