changes

Author: ntanwar-sumo

.github/workflows/validate-queries.yml

@@ -13,14 +13,6 @@ jobs:
         with:
           fetch-depth: 0  # Required for git diff detection
 
-      - name: Debug filesystem
-        if: ${{ always() }}
-        run: |
-          echo "Workspace contents:"
-          ls -R
-          echo "Scripts directory:"
-          ls -la scripts/
-
       - name: Set up Python
         uses: actions/setup-python@v4
         with:

scripts/validate_queries.py

@@ -1,41 +1,73 @@
 #!/usr/bin/env python3
 import re
 import sys
+import os
 from pathlib import Path
 from sumologic_client import SumoLogicClient
 
 def find_sql_blocks_in_pr():
-    """Detect changed SQL blocks without file modifications"""
-    changed_files = sys.argv[1:] if len(sys.argv) > 1 else [
-        str(p) for p in Path("docs").rglob("*.md")
-        if "search-query-language" in str(p)
-    ]
-
-    sql_blocks = []
-    for file in changed_files:
-        content = Path(file).read_text()
-        sql_blocks.extend([
-            (file, sql.strip())
-            for sql in re.findall(r'```sql\n(.*?)```', content, re.DOTALL)
-        ])
-    return sql_blocks
+    """Detect changed SQL blocks with better debugging"""
+    print("::group::Detecting SQL blocks")  # GitHub Actions log grouping
+
+    # Get changed files from environment if running in GitHub Actions
+    changed_files = sys.argv[1:] if len(sys.argv) > 1 else []
+    if not changed_files and "GITHUB_ACTIONS" in os.environ:
+        try:
+            with open(os.environ["GITHUB_EVENT_PATH"]) as f:
+                event_data = json.load(f)
+                changed_files = [
+                    f"docs/{f['filename']}" for f in
+                    event_data.get("pull_request", {}).get("files", [])
+                    if f['filename'].endswith('.md')
+                ]
+        except Exception as e:
+            print(f"::warning::Couldn't get changed files: {str(e)}")
+
+    if not changed_files:
+        changed_files = [
+            str(p) for p in Path("docs").rglob("*.md")
+            if "search-query-language" in str(p)
+        ]
+
+    print(f"Files to scan: {changed_files}")
+    return changed_files
 
 def validate_queries():
+    print("::group::Starting validation")
     client = SumoLogicClient()
     failed = False
 
-    for file, query in find_sql_blocks_in_pr():
-        print(f"Validating SQL in {file}...")
+    for file, query in find_sql_blocks_with_content():
+        print(f"\n🔍 Validating query in {file}")
+        print(f"Query sample:\n{query[:200]}...")  # Show first 200 chars
+
         try:
+            print("Calling Sumo Logic API...")
             if not client.test_query(query):
                 print(f"::error file={file},title=Query Validation Failed::Query returned no results")
                 failed = True
+            else:
+                print("✅ Query validated successfully")
         except Exception as e:
             print(f"::error file={file},title=Query Execution Failed::{str(e)}")
             failed = True
 
+    print("::endgroup::")
     if failed:
         sys.exit(1)
 
+def find_sql_blocks_with_content():
+    """Yields (file_path, query) tuples with better error handling"""
+    for file in find_sql_blocks_in_pr():
+        try:
+            content = Path(file).read_text()
+            queries = re.findall(r'```sql\n(.*?)```', content, re.DOTALL)
+            for query in queries:
+                query = query.strip()
+                if query:  # Skip empty queries
+                    yield (file, query)
+        except Exception as e:
+            print(f"::warning file={file}::Error processing file: {str(e)}")
+
 if __name__ == "__main__":
-    validate_queries()
+    validate_queries()