Outputting Frogbot results to CI logs - V3

scanpullrequest/scanpullrequest.go

@@ -166,6 +166,7 @@ func auditPullRequestSourceCode(repoConfig *utils.Repository, scanDetails *utils
 		issuesCollection = &issues.ScansIssuesCollection{ScanStatus: getResultScanStatues(scanResults)}
 		return
 	}
+	utils.PrintScanResultsTable(scanResults)
 	// Set JAS output flags based on the scan results
 	repoConfig.OutputWriter.SetJasOutputFlags(scanResults.Entitlements.Jas, scanResults.HasJasScansResults(jasutils.Applicability))
 	filterFailedResultsIfScannersFailuresAreAllowed(scanDetails.ResultsToCompare, scanResults, repoConfig.Params.ConfigProfile.GeneralConfig.FailUponAnyScannerError, sourceBranchWd, targetBranchWd)

scanrepository/scanrepository.go

@@ -160,6 +160,7 @@ func (sr *ScanRepositoryCmd) scanAndFixBranch(repository *utils.Repository) (tot
 		// Always check policy even if an error occurred during the scan
 		err = errors.Join(err, policy.CheckPolicyFailBuildError(scanResults))
 	}()
+	utils.PrintScanResultsTable(scanResults)
 	totalFindings = getTotalFindingsFromScanResults(scanResults)
 	sr.uploadResultsToGithubDashboardsIfNeeded(repository, scanResults)
 	sr.uploadGitLabScanResultsIfNeeded(repository, scanResults)

utils/utils.go

@@ -18,6 +18,7 @@ import (
 	"github.com/jfrog/froggit-go/vcsclient"
 	"github.com/jfrog/gofrog/version"
 	"github.com/jfrog/jfrog-cli-core/v2/common/commands"
+	"github.com/jfrog/jfrog-cli-core/v2/common/format"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-cli-security/utils"
 	"github.com/jfrog/jfrog-cli-security/utils/formats"
@@ -516,3 +517,14 @@ func writeCycloneDxToDir(outputDir string, scanResults *results.SecurityCommandR
 	log.Info(fmt.Sprintf("CycloneDX SBOM written to %s", path))
 	return nil
 }
+
+func PrintScanResultsTable(scanResults *results.SecurityCommandResults) {
+	if scanResults == nil {
+		return
+	}
+	if err := output.NewResultsWriter(scanResults).
+		SetOutputFormat(format.Table).
+		PrintScanResults(); err != nil {
+		log.Warn(fmt.Sprintf("Failed to print scan results table: %s", err.Error()))
+	}
+}

utils/utils_test.go

@@ -2,6 +2,7 @@ package utils
 
 import (
 	"encoding/json"
+	"github.com/jfrog/jfrog-client-go/xray/services"
 	"net/http/httptest"
 	"os"
 	"path"
@@ -635,3 +636,51 @@ func TestWriteScanResultsToGitlabDir(t *testing.T) {
 		})
 	}
 }
+
+func TestPrintScanResultsTable(t *testing.T) {
+	tests := []struct {
+		name        string
+		scanResults *results.SecurityCommandResults
+	}{
+		{
+			name:        "nil scan results should not panic",
+			scanResults: nil,
+		},
+		{
+			name: "empty scan results should not panic",
+			scanResults: &results.SecurityCommandResults{
+				Targets: []*results.TargetResults{},
+			},
+		},
+		{
+			name: "scan results with vulnerabilities should print without error",
+			scanResults: &results.SecurityCommandResults{
+				ResultsMetaData: results.ResultsMetaData{
+					ResultContext: results.ResultContext{IncludeVulnerabilities: true},
+				},
+				Targets: []*results.TargetResults{{
+					ScanTarget: results.ScanTarget{Target: "test-target"},
+					ScaResults: &results.ScaScanResults{
+						DeprecatedXrayResults: []services.ScanResponse{{
+							Vulnerabilities: []services.Vulnerability{
+								{
+									Cves:       []services.Cve{{Id: "CVE-2022-0001"}},
+									Severity:   "High",
+									Components: map[string]services.Component{"test-dep:1.0.0": {FixedVersions: []string{"1.0.1"}}},
+								},
+							},
+						}},
+					},
+				}},
+			},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			assert.NotPanics(t, func() {
+				PrintScanResultsTable(test.scanResults)
+			})
+		})
+	}
+}