Merge branch 'Mayank-goel360:main' into main

Author: trail-testing2

.github/workflows/dra.yml

@@ -1,10 +1,12 @@
-name: PR Validation for Polling g
+name: PR Validation g 
 
 on:
-  pull_request:                        # ← use pull_request so forks can be checked out
+  pull_request:
     branches:
       - main
-    types: [opened, synchronize]
+    types:
+      - opened
+      - synchronize
 
 permissions:
   id-token: write
@@ -22,7 +24,7 @@ jobs:
       - name: Checkout PR code
         uses: actions/checkout@v3
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}     # ← ensure forks can be checked out
+          token: ${{ secrets.GITHUB_TOKEN }}
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -31,17 +33,21 @@ jobs:
         id: prepare_json_files
         run: |
           set -eux
+
           echo "🔍 Collecting changed JSON files…"
           BASE="${{ github.event.pull_request.base.sha }}"
           HEAD="${{ github.event.pull_request.head.sha }}"
 
+          # List all .json files changed between base & head
           mapfile -t files < <(git diff --name-only "$BASE" "$HEAD" | grep -Ei '\.json$')
           echo "→ All .json files: ${files[*]:-<none>}"
 
-          # Filter to only ones containing “poll” (case-insensitive)
+          # Filter for files containing "poll" (case-insensitive)
           filtered=()
           for f in "${files[@]}"; do
-            [[ "$f" =~ poll ]] && filtered+=("$f")
+            if [[ "$f" =~ [Pp]oll ]]; then
+              filtered+=("$f")
+            fi
           done
 
           if [ ${#filtered[@]} -eq 0 ]; then
@@ -51,17 +57,21 @@ jobs:
           fi
 
           echo "→ Polling files: ${filtered[*]}"
-          # Build the JSON array
-          json='['
+
+          # Build JSON array payload
+          json_array="["
           for f in "${filtered[@]}"; do
-            jq -c . "$f" \
-              | xargs -I% printf '{"filename":"%s","content":%s},' "$f" "%" \
-              >> tmp_payload.json
+            if jq -e . "$f" > /dev/null 2>&1; then
+              content=$(jq -c . "$f")
+              json_array+="{\"filename\":\"$f\",\"content\":$content},"
+            else
+              echo "❌ Invalid JSON structure in file: $f"
+              exit 1
+            fi
           done
-          # trim trailing comma and wrap
-          payload=$(<tmp_payload.json)
-          payload="[${payload%,}]"
-          echo "$payload" > files_payload.json
+          json_array="${json_array%,}]"
+
+          echo "$json_array" > files_payload.json
           echo "JSON_PAYLOAD_PATH=files_payload.json" >> $GITHUB_ENV
 
       - name: Request OIDC token from GitHub
@@ -74,7 +84,7 @@ jobs:
             -H "Authorization: Bearer $ACTIONS_ID_TOKEN_REQUEST_TOKEN" \
             "${ACTIONS_ID_TOKEN_REQUEST_URL}&audience=api://${CLIENT_ID}")
           token=$(echo "$raw" | jq -r .value)
-          echo "✔️ Got token, length=${#token}"
+          echo "✔️ Got token (length=${#token})"
           echo "TOKEN=$token" >> $GITHUB_ENV
 
       - name: 📡 Health-check GET
@@ -83,10 +93,10 @@ jobs:
           set -eux
           echo "🚀 Hitting $API_BASE…"
           resp=$(curl -s -w "%{http_code}" -H "Authorization: Bearer $TOKEN" "$API_BASE")
-          body="${resp::-3}"   # all but last 3 chars
-          code="${resp: -3}"   # last 3 chars
+          body="${resp::-3}"
+          code="${resp: -3}"
           echo "HTTP $code → $body"
-          if [ "${code:0:1}" != "2" ]; then
+          if [[ "${code:0:1}" != "2" ]]; then
             echo "❌ Health check failed"
             exit 1
           fi

.github/workflows/dra1.yml

@@ -83,24 +83,36 @@ jobs:
           response=$(curl -s -H "Authorization: Bearer $TOKEN" "$API_BASE")
           echo "$response" | jq . || echo "⚠️ Invalid JSON response"
 
-      - name: Send POST request with JSON payload
-        if: ${{ env.JSON_PAYLOAD_PATH != 'empty' && env.SKIP_API != 'true' }}
-        run: |
-          echo "Sending JSON payload to API..."
-          response=$(curl -s -X POST "$API_BASE/polling" \
-            -H "Authorization: Bearer $TOKEN" \
-            -H "Content-Type: application/json" \
-            --data-binary "@$JSON_PAYLOAD_PATH")
+      -     name: Send POST request with JSON payload
+            if: ${{ env.JSON_PAYLOAD_PATH != 'empty' && env.SKIP_API != 'true' }}
+            run: |
+                echo "Sending JSON payload to API..."
 
-          echo "API response:"
-          echo "$response" | jq .
+                response=$(curl -s -w "\n%{http_code}" -X POST "$API_BASE/polling" \
+                -H "Authorization: Bearer $TOKEN" \
+                -H "Content-Type: application/json" \
+                --data-binary "@$JSON_PAYLOAD_PATH")
 
-          result_status=$(echo "$response" | jq -r '.status // empty')
-          message=$(echo "$response" | jq -r '.message // "No message provided"')
+                http_body=$(echo "$response" | sed '$d')
+                http_status=$(echo "$response" | tail -n1)
 
-          if [ "$result_status" != "passed" ]; then
-            echo "❌ Validation failed: $message"
-            exit 1
-          fi
+                echo "🔁 HTTP Status: $http_status"
+                echo "🔍 Raw Response:"
+                echo "$http_body"
+
+                # Try to parse status and message
+                result_status=$(echo "$http_body" | jq -r '.status // empty')
+                message=$(echo "$http_body" | jq -r '.message // "No message provided"')
+
+                if [ "$http_status" != "200" ]; then
+                echo "❌ API call failed with status $http_status"
+                exit 1
+                fi
+
+                if [ "$result_status" != "passed" ]; then
+                echo "❌ Validation failed: $message"
+                exit 1
+                fi
+
+                echo "✅ $message"
 
-          echo "✅ $message"