Xray scan small fixes (#192)

* Removed JFROG_CLI_OUTPUT_COLORS.

* All results of a scan are saved to a single file.

Author: asafgabai

utils/coreutils/coreconsts.go

@@ -31,6 +31,5 @@ const (
 	BuildNumber        = "JFROG_CLI_BUILD_NUMBER"
 	Project            = "JFROG_CLI_BUILD_PROJECT"
 	TransitiveDownload = "JFROG_CLI_TRANSITIVE_DOWNLOAD_EXPERIMENTAL"
-	ColoredOutput      = "JFROG_CLI_OUTPUT_COLORS"
 	CI                 = "CI"
 )

utils/coreutils/utils.go

@@ -204,22 +204,6 @@ func IsTerminal() bool {
 	return terminal.IsTerminal(int(os.Stdout.Fd()))
 }
 
-var coloredOutput *bool
-
-// IsColoredOutput returns true if the output can be colored.
-func IsColoredOutput() bool {
-	if coloredOutput == nil {
-		coloredOutputVal := true
-		if os.Getenv(ColoredOutput) == "false" {
-			coloredOutputVal = false
-		} else {
-			coloredOutputVal = IsTerminal()
-		}
-		coloredOutput = &coloredOutputVal
-	}
-	return *coloredOutput
-}
-
 type Credentials interface {
 	SetUser(string)
 	SetPassword(string)

xray/commands/audit/javautils.go

@@ -13,7 +13,6 @@ import (
 	xrutils "github.com/jfrog/jfrog-cli-core/v2/xray/utils"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
-	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 	"github.com/jfrog/jfrog-client-go/xray/services"
 )
@@ -56,11 +55,6 @@ func runScanGraph(modulesDependencyTrees []*services.GraphNode, serverDetails *c
 		return err
 	}
 
-	tempDirPath, err := fileutils.CreateTempDir()
-	if err != nil {
-		return err
-	}
-
 	var violations []services.Violation
 	var vulnerabilities []services.Vulnerability
 	var licenses []services.License
@@ -85,20 +79,22 @@ func runScanGraph(modulesDependencyTrees []*services.GraphNode, serverDetails *c
 		if err != nil {
 			return err
 		}
-		if outputFormat == Table {
-			if err = xrutils.WriteJsonResults(scanResults, tempDirPath); err != nil {
-				return err
-			}
+		results = append(results, *scanResults)
 
+		if outputFormat == Table {
 			violations = append(violations, scanResults.Violations...)
 			vulnerabilities = append(vulnerabilities, scanResults.Vulnerabilities...)
 			licenses = append(licenses, scanResults.Licenses...)
-		} else {
-			results = append(results, *scanResults)
 		}
 	}
 	if outputFormat == Table {
-		fmt.Println("The full scan results are available here: " + tempDirPath)
+		if len(results) > 0 {
+			resultsPath, err := xrutils.WriteJsonResults(results)
+			if err != nil {
+				return err
+			}
+			fmt.Println("The full scan results are available here: " + resultsPath)
+		}
 		if includeVulnerabilities {
 			xrutils.PrintVulnerabilitiesTable(vulnerabilities, false)
 		} else {

xray/commands/audit/npm.go

@@ -8,7 +8,6 @@ import (
 	npmutils "github.com/jfrog/jfrog-cli-core/v2/utils/npm"
 	"github.com/jfrog/jfrog-cli-core/v2/xray/commands"
 	xrutils "github.com/jfrog/jfrog-cli-core/v2/xray/utils"
-	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/jfrog/jfrog-client-go/xray/services"
 )
 
@@ -124,14 +123,11 @@ func (auditCmd *AuditNpmCommand) Run() (err error) {
 		return err
 	}
 	if auditCmd.outputFormat == Table {
-		tempDirPath, err := fileutils.CreateTempDir()
+		resultsPath, err := xrutils.WriteJsonResults([]services.ScanResponse{*scanResults})
 		if err != nil {
 			return err
 		}
-		if err = xrutils.WriteJsonResults(scanResults, tempDirPath); err != nil {
-			return err
-		}
-		fmt.Println("The full scan results are available here: " + tempDirPath)
+		fmt.Println("The full scan results are available here: " + resultsPath)
 
 		if auditCmd.includeVulnerabilities {
 			xrutils.PrintVulnerabilitiesTable(scanResults.Vulnerabilities, false)

xray/commands/audit/scan.go

@@ -218,7 +218,6 @@ func getAddTaskToProducerFunc(producer parallel.Runner, errorsQueue *clientutils
 }
 
 func (scanCmd *ScanCommand) performScanTasks(fileConsumer parallel.Runner, indexedFileConsumer parallel.Runner, resultsArr [][]*services.ScanResponse) (bool, error) {
-
 	go func() {
 		// Blocking until consuming is finished.
 		fileConsumer.Run()
@@ -233,30 +232,30 @@ func (scanCmd *ScanCommand) performScanTasks(fileConsumer parallel.Runner, index
 	vulnerabilities := []services.Vulnerability{}
 	licenses := []services.License{}
 	flatResults := []services.ScanResponse{}
-	tempDirPath, err := fileutils.CreateTempDir()
-	if err != nil {
-		return false, err
-	}
 	for _, arr := range resultsArr {
 		for _, res := range arr {
+			flatResults = append(flatResults, *res)
+
 			if scanCmd.outputFormat == Table {
-				if err = xrutils.WriteJsonResults(res, tempDirPath); err != nil {
-					return false, err
-				}
 				violations = append(violations, res.Violations...)
 				vulnerabilities = append(vulnerabilities, res.Vulnerabilities...)
 				licenses = append(licenses, res.Licenses...)
-			} else {
-				flatResults = append(flatResults, *res)
 			}
 			if len(res.Violations) > 0 || len(res.Vulnerabilities) > 0 {
 				// A violation or vulnerability was found, the scan failed.
 				scanPassed = false
 			}
 		}
 	}
+	var err error
 	if scanCmd.outputFormat == Table {
-		fmt.Println("The full scan results are available here: " + tempDirPath)
+		if len(flatResults) > 0 {
+			resultsPath, err := xrutils.WriteJsonResults(flatResults)
+			if err != nil {
+				return false, err
+			}
+			fmt.Println("The full scan results are available here: " + resultsPath)
+		}
 		if scanCmd.includeVulnerabilities {
 			xrutils.PrintVulnerabilitiesTable(vulnerabilities, true)
 		} else {
@@ -267,7 +266,6 @@ func (scanCmd *ScanCommand) performScanTasks(fileConsumer parallel.Runner, index
 		}
 	} else {
 		err = xrutils.PrintJson(flatResults)
-
 	}
 	if scanPassed {
 		log.Info("Scan completed successfully.")

xray/utils/resultstable.go

@@ -24,7 +24,7 @@ func PrintViolationsTable(violations []services.Violation, multipleRoots bool) e
 	var licenseViolationsRows []licenseViolationRow
 	failBuild := false
 
-	coloredOutput := coreutils.IsColoredOutput()
+	coloredOutput := coreutils.IsTerminal()
 
 	for _, violation := range violations {
 		impactedPackagesNames, impactedPackagesVersions, impactedPackagesTypes, fixedVersions, components := splitComponents(violation.Components, multipleRoots)
@@ -105,7 +105,7 @@ func PrintVulnerabilitiesTable(vulnerabilities []services.Vulnerability, multipl
 		"Read more about configuring Xray policies here: https://www.jfrog.com/confluence/display/JFROG/Creating+Xray+Policies+and+Rules\n" +
 		"Below are all vulnerabilities detected.")
 
-	coloredOutput := coreutils.IsColoredOutput()
+	coloredOutput := coreutils.IsTerminal()
 
 	var vulnerabilitiesRows []vulnerabilityRow
 

xray/utils/resultwriter.go

@@ -3,31 +3,26 @@ package utils
 import (
 	"bytes"
 	"encoding/json"
-	"io/ioutil"
-	"strconv"
-	"time"
-
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
+	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/jfrog/jfrog-client-go/xray/services"
 )
 
-func WriteJsonResults(results *services.ScanResponse, dirPath string) error {
-	timestamp := strconv.FormatInt(time.Now().Unix(), 10)
-	out, err := ioutil.TempFile(dirPath, timestamp+"-")
+func WriteJsonResults(results []services.ScanResponse) (string, error) {
+	out, err := fileutils.CreateTempFile()
 	if err != nil {
-		return errorutils.CheckError(err)
+		return "", errorutils.CheckError(err)
 	}
 	defer out.Close()
 	bytesRes, err := json.Marshal(&results)
 	if err != nil {
-		return errorutils.CheckError(err)
+		return "", errorutils.CheckError(err)
 	}
 	var content bytes.Buffer
 	err = json.Indent(&content, bytesRes, "", "  ")
 	if err != nil {
-		return errorutils.CheckError(err)
+		return "", errorutils.CheckError(err)
 	}
 	_, err = out.Write([]byte(content.String()))
-	return errorutils.CheckError(err)
-
+	return out.Name(), errorutils.CheckError(err)
 }