From 8adb8624c48768fd5f72594e39be90c1536c53f0 Mon Sep 17 00:00:00 2001 From: attiasas Date: Mon, 11 Sep 2023 13:52:09 +0300 Subject: [PATCH] remove Jas summary --- scanpullrequest/scanpullrequest.go | 2 +- utils/outputwriter/outputwriter.go | 19 ------------------- utils/outputwriter/simplifiedoutput.go | 22 ---------------------- utils/outputwriter/standardoutput.go | 23 ----------------------- 4 files changed, 1 insertion(+), 65 deletions(-) diff --git a/scanpullrequest/scanpullrequest.go b/scanpullrequest/scanpullrequest.go index dd6a4875a..a869fdbd4 100644 --- a/scanpullrequest/scanpullrequest.go +++ b/scanpullrequest/scanpullrequest.go @@ -396,7 +396,7 @@ func createPullRequestMessage(vulnerabilitiesRows []formats.VulnerabilityOrViola if len(vulnerabilitiesRows) == 0 && !isDetectedJasIssues(applicableIssues, iacIssues, sastIssues) { return writer.NoVulnerabilitiesTitle() + writer.UntitledForJasMsg() + writer.Footer() } - return writer.VulnerabilitiesTitle(true) + writer.VulnerabilitiesContent(vulnerabilitiesRows) + writer.JasResultSummary(applicableIssues, iacIssues, sastIssues) + writer.UntitledForJasMsg() + writer.Footer() + return writer.VulnerabilitiesTitle(true) + writer.VulnerabilitiesContent(vulnerabilitiesRows) + writer.UntitledForJasMsg() + writer.Footer() } func deleteExistingPullRequestComment(repository *utils.Repository, client vcsclient.VcsClient) error { diff --git a/utils/outputwriter/outputwriter.go b/utils/outputwriter/outputwriter.go index f457bdfae..9c3d79876 100644 --- a/utils/outputwriter/outputwriter.go +++ b/utils/outputwriter/outputwriter.go @@ -111,7 +111,6 @@ type OutputWriter interface { SetVcsProvider(provider vcsutils.VcsProvider) UntitledForJasMsg() string - JasResultSummary(applicability, iac, sast *sarif.Run) string ApplicableCveReviewContent(severity, finding, fullDetails, cveDetails, remediation string) string IacReviewContent(severity, finding, fullDetails string) string SastReviewContent(severity, finding, fullDetails string, codeFlows []*sarif.CodeFlow) string @@ -186,24 +185,6 @@ func createVulnerabilityDescription(vulnerability *formats.VulnerabilityOrViolat return descriptionBuilder.String() } -func getSummaryRowContent(run *sarif.Run, icon, finding string) string { - plural := "s" - if len(run.Results) == 1 { - plural = "" - } - return fmt.Sprintf(` - -* %s Found %d location%s with %s - -`, - icon, - xrayutils.GetResultsLocationCount(run), - plural, - finding, - ) - -} - func getVulnerabilitiesTableContent(vulnerabilities []formats.VulnerabilityOrViolationRow, writer OutputWriter) string { var tableContent string for _, vulnerability := range vulnerabilities { diff --git a/utils/outputwriter/simplifiedoutput.go b/utils/outputwriter/simplifiedoutput.go index 10f470f59..013afc6af 100644 --- a/utils/outputwriter/simplifiedoutput.go +++ b/utils/outputwriter/simplifiedoutput.go @@ -112,28 +112,6 @@ func (smo *SimplifiedOutput) VulnerabilitiesContent(vulnerabilities []formats.Vu return contentBuilder.String() } -func (smo *SimplifiedOutput) JasResultSummary(applicability, iac, sast *sarif.Run) string { - if len(applicability.Results) == 0 && len(iac.Results) == 0 && len(sast.Results) == 0 { - return "" - } - var contentBuilder strings.Builder - contentBuilder.WriteString(` - ## JFrog Advanced Security Finding: - - `) - if len(applicability.Results) > 0 { - contentBuilder.WriteString(getSummaryRowContent(applicability, "📦🔍", "Applicable Cve Vulnerability")) - } - if len(iac.Results) > 0 { - contentBuilder.WriteString(getSummaryRowContent(iac, "🛠️", "Infrastructure as Code Vulnerability")) - } - if len(sast.Results) > 0 { - contentBuilder.WriteString(getSummaryRowContent(sast, "🔐", "Static Application Security Testing (SAST) Vulnerability")) - } - - return contentBuilder.String() -} - func (smo *SimplifiedOutput) ApplicableCveReviewContent(severity, finding, fullDetails, cveDetails, remediation string) string { return fmt.Sprintf(` ## 📦🔍 Applicable dependency CVE Vulnerability %s diff --git a/utils/outputwriter/standardoutput.go b/utils/outputwriter/standardoutput.go index 4b5839eba..64a94772a 100644 --- a/utils/outputwriter/standardoutput.go +++ b/utils/outputwriter/standardoutput.go @@ -126,29 +126,6 @@ func (so *StandardOutput) VulnerabilitiesContent(vulnerabilities []formats.Vulne return contentBuilder.String() } -func (so *StandardOutput) JasResultSummary(applicability, iac, sast *sarif.Run) string { - if len(applicability.Results) == 0 && len(iac.Results) == 0 && len(sast.Results) == 0 { - return "" - } - var contentBuilder strings.Builder - contentBuilder.WriteString(` - -## JFrog Advanced Security Finding: - -`) - if len(applicability.Results) > 0 { - contentBuilder.WriteString(getSummaryRowContent(applicability, "📦🔍", "Applicable Cve Vulnerability")) - } - if len(iac.Results) > 0 { - contentBuilder.WriteString(getSummaryRowContent(iac, "🛠️", "Infrastructure as Code Vulnerability")) - } - if len(sast.Results) > 0 { - contentBuilder.WriteString(getSummaryRowContent(sast, "🔐", "Static Application Security Testing (SAST) Vulnerability")) - } - - return contentBuilder.String() -} - func (so *StandardOutput) ApplicableCveReviewContent(severity, finding, fullDetails, cveDetails, remediation string) string { return fmt.Sprintf(` ### 📦🔍 Applicable dependency CVE Vulnerability