CI/scripts: only use jq to parse JSON output, not grep

Author: dannywillems

.github/scripts/test-graphql-command-scripts.sh

@@ -50,22 +50,22 @@ for script_file in $script_files; do
 
   # Execute the script and capture output
   if output=$(bash "$script_file" 2>&1); then
-    echo "✅ Script executed successfully with output $output"
+    echo "✅ Script executed successfully"
 
     # Try to parse output as JSON using jq
-    if json_response=$(echo "$output" | jq . 2>/dev/null); then
+    if echo "$output" | jq . > /dev/null 2>&1; then
       # Valid JSON response - check for GraphQL errors
-      if echo "$json_response" | jq -e '.errors' > /dev/null 2>&1; then
+      if echo "$output" | jq -e '.errors' > /dev/null 2>&1; then
         echo "❌ Script returned GraphQL errors:"
-        echo "$json_response" | jq '.errors'
+        echo "$output" | jq '.errors'
         failed=$((failed + 1))
-      elif echo "$json_response" | jq -e '.data' > /dev/null 2>&1; then
-        echo "✅ Script response contains valid data: $(echo "$json_response" | head -c 100)..."
+      elif echo "$output" | jq -e '.data' > /dev/null 2>&1; then
+        echo "✅ Script response contains valid data: $(echo "$output" | head -c 100)..."
       else
-        echo "⚠️  Unexpected JSON response format: $(echo "$json_response" | head -c 100)..."
+        echo "⚠️  Unexpected JSON response format: $(echo "$output" | head -c 100)..."
       fi
     else
-      echo "❌ Script did not return valid JSON"
+      echo "❌ Script did not return valid JSON: $(echo "$output" | head -c 100)..."
       failed=$((failed + 1))
     fi
   else

.github/scripts/test-plain-node-capabilities.sh

@@ -22,10 +22,9 @@ for node_url in $plain_nodes; do
 
   # Test network ID query using website script
   network_success=false
-  if network_response=$(bash website/docs/developers/scripts/graphql-api/queries/curl/network-id.sh "$graphql_url" 2>/dev/null); then
-    network_json=$(echo "$network_response" | grep "^{")
-    if echo "$network_json" | jq -e '.data.networkID' > /dev/null 2>&1; then
-      network_id=$(echo "$network_json" | jq -r '.data.networkID')
+  if network_response=$(bash website/docs/developers/scripts/graphql-api/queries/curl/network-id.sh "$graphql_url" 2>&1); then
+    if echo "$network_response" | jq -e '.data.networkID' > /dev/null 2>&1; then
+      network_id=$(echo "$network_response" | jq -r '.data.networkID')
       echo "✅ Network ID query successful: $network_id"
       network_success=true
     else
@@ -37,10 +36,9 @@ for node_url in $plain_nodes; do
 
   # Test best chain query using website script
   chain_success=false
-  if chain_response=$(bash website/docs/developers/scripts/graphql-api/queries/curl/best-chain.sh "$graphql_url" 2>/dev/null); then
-    chain_json=$(echo "$chain_response" | grep "^{")
-    if echo "$chain_json" | jq -e '.data.bestChain[0].stateHash' > /dev/null 2>&1; then
-      state_hash=$(echo "$chain_json" | jq -r '.data.bestChain[0].stateHash')
+  if chain_response=$(bash website/docs/developers/scripts/graphql-api/queries/curl/best-chain.sh "$graphql_url" 2>&1); then
+    if echo "$chain_response" | jq -e '.data.bestChain[0].stateHash' > /dev/null 2>&1; then
+      state_hash=$(echo "$chain_response" | jq -r '.data.bestChain[0].stateHash')
       echo "✅ Best chain query successful: ${state_hash:0:16}..."
       chain_success=true
     else

.github/scripts/test-plain-node-connectivity.sh

@@ -37,21 +37,18 @@ for node_url in $plain_nodes; do
   graphql_url="${node_url}graphql"
 
   # Test daemon status query using the website script
-  if response=$(bash website/docs/developers/scripts/graphql-api/queries/curl/daemon-status.sh "$graphql_url" 2>/dev/null); then
-    # Extract JSON response (skip curl progress output)
-    json_response=$(echo "$response" | grep "^{")
-
+  if response=$(bash website/docs/developers/scripts/graphql-api/queries/curl/daemon-status.sh "$graphql_url" 2>&1); then
     # Check if it's valid JSON
-    if echo "$json_response" | jq . > /dev/null 2>&1; then
+    if echo "$response" | jq . > /dev/null 2>&1; then
       # Check for GraphQL errors
-      if echo "$json_response" | jq -e '.errors' > /dev/null 2>&1; then
+      if echo "$response" | jq -e '.errors' > /dev/null 2>&1; then
         echo "⚠️  $graphql_url returned GraphQL error:"
-        echo "$json_response" | jq '.errors'
+        echo "$response" | jq '.errors'
       # Check for valid data
-      elif echo "$json_response" | jq -e '.data.daemonStatus' > /dev/null 2>&1; then
+      elif echo "$response" | jq -e '.data.daemonStatus' > /dev/null 2>&1; then
         echo "✅ $graphql_url GraphQL query successful"
-        sync_status=$(echo "$json_response" | jq -r '.data.daemonStatus.syncStatus // "unknown"')
-        chain_id=$(echo "$json_response" | jq -r '.data.daemonStatus.chainId // "unknown"')
+        sync_status=$(echo "$response" | jq -r '.data.daemonStatus.syncStatus // "unknown"')
+        chain_id=$(echo "$response" | jq -r '.data.daemonStatus.chainId // "unknown"')
         echo "   Sync Status: $sync_status, Chain ID: ${chain_id:0:16}..."
       else
         echo "⚠️  $graphql_url unexpected response format"