Add more details

Author: sabollim-silabs

jenkins_integration/github/send_sonar_results_to_github.py

@@ -8,6 +8,7 @@
 import os
 import requests
 import sys
+import re
 from datetime import datetime
 
 def post_pr_comment(github_token, repo_owner, repo_name, pr_number, comment_body):
@@ -61,7 +62,100 @@ def post_commit_status(github_token, repo_owner, repo_name, commit_sha, state, d
         print(f"Response: {response.text}")
         return False
 
-def create_comment_body(result, status, commit_sha, branch_name, target_branch, sonar_output):
+def fetch_sonar_metrics(sonar_host, sonar_token, project_key, pr_number=None):
+    """Fetch SonarQube metrics from SonarQube server API"""
+    metrics = {
+        'duplicated_lines': 'N/A',
+        'new_violations': 'N/A',
+        'new_code_smells': 'N/A',
+        'new_maintainability_rating': 'N/A',
+        'quality_gate_details': 'N/A',
+        'new_bugs': 'N/A',
+        'reliability_rating': 'N/A',
+        'new_vulnerabilities': 'N/A',
+        'new_security_rating': 'N/A',
+        'new_security_hotspots': 'N/A',
+        'ncloc': 'N/A'
+    }
+    
+    try:
+        # Prepare headers for SonarQube API
+        headers = {
+            'Authorization': f'Bearer {sonar_token}',
+            'Accept': 'application/json'
+        }
+        
+        # Determine component key - use pullRequest key if it's a PR analysis
+        component_key = project_key
+        if pr_number:
+            component_key = f"{project_key}/pull/{pr_number}"
+        
+        # Define metrics to fetch from SonarQube API
+        metric_keys = [
+            'duplicated_lines',
+            'new_violations',
+            'new_code_smells', 
+            'new_maintainability_rating',
+            'new_bugs',
+            'reliability_rating',
+            'new_vulnerabilities',
+            'new_security_rating',
+            'new_security_hotspots',
+            'ncloc'
+        ]
+        
+        # Fetch metrics from SonarQube API
+        metrics_url = f"{sonar_host}/api/measures/component"
+        params = {
+            'component': component_key,
+            'metricKeys': ','.join(metric_keys)
+        }
+        
+        print(f"🔍 Fetching metrics from SonarQube: {metrics_url}")
+        print(f"📊 Component: {component_key}")
+        
+        response = requests.get(metrics_url, headers=headers, params=params, timeout=30)
+        
+        if response.status_code == 200:
+            data = response.json()
+            
+            if 'component' in data and 'measures' in data['component']:
+                for measure in data['component']['measures']:
+                    metric_key = measure.get('metric')
+                    value = measure.get('value', 'N/A')
+                    
+                    if metric_key in metrics:
+                        metrics[metric_key] = value
+                        print(f"📈 {metric_key}: {value}")
+            else:
+                print("⚠️  No measures found in SonarQube response")
+        else:
+            print(f"❌ Failed to fetch metrics from SonarQube: {response.status_code}")
+            print(f"Response: {response.text}")
+        
+        # Fetch quality gate status separately
+        try:
+            qg_url = f"{sonar_host}/api/qualitygates/project_status"
+            qg_params = {'projectKey': component_key}
+            
+            qg_response = requests.get(qg_url, headers=headers, params=qg_params, timeout=30)
+            
+            if qg_response.status_code == 200:
+                qg_data = qg_response.json()
+                if 'projectStatus' in qg_data:
+                    metrics['quality_gate_details'] = qg_data['projectStatus'].get('status', 'N/A')
+                    print(f"🚦 Quality Gate: {metrics['quality_gate_details']}")
+            else:
+                print(f"⚠️  Could not fetch quality gate status: {qg_response.status_code}")
+        except Exception as qg_ex:
+            print(f"⚠️  Error fetching quality gate: {str(qg_ex)}")
+            
+    except Exception as e:
+        print(f"❌ Error fetching SonarQube metrics: {str(e)}")
+    
+    return metrics
+
+def create_comment_body(result, status, commit_sha, branch_name, target_branch, sonar_output, metrics):
     """Create formatted comment body for GitHub PR"""
 
     # Determine status emoji and text
@@ -90,7 +184,26 @@ def create_comment_body(result, status, commit_sha, branch_name, target_branch,
 - **Target:** `{target_branch}`
 - **Analysis Time:** {datetime.now().strftime('%Y-%m-%d %H:%M:%S UTC')}
 
-### 📋 Detailed Results
+### � Key Metrics
+| Metric | Value |
+|--------|-------|
+| **Lines of Code (NCLOC)** | {metrics['ncloc']} |
+| **Duplicated Lines** | {metrics['duplicated_lines']} |
+| **New Violations** | {metrics['new_violations']} |
+| **New Code Smells** | {metrics['new_code_smells']} |
+| **New Bugs** | {metrics['new_bugs']} |
+| **New Vulnerabilities** | {metrics['new_vulnerabilities']} |
+| **New Security Hotspots** | {metrics['new_security_hotspots']} |
+
+### 🏆 Quality Ratings
+| Category | Rating |
+|----------|--------|
+| **New Maintainability Rating** | {metrics['new_maintainability_rating']} |
+| **Reliability Rating** | {metrics['reliability_rating']} |
+| **New Security Rating** | {metrics['new_security_rating']} |
+| **Quality Gate Details** | {metrics['quality_gate_details']} |
+
+### �📋 Detailed Results
 <details>
 <summary>Click to view SonarQube output</summary>
 
@@ -118,6 +231,9 @@ def main():
     parser.add_argument("--branch_name", required=True, help="Source branch name")
     parser.add_argument("--target_branch", required=True, help="Target branch name")
     parser.add_argument("--sonar_output_file", required=True, help="Path to file containing SonarQube scanner output")
+    parser.add_argument("--sonar_host", required=True, help="SonarQube server host URL")
+    parser.add_argument("--sonar_token", required=True, help="SonarQube authentication token")
+    parser.add_argument("--sonar_project_key", default="matter_sdk", help="SonarQube project key")
 
     args = parser.parse_args()
 
@@ -133,14 +249,23 @@ def main():
             print(f"❌ Error reading SonarQube output file: {str(e)}")
             sys.exit(1)
 
+        # Fetch SonarQube metrics from SonarQube server
+        metrics = fetch_sonar_metrics(
+            args.sonar_host,
+            args.sonar_token,
+            args.sonar_project_key,
+            args.pr_number
+        )
+        
         # Create comment body
         comment_body = create_comment_body(
             args.result,
             args.status,
             args.commit_sha,
             args.branch_name,
             args.target_branch,
-            sonar_output
+            sonar_output,
+            metrics
         )
 
         # Post PR comment

jenkins_integration/jenkinsFunctions.groovy

@@ -21,7 +21,10 @@ def send_sonar_results_to_github(commit_sha, result, status, sonar_output, pr_nu
                     --status ${status} \\
                     --branch_name "${branch_name}" \\
                     --target_branch "${target_branch}" \\
-                    --sonar_output_file "${tempFile}"
+                    --sonar_output_file "${tempFile}" \\
+                    --sonar_host "\${SONAR_HOST_URL}" \\
+                    --sonar_token "\${SONAR_SECRET}" \\
+                    --sonar_project_key "matter_sdk"
             """
         } finally {
             // Clean up temporary file