Skip to content

Commit

Permalink
remove Jas summary
Browse files Browse the repository at this point in the history
  • Loading branch information
attiasas committed Sep 11, 2023
1 parent 0a9db81 commit 8adb862
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 65 deletions.
2 changes: 1 addition & 1 deletion scanpullrequest/scanpullrequest.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
19 changes: 0 additions & 19 deletions utils/outputwriter/outputwriter.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
22 changes: 0 additions & 22 deletions utils/outputwriter/simplifiedoutput.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 0 additions & 23 deletions utils/outputwriter/standardoutput.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8adb862

Please sign in to comment.