Skip to content

Adding Query Validation Workflow #5514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 21 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions .github/workflows/validate-queries.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Validate SumoLogic Queries
on:
pull_request:
paths:
- '**/*.md' # Trigger only when Markdown files change

jobs:
validate-queries:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Required for git diff detection

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.10"

- name: Install dependencies
run: pip install requests python-dotenv

- name: Validate queries
working-directory: ./scripts
env:
SUMO_LOGIC_ACCESS_ID: ${{ secrets.SUMO_LOGIC_ACCESS_ID }}
SUMO_LOGIC_ACCESS_KEY: ${{ secrets.SUMO_LOGIC_ACCESS_KEY }}
run: |
python validate_queries.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ The following returns `true`:
```sql
| isValidIP("10.255.255.255") as isIP
```
```sql
| isValidIP("30.255.255.255") as isIP
```

The following returns `true`:

Expand Down
7 changes: 7 additions & 0 deletions docs/search/search-query-language/search-operators/where.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ For example, using `where` with the boolean operator [`isValidIP`](/docs/searc
```sql
| where isValidIP("192.168.0.10")
```
* Checking my PR:
```sql
_collector="ABC1" | where type="web"
```
```sql
_collector="ABC6" | where type="web"
```
* Filters as false and will not return results:
```sql
| where !isValidIP("192.168.0.10")
Expand Down
47 changes: 47 additions & 0 deletions scripts/sumologic_client.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import os
import requests
from datetime import datetime, timedelta

class SumoLogicClient:
def __init__(self):
self.base_url = "https://long-api.sumologic.net/api/v1"
self.session = requests.Session()
self.session.headers.update({'Content-Type': 'application/json'})
self.session.auth = (
os.getenv("SUMO_LOGIC_ACCESS_ID"),
os.getenv("SUMO_LOGIC_ACCESS_KEY")
)

def test_query(self, query):
"""Execute a query in Sumo Logic and check for results"""
job_id = self._create_search_job(query)
status = self._wait_for_job(job_id)
return self._check_results(job_id) if status == "DONE GATHERING RESULTS" else False

def _create_search_job(self, query):
end_time = datetime.utcnow()
start_time = end_time - timedelta(hours=24)
payload = {
"query": query,
"from": start_time.isoformat() + "Z",
"to": end_time.isoformat() + "Z",
"timeZone": "UTC"
}
response = self.session.post(f"{self.base_url}/search/jobs", json=payload)
response.raise_for_status()
return response.json()["id"]

def _wait_for_job(self, job_id, max_attempts=10):
for _ in range(max_attempts):
response = self.session.get(f"{self.base_url}/search/jobs/{job_id}")
response.raise_for_status()
status = response.json()["state"]
if status in ["DONE GATHERING RESULTS", "CANCELLED"]:
return status
time.sleep(3)
return "TIMEOUT"

def _check_results(self, job_id):
response = self.session.get(f"{self.base_url}/search/jobs/{job_id}/messages")
response.raise_for_status()
return len(response.json()["messages"]) > 0
69 changes: 69 additions & 0 deletions scripts/validate_queries.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
#!/usr/bin/env python3
import re
import sys
import os
import json
import requests
from pathlib import Path
from datetime import datetime, timedelta

def get_repo_root():
"""Get absolute path to repository root"""
github_workspace = os.getenv('GITHUB_WORKSPACE')
if github_workspace and Path(github_workspace).exists():
return Path(github_workspace)
return Path(__file__).parent.parent # Move up from scripts/ directory

def debug_environment():
"""Debug workspace structure"""
repo_root = get_repo_root()
print("::group::⚙️ Environment Debug")
print(f"📂 Repo root: {repo_root}")
print(f"📂 Working dir: {os.getcwd()}")
print("\n📁 Directory Structure:")
os.system(f"find {repo_root} -maxdepth 3 -type d | sort")
print("\n📝 Markdown Files:")
os.system(f"find {repo_root} -name '*.md' | head -n 20")
print("::endgroup::")
return repo_root

def get_changed_files(repo_root):
"""Find Markdown files to validate"""
# Try GitHub PR context first
if "GITHUB_EVENT_PATH" in os.environ:
try:
with open(os.environ["GITHUB_EVENT_PATH"]) as f:
pr_files = [
str(repo_root / f['filename'])
for f in json.load(f).get('pull_request', {}).get('files', [])
if f['filename'].endswith('.md')
]
if pr_files:
print(f"📦 Found {len(pr_files)} changed Markdown files")
return pr_files
except Exception as e:
print(f"::warning::Couldn't read PR data: {e}")

# Fallback: Scan docs directory
docs_dir = repo_root / "docs"
if docs_dir.exists():
md_files = list(docs_dir.rglob("*.md"))
print(f"🔄 Scanning {len(md_files)} docs files")
return [str(f) for f in md_files]

print("::error::No Markdown files found in docs/ directory")
return []

def main():
repo_root = debug_environment()
changed_files = get_changed_files(repo_root)

if not changed_files:
print("::warning::No Markdown files to validate")
sys.exit(0)

print(f"Validating {len(changed_files)} files...")
# Rest of your validation logic here

if __name__ == "__main__":
main()