d

.github/workflows/securityAlertsReview.yml

@@ -95,29 +95,30 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          COMMENT_BODY="### 🤖 GitHub Action: Security Alerts Review 🔍\n\n"
+          COMMENT_BODY="### 🤖 GitHub Action: Security Alerts Review 🔍\n"
 
           # Add Unresolved Alerts
           if [[ "$UNRESOLVED_COUNT" -gt 0 ]]; then
-            COMMENT_BODY+="🚨 **Unresolved Security Alerts Found!** 🚨\n"
-            COMMENT_BODY+="The following security alerts must be **resolved** before merging:\n\n"
+            COMMENT_BODY+="\n## ❌ Unresolved Security Alerts\n"
+            COMMENT_BODY+="These **must be resolved** before merging:\n\n"
 
             while IFS= read -r row; do
               ALERT_URL=$(echo "$row" | jq -r '.html_url')
               ALERT_FILE=$(echo "$row" | jq -r '.most_recent_instance.location.path')
               ALERT_DESCRIPTION=$(echo "$row" | jq -r '.most_recent_instance.message.text')
 
-              COMMENT_BODY+="🔴 [View Alert]($ALERT_URL) - **File:** \`$ALERT_FILE\`\n"
-              COMMENT_BODY+="   🔹 $ALERT_DESCRIPTION\n\n"
+              COMMENT_BODY+="🔴 **[View Alert]($ALERT_URL)**\n"
+              COMMENT_BODY+="📌 **File:** \`$ALERT_FILE\`\n"
+              COMMENT_BODY+="💡 **Issue:** $ALERT_DESCRIPTION\n\n"
             done < <(echo "$UNRESOLVED_ALERTS" | jq -c '.[]')
 
             COMMENT_BODY+="⚠️ **Please resolve these alerts before merging.**\n\n"
           fi
 
-          # Add Dismissed Alerts With Comments (Including Reason)
+          # Add Dismissed Alerts With Comments
           if [[ "$DISMISSED_WITH_COMMENTS_COUNT" -gt 0 ]]; then
-            COMMENT_BODY+="🟢 **Some security alerts were dismissed with comments.** ✅\n"
-            COMMENT_BODY+="The following alerts were dismissed with explanations:\n\n"
+            COMMENT_BODY+="\n## ✅ Dismissed Alerts with Explanations\n"
+            COMMENT_BODY+="The following alerts were **dismissed with valid reasons**:\n\n"
 
             while IFS= read -r row; do
               ALERT_URL=$(echo "$row" | jq -r '.html_url')
@@ -129,13 +130,32 @@ jobs:
               # Capitalize the first letter of the dismissal reason
               FORMATTED_DISMISS_REASON=$(echo "$DISMISS_REASON" | awk '{print toupper(substr($0,1,1)) substr($0,2)}')
 
-              COMMENT_BODY+="🟢 [View Alert]($ALERT_URL) - **File:** \`$ALERT_FILE\`\n"
-              COMMENT_BODY+="   🔹 $ALERT_DESCRIPTION\n"
-              COMMENT_BODY+="   ✏️ **Dismissal Reason:** \`$FORMATTED_DISMISS_REASON\`\n"
-              COMMENT_BODY+="   💬 **Comment:** \"$DISMISS_COMMENT\"\n\n"
+              COMMENT_BODY+="🟢 **[View Alert]($ALERT_URL)**\n"
+              COMMENT_BODY+="📌 **File:** \`$ALERT_FILE\`\n"
+              COMMENT_BODY+="💡 **Issue:** $ALERT_DESCRIPTION\n"
+              COMMENT_BODY+="✏️ **Dismissal Reason:** \`$FORMATTED_DISMISS_REASON\`\n"
+              COMMENT_BODY+="💬 **Comment:** \"$DISMISS_COMMENT\"\n\n"
             done < <(echo "$DISMISSED_WITH_COMMENTS" | jq -c '.[]')
 
-            COMMENT_BODY+="✅ **These alerts were dismissed with valid explanations.**\n\n"
+            COMMENT_BODY+="✅ **These alerts were reviewed and dismissed correctly.**\n\n"
+          fi
+
+          # Add Dismissed Alerts Without Comments
+          if [[ "$DISMISSED_WITHOUT_COMMENTS_COUNT" -gt 0 ]]; then
+            COMMENT_BODY+="\n## ⚠️ Dismissed Alerts Without Comments\n"
+            COMMENT_BODY+="The following alerts were **dismissed without explanations**:\n\n"
+
+            while IFS= read -r row; do
+              ALERT_URL=$(echo "$row" | jq -r '.html_url')
+              ALERT_FILE=$(echo "$row" | jq -r '.most_recent_instance.location.path')
+              ALERT_DESCRIPTION=$(echo "$row" | jq -r '.most_recent_instance.message.text')
+
+              COMMENT_BODY+="⚠️ **[View Alert]($ALERT_URL)**\n"
+              COMMENT_BODY+="📌 **File:** \`$ALERT_FILE\`\n"
+              COMMENT_BODY+="💡 **Issue:** $ALERT_DESCRIPTION\n\n"
+            done < <(echo "$DISMISSED_WITHOUT_COMMENTS" | jq -c '.[]')
+
+            COMMENT_BODY+="⚠️ **Please provide a dismissal reason for these alerts.**\n\n"
           fi
 
           # Convert COMMENT_BODY to a properly formatted JSON string