cr review finish

jfrog · Sep 30, 2024 · b33b31f · b33b31f
1 parent 882ec7b
commit b33b31f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/utils/results/output/securityJobSummary.go b/utils/results/output/securityJobSummary.go
@@ -190,12 +190,8 @@ func RecordSarifOutput(cmdResults *results.SecurityCommandResults, includeVulner
 	if err != nil || manager == nil {
 		return
 	}
-	if !cmdResults.EntitledForJas {
+	if !cmdResults.EntitledForJas || !commandsummary.StaticMarkdownConfig.IsExtendedSummary() {
 		// If no JAS no GHAS
-		return
-	}
-	extended := true
-	if !extended && !commandsummary.StaticMarkdownConfig.IsExtendedSummary() {
 		log.Info("Results can be uploaded to Github security tab automatically by upgrading your JFrog subscription.")
 		return
 	}

diff --git a/utils/xsc/analyticsmetrics_test.go b/utils/xsc/analyticsmetrics_test.go
@@ -106,6 +106,9 @@ func TestAnalyticsMetricsService_createAuditResultsFromXscAnalyticsBasicGeneralE
 	}
 }
 
+// Create a dummy content for general event. 1 SCA scan with 1 vulnerability
+// withJas - Add 2 JAS results for each scan type.
+// withErr - Add an error to the results.
 func getDummyContentForGeneralEvent(withJas, withErr bool) *results.SecurityCommandResults {
 	vulnerabilities := []services.Vulnerability{{IssueId: "XRAY-ID", Severity: "medium", Cves: []services.Cve{{Id: "CVE-123"}}, Components: map[string]services.Component{"issueId_2_direct_dependency": {}}}}