Generalized Print Functions for code deduplication

Author: Dboy0ZDev

cmd/devguard-scanner/scanner/print.go

@@ -29,6 +29,9 @@ import (
 	"github.com/package-url/packageurl-go"
 )
 
+// Set to gitlab output size limit
+var rowLengthLimit = 80
+
 func PrintFirstPartyScanResults(scanResponse dtos.FirstPartyScanResponse, assetName string, webUI string, assetVersionName string, scannerID string) error {
 
 	if len(scanResponse.FirstPartyVulns) == 0 {
@@ -40,32 +43,34 @@ func PrintFirstPartyScanResults(scanResponse dtos.FirstPartyScanResponse, assetN
 		return v.State == dtos.VulnStateOpen
 	})
 
+	tw := table.NewWriter()
+	tw.SetAllowedRowLength(rowLengthLimit)
+
 	switch scannerID {
 	case "secret-scanning":
-		PrintSecretScanResults(openVulns, webUI, assetName, assetVersionName)
+		PrintSecretScanResults(openVulns, webUI, assetName, assetVersionName, tw)
 	default:
-		PrintSastScanResults(openVulns, webUI, assetName, assetVersionName)
+		PrintSastScanResults(openVulns, webUI, assetName, assetVersionName, tw)
 	}
 
+	link := text.FgBlue.Sprint(fmt.Sprintf("%s/%s/refs/%s/code-risks/", webUI, assetName, slug.Make(assetVersionName)))
+	wrappedLink := text.WrapText(link, rowLengthLimit)
+	tw.AppendRow(table.Row{"Link", wrappedLink})
+
+	fmt.Println(tw.Render())
+
 	if len(openVulns) > 0 {
 		return fmt.Errorf("found %d unhandled vulnerabilities", len(openVulns))
 	}
 
 	return nil
 }
 
-func PrintSecretScanResults(firstPartyVulns []dtos.FirstPartyVulnDTO, webUI string, assetName string, assetVersionName string) {
-	tw := table.NewWriter()
-	//Set to gitlab output size limit
-	rowLengthLimit := 80
-	tw.SetAllowedRowLength(rowLengthLimit)
-
-	blue := text.FgBlue
-	green := text.FgGreen
+func PrintSecretScanResults(firstPartyVulns []dtos.FirstPartyVulnDTO, webUI string, assetName string, assetVersionName string, tw table.Writer) {
 	for _, vuln := range firstPartyVulns {
 		raw := []table.Row{
 			{"RuleID:", vuln.RuleID},
-			{"File:", green.Sprint(vuln.URI)},
+			{"File:", text.FgGreen.Sprint(vuln.URI)},
 		}
 		tw.AppendRows(raw)
 		for _, snippet := range vuln.SnippetContents {
@@ -81,40 +86,23 @@ func PrintSecretScanResults(firstPartyVulns []dtos.FirstPartyVulnDTO, webUI stri
 		tw.AppendRows(raw)
 		tw.AppendSeparator()
 	}
-
-	link := blue.Sprint(fmt.Sprintf("%s/%s/refs/%s/code-risks/", webUI, assetName, slug.Make(assetVersionName)))
-	wrappedLink := text.WrapText(link, rowLengthLimit)
-	tw.AppendRow(table.Row{"Link", wrappedLink})
-
-	fmt.Println(tw.Render())
 }
 
-func PrintSastScanResults(firstPartyVulns []dtos.FirstPartyVulnDTO, webUI, assetName string, assetVersionName string) {
-	tw := table.NewWriter()
-	//Set to gitlab output size limit
-	rowLengthLimit := 80
-	tw.SetAllowedRowLength(rowLengthLimit)
+func PrintSastScanResults(firstPartyVulns []dtos.FirstPartyVulnDTO, webUI, assetName string, assetVersionName string, tw table.Writer) {
 
-	blue := text.FgBlue
-	green := text.FgGreen
 	for _, vuln := range firstPartyVulns {
 		tw.AppendRow(table.Row{"RuleID", vuln.RuleID})
 		for _, snippet := range vuln.SnippetContents {
 			tw.AppendRow(table.Row{"Snippet", snippet.Snippet})
 		}
 		tw.AppendRow(table.Row{"Message", text.WrapText(*vuln.Message, rowLengthLimit)})
 		if vuln.URI != "" {
-			tw.AppendRow(table.Row{"File", green.Sprint(vuln.URI)})
+			tw.AppendRow(table.Row{"File", text.FgGreen.Sprint(vuln.URI)})
 
 		}
 		tw.AppendSeparator()
 	}
 
-	link := blue.Sprint(fmt.Sprintf("%s/%s/refs/%s/code-risks/", webUI, assetName, slug.Make(assetVersionName)))
-	wrappedLink := text.WrapText(link, rowLengthLimit)
-	tw.AppendRow(table.Row{"Link", wrappedLink})
-
-	fmt.Println(tw.Render())
 }
 
 // can be reused for container scanning as well.