Merge branch 'Mayank-goel360:main' into main

Author: trail-testing2

.github/workflows/dra1.yml

@@ -1,20 +1,18 @@
-name: chatuujojh
+name: PR Validation for Polling file
 
 on:
   pull_request_target:
     branches:
-      - main
-    types:
-      - opened
-      - synchronize
+      - doNotMerge-ContentValidationCCP
+    types: [opened, synchronize]
 
 permissions:
   id-token: write
   contents: read
 
 env:
-  CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
-  API_BASE: https://sentinel-content-validationapi-prod-bvgsc3hjhyeqangg.canadacentral-01.azurewebsites.net/
+  CLIENT_ID: da7fd62a-590e-4e7a-8525-55ea01ffb1ac
+  API_BASE: https://sentintel-content-dev-fue4ashcg9fnfge9.canadacentral-01.azurewebsites.net/
 
 jobs:
   pr-validate:
@@ -24,129 +22,89 @@ jobs:
       - name: Checkout PR code
         uses: actions/checkout@v3
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}   # needed when using pull_request_target on forks
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
 
-      - name: Get changed JSON files and contents
+      - name: Get changed JSON files and contents to send to API endpoint
         id: prepare_json_files
         run: |
-          set -eux
-
-          echo "🔍 Collecting changed JSON files…"
+          echo "Collecting changed JSON files:"
           BASE="${{ github.event.pull_request.base.sha }}"
           HEAD="${{ github.event.pull_request.head.sha }}"
 
-          mapfile -t files < <(git diff --name-only "$BASE" "$HEAD" | grep -Ei '\.json$')
-          echo "→ All .json files: ${files[*]:-<none>}"
+          mapfile -t files < <(git diff --name-only "$BASE" "$HEAD" | grep '\.json$')
+          echo "Changed JSON files:"
+          for file in "${files[@]}"; do
+            echo "$file"
+          done
 
-          # Case-insensitive filter for “poll”
-          filtered=()
-          for f in "${files[@]}"; do
-            if [[ "$f" =~ [Pp]oll ]]; then
-              filtered+=("$f")
+          filtered_files=()
+          for file in "${files[@]}"; do
+            if [[ "$file" =~ [Pp][Oo][Ll][Ll] ]]; then
+              filtered_files+=("$file")
             fi
           done
 
-          if [ ${#filtered[@]} -eq 0 ]; then
-            echo "→ No polling JSON files changed; skipping validation."
+          echo "Polling JSON files:"
+          for file in "${filtered_files[@]}"; do
+            echo "$file"
+          done
+
+          if [ ${#filtered_files[@]} -eq 0 ]; then
+            echo "No JSON files with 'poll' in the name changed in this PR."
             echo "JSON_PAYLOAD_PATH=empty" >> $GITHUB_ENV
             exit 0
           fi
 
-          echo "→ Polling files: ${filtered[*]}"
-
-          # Build JSON array payload
           json_array="["
-          for f in "${filtered[@]}"; do
-            if jq -e . "$f" > /dev/null; then
-              content=$(jq -c . "$f")
-              json_array+="{\"filename\":\"$f\",\"content\":$content},"
-            else
-              echo "❌ Invalid JSON in $f"
-              exit 1
+          for file in "${filtered_files[@]}"; do
+            if [ -f "$file" ]; then
+              if jq -e . "$file" > /dev/null 2>&1; then
+                content=$(jq -c . < "$file")
+                json_array+="{\"filename\": \"${file}\", \"content\": $content},"
+              else
+                echo "❌ Invalid JSON structure in file: $file"
+                exit 1
+              fi
             fi
           done
           json_array="${json_array%,}]"
+
+          # 🔍 Debug echo
+          echo "Constructed 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
-        if: env.JSON_PAYLOAD_PATH != 'empty'
+        if: ${{ env.JSON_PAYLOAD_PATH != 'empty' }}
         id: fetch_token
         run: |
-          set -eux
-          echo "🔐 Fetching OIDC token…"
-          raw=$(curl -s \
-            -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})"
+          raw=$(curl -s -H "Authorization: Bearer $ACTIONS_ID_TOKEN_REQUEST_TOKEN"     "${ACTIONS_ID_TOKEN_REQUEST_URL}&audience=api://${CLIENT_ID}")
+          token=$(echo "$raw" | jq -r '.value')
           echo "TOKEN=$token" >> $GITHUB_ENV
 
-
-      - name: 📡 Health-check GET
-        if: env.JSON_PAYLOAD_PATH != 'empty'
+      - name: Send GET request to check if API is live
+        if: ${{ env.JSON_PAYLOAD_PATH != 'empty' }}
+        id: check_api
         run: |
-          set -eux
-          echo "🚀 Hitting $API_BASE…"
-          # Capture both body and status
-          resp=$(curl -s -w "\n%{http_code}" \
-            -H "Authorization: Bearer $TOKEN" \
-            "$API_BASE")
-          body=$(echo "$resp" | sed '$d')       # all but last line
-          status=$(echo "$resp" | tail -n1)    # last line
-          echo "🔁 HTTP status: $status"
-          echo "🔍 Raw body:"
-          echo "$body"                         # always printed
-          
-          # Try to parse JSON, but don’t exit if it fails
-          if echo "$body" | jq . > /dev/null 2>&1; then
-            echo "✔️ Parsed JSON:"
-            echo "$body" | jq .
-          else
-            echo "⚠️ Body is not JSON or empty"
-          fi
+          response=$(curl -s -H "Authorization: Bearer $TOKEN" "$API_BASE/")
+          echo "$response" | jq . || true
 
-          # Exit non-2xx
-          if [[ "$status" != 2* ]]; then
-            echo "❌ Health check failed (status $status)"
-            exit 1
-          fi
-
-      - name: 📦 POST polling payload
-        if: env.JSON_PAYLOAD_PATH != 'empty'
+      - name: Send POST request with JSON payload
+        if: ${{ env.JSON_PAYLOAD_PATH != 'empty' }}
         run: |
-          set -eux
-          echo "🚀 POSTing to $API_BASE/polling…"
-          # Capture both body and status
-          resp=$(curl -s -w "\n%{http_code}" -X POST \
-            -H "Authorization: Bearer $TOKEN" \
-            -H "Content-Type: application/json" \
-            --data-binary "@$JSON_PAYLOAD_PATH" \
-            "$API_BASE/polling")
-          body=$(echo "$resp" | sed '$d')
-          status=$(echo "$resp" | tail -n1)
-          echo "🔁 HTTP status: $status"
-          echo "🔍 Raw body:"
-          echo "$body"
-
-          # Parse JSON if possible
-          if echo "$body" | jq . > /dev/null 2>&1; then
-            echo "✔️ Parsed JSON:"
-            echo "$body" | jq .
-          else
-            echo "⚠️ Body is not JSON or empty"
-          fi
+          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")
 
-          # Now inspect your API’s own “status” field if you want:
-          api_status=$(echo "$body" | jq -r '.status // empty')
-          echo "➡️ API “status” field: ${api_status:-<none>}"
+          result_status=$(echo "$response" | jq -r '.status // empty')
+          message=$(echo "$response" | jq -r '.message // "No message provided"')
 
-          if [[ "$status" != 2* ]] || [[ "$api_status" != Passed ]]; then
-            echo "❌ Validation failed (HTTP $status / api.status=$api_status)"
+          if [ "$result_status" != "passed" ]; then
+            echo -e " ❌ Validation failed: $message"
             exit 1
           fi
 
-          echo "✅ All checks passed!"
+          echo "✅ $message"