chore: Update FoD/SSC github-pr-comment actions

chore: Remove unused code fix: FoD/SSC: Improve `github-pr-comment` action output
fortify · Aug 21, 2024 · 694e7ae · 694e7ae
1 parent 4f40a04
commit 694e7ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 32 deletions.
diff --git a/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/actions/zip/github-pr-comment.yaml b/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/actions/zip/github-pr-comment.yaml
@@ -91,9 +91,6 @@ steps:
             - if: ${(issue.status=='New' || issue.status=='Reopen')}
               name: newIssues
               valueTemplate: mdIssueListItem
-            - if: ${(issue.status=='New' || issue.status=='Reopen') && issue.engineType=='Static'}
-              name: jsonSourceCodeComments
-              valueTemplate: jsonSourceCodeComment
 
   - progress: Generating GitHub request
   - set:
@@ -125,7 +122,6 @@ valueTemplates:
       # For now, we don't include any source code comments, as this will cause
       # GitHub to return an error if the source file doesn't exist in the repo.
       comments: ${{}} 
-      # comments: ${jsonSourceCodeComments?:{}}
 
   - name: reviewBody
     contents: |
@@ -143,19 +139,8 @@ valueTemplates:
         ? "* No removed issues were detected" 
         : ("* "+#join('\n* ',removedIssues))}
         
-  - name: jsonSourceCodeComment
-    contents:
-      path: ${issue.primaryLocationFull}
-      line: ${issue.lineNumber==0?1:issue.lineNumber}
-      body: |
-        <p><b>Security Scanning</b> / Fortify SAST</p>
-        <h3>${issue.severityString} - ${issue.category} </h3>
-        <p>${#htmlToText(issue.details?.summary)}</p>
-        <br>
-        <p><a href=${#fod.issueBrowserUrl(issue)} target="_blank" rel="noopener noreferrer">More information</a></p>
   - name: mdIssueListItem
-    contents: >
-      ${issue.status} (${issue.scantype}): [${issue.primaryLocationFull}${issue.lineNumber==null?'':':'+issue.lineNumber} - ${issue.category}](${#fod.issueBrowserUrl(issue)})
+    contents: "${issue.status} (${issue.scantype}) - ${issue.category}:    \n[${issue.primaryLocationFull}${issue.lineNumber==null?'':':'+issue.lineNumber}](${#fod.issueBrowserUrl(issue)})"
 
 
 
diff --git a/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/github-pr-comment.yaml b/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/github-pr-comment.yaml
@@ -97,9 +97,6 @@ steps:
             - if: ${(issue.scanStatus=='NEW' || issue.scanStatus=='REINTRODUCED')}
               name: newIssues
               valueTemplate: mdIssueListItem
-            - if: ${(issue.scanStatus=='NEW' || issue.scanStatus=='REINTRODUCED') && issue.engineType=='SCA'}
-              name: jsonSourceCodeComments
-              valueTemplate: jsonSourceCodeComment
 
   - progress: Generating GitHub request
   - set:
@@ -131,7 +128,6 @@ valueTemplates:
       # For now, we don't include any source code comments, as this will cause
       # GitHub to return an error if the source file doesn't exist in the repo.
       comments: ${{}} 
-      # comments: ${jsonSourceCodeComments?:{}}
 
   - name: reviewBody
     contents: |
@@ -149,16 +145,6 @@ valueTemplates:
         ? "* No removed issues were detected" 
         : ("* "+#join('\n* ',removedIssues))}
         
-  - name: jsonSourceCodeComment
-    contents:
-      path: ${issue.fullFileName}
-      line: ${issue.lineNumber==0?1:issue.lineNumber}
-      body: |
-        <p><b>Security Scanning</b> / Fortify SAST</p>
-        <h3>${issue.details.friority} - ${issue.details.issueName} </h3>
-        <p>${issue.details.brief}</p>
-        <br>
-        <p><a href=${#ssc.issueBrowserUrl(issue,parameters.filterset)} target="_blank" rel="noopener noreferrer">More information</a></p>
   - name: mdIssueListItem
-    contents: >
-      ${issue.scanStatus} (${issue.engineCategory}): [${issue.fullFileName}${issue.lineNumber==null?'':':'+issue.lineNumber} - ${issue.issueName}](${#ssc.issueBrowserUrl(issue,parameters.filterset)})
+    contents: "${issue.scanStatus} (${issue.engineCategory}) - ${issue.issueName}:    \n[${issue.fullFileName}${issue.lineNumber==null?'':':'+issue.lineNumber}](${#ssc.issueBrowserUrl(issue,parameters.filterset)})"
+