-
Notifications
You must be signed in to change notification settings - Fork 3
feat(e2e): generate → run → curl-compare driver scripts (hub & oca) #399
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
Open
esraagamal6
wants to merge
3
commits into
main
Choose a base branch
from
feat/e2e-test-driver-scripts
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+466
−0
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
5263b00
feat(e2e): generate → run → curl-compare driver scripts for hub & oca
esraagamal6 282c416
fix(e2e): address review — faithful URL/query/multipart reconstructio…
esraagamal6 6737029
fix(e2e): address review — deny-header handling + treat zero-tests as…
esraagamal6 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,269 @@ | ||
| #!/usr/bin/env python3 | ||
| """ | ||
| Independent curl oracle for the generated request-validation suite. | ||
|
|
||
| For each generated negative test it re-issues the SAME request with curl | ||
| (method, URL, headers, body reconstructed from the emitted .spec.ts) and | ||
| compares per test: | ||
|
|
||
| expected — the status the generator asserts (assertResponseStatus arg) | ||
| playwright — the result Playwright observed (from its JSON report, optional) | ||
| curl — the status curl observes now | ||
|
|
||
| Mismatches are flagged; with --show-body the curl response body is printed for | ||
| any test whose curl status != expected. Exits non-zero on any mismatch. | ||
|
|
||
| It does NOT import the suite's own code — a true cross-check oracle. To stay | ||
| faithful to the suite it does, however, reconstruct the URL by running the | ||
| EXACT `buildUrl()` implementation from the support module in node (so path | ||
| params, the 3-arg `buildUrl(path, params, query)` form, and `encodeURIComponent` | ||
| query encoding all match), and normalises JS object/array literals via node too. | ||
| """ | ||
| import argparse | ||
| import json | ||
| import re | ||
| import subprocess | ||
| import sys | ||
| from pathlib import Path | ||
|
|
||
| TEST_RE = re.compile(r"test\(\s*(['\"])(?P<title>.*?)\1\s*,", re.S) | ||
|
|
||
| # Exact copy of request-validation support/http.ts buildUrl (API_VERSION = 'v2'). | ||
| BUILD_URL_JS = r""" | ||
| const base = process.argv[1]; | ||
| const API_VERSION = process.argv[2]; | ||
| function buildUrl(pathTemplate, params, query) { | ||
| let url = `${base}/${API_VERSION}${pathTemplate}`.replace(/\{(\w+)}/g, (_, k) => { | ||
| const v = params && params[k]; | ||
| return v == null ? "__MISSING_PARAM__" : String(v); | ||
| }); | ||
| if (query) { | ||
| const q = Object.entries(query) | ||
| .filter(([, v]) => v !== undefined) | ||
| .map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(String(v))}`) | ||
| .join("&"); | ||
| if (q) url += (url.includes("?") ? "&" : "?") + q; | ||
| } | ||
| return url; | ||
| } | ||
| process.stdout.write(buildUrl(__ARGS__)); | ||
| """ | ||
|
|
||
|
|
||
| def node(script: str, *args: str): | ||
| # For `node -e`, the first positional is process.argv[1] (no script-name slot | ||
| # to skip), so pass args straight through — BUILD_URL_JS reads argv[1]/argv[2]. | ||
| try: | ||
| out = subprocess.run(["node", "-e", script, *args], | ||
| capture_output=True, text=True, timeout=15) | ||
| return (out.stdout if out.returncode == 0 else None) | ||
| except Exception: | ||
| return None | ||
|
|
||
|
|
||
| def node_json(js_literal: str): | ||
| """JS object/array literal -> parsed Python value (via node).""" | ||
| out = node(f"process.stdout.write(JSON.stringify(({js_literal})))") | ||
| if out is None: | ||
| return None | ||
| try: | ||
| return json.loads(out) | ||
| except Exception: | ||
| return None | ||
|
|
||
|
|
||
| def extract_balanced(src: str, start: int, open_ch: str, close_ch: str) -> str: | ||
| """Return the substring between the delimiter at `start` and its match, | ||
| respecting ' and " string literals. `start` is the index of `open_ch`.""" | ||
| depth, i, n = 0, start, len(src) | ||
| quote = None | ||
| while i < n: | ||
| c = src[i] | ||
| if quote: | ||
| if c == "\\": | ||
| i += 2 | ||
| continue | ||
| if c == quote: | ||
| quote = None | ||
| elif c in "'\"": | ||
| quote = c | ||
| elif c == open_ch: | ||
| depth += 1 | ||
| elif c == close_ch: | ||
| depth -= 1 | ||
| if depth == 0: | ||
| return src[start + 1:i] | ||
| i += 1 | ||
| return "" | ||
|
|
||
|
|
||
| def split_tests(src: str): | ||
| starts = [(m.start(), m.group("title")) for m in TEST_RE.finditer(src)] | ||
| for i, (pos, title) in enumerate(starts): | ||
| end = starts[i + 1][0] if i + 1 < len(starts) else len(src) | ||
| yield title, src[pos:end] | ||
|
|
||
|
|
||
| def parse_block(block: str, base: str, api_version: str): | ||
| # --- URL: run the suite's real buildUrl with the emitted args --- | ||
| bidx = block.find("buildUrl(") | ||
| if bidx == -1: | ||
| return None | ||
| args = extract_balanced(block, block.index("(", bidx), "(", ")").strip() | ||
| url = node(BUILD_URL_JS.replace("__ARGS__", args), base, api_version) | ||
| if url is None: | ||
| return None | ||
| # --- method --- | ||
| mm = re.search(r"request\.(get|post|put|patch|delete)\(", block) | ||
| method = mm.group(1).upper() if mm else "GET" | ||
| # --- headers helper / literal --- | ||
| hm = re.search(r"headers:\s*([^\n]+?),?\n", block) | ||
| headers_kind = hm.group(1).strip() if hm else "{}" | ||
| # --- multipart vs json body --- | ||
| multipart = None | ||
| body_json = None | ||
| if "multipart: formData" in block: | ||
| fm = re.search(r"multipartFields[^=]*=\s*", block) | ||
| if fm: | ||
| obj = extract_balanced(block, block.index("{", fm.end()), "{", "}") | ||
| multipart = node_json("{" + obj + "}") | ||
| else: | ||
| bm = re.search(r"const requestBody[^=]*=\s*", block) | ||
| if bm: | ||
| j = bm.end() | ||
| # literal starts at next { or [ | ||
| br = min((p for p in (block.find("{", j), block.find("[", j)) if p != -1), default=-1) | ||
| if br != -1: | ||
| lit = extract_balanced(block, br, block[br], "}" if block[br] == "{" else "]") | ||
| body_json = node(f"process.stdout.write(JSON.stringify(({block[br]}{lit}{'}' if block[br]=='{' else ']'})))") | ||
|
Comment on lines
+131
to
+138
|
||
| # --- expected status + metadata (quote-agnostic) --- | ||
| am = re.search(r"assertResponseStatus\(\s*testInfo,\s*res,\s*(\d{3})", block) | ||
| expected = int(am.group(1)) if am else None | ||
| op = re.search(r"operationId:\s*['\"]([^'\"]+)['\"]", block) | ||
| kind = re.search(r"scenarioKind:\s*['\"]([^'\"]+)['\"]", block) | ||
| return { | ||
| "url": url, "method": method, "headers_kind": headers_kind, | ||
| "multipart": multipart, "body_json": body_json, "expected": expected, | ||
| "operationId": op.group(1) if op else "", "kind": kind.group(1) if kind else "", | ||
| } | ||
|
|
||
|
|
||
| def curl_headers(kind, admin_header, deny_header): | ||
| k = kind.strip() | ||
| if k.startswith("jsonHeaders"): | ||
| return (["Content-Type: application/json"] + ([admin_header] if admin_header else [])) | ||
| if k.startswith("authHeaders"): | ||
| return [admin_header] if admin_header else [] | ||
| if k.startswith("denyProbeHeaders"): | ||
| return [deny_header] if deny_header else [] | ||
| if "Bearer invalid-token" in k: | ||
| return ["Authorization: Bearer invalid-token"] | ||
| return [] # {} → no auth | ||
|
|
||
|
|
||
| def run_curl(method, url, headers, body_json, multipart): | ||
| cmd = ["curl", "-s", "-o", "-", "-w", "\n__HTTP__%{http_code}", "-X", method, url] | ||
| for h in headers: | ||
| cmd += ["-H", h] | ||
| if multipart is not None: | ||
| for k, v in multipart.items(): | ||
| cmd += ["-F", f"{k}={v}"] | ||
| elif body_json is not None: | ||
| cmd += ["--data-binary", body_json] | ||
| try: | ||
| out = subprocess.run(cmd, capture_output=True, text=True, timeout=30).stdout | ||
| except Exception as e: | ||
| return None, f"<curl error: {e}>" | ||
| marker = out.rfind("__HTTP__") | ||
| if marker == -1: | ||
| return None, out | ||
| return int(out[marker + len("__HTTP__"):].strip() or 0), out[:marker] | ||
|
|
||
|
|
||
| def load_pw(pw_json): | ||
| res = {} | ||
| if not pw_json: | ||
| return res | ||
| try: | ||
| d = json.load(open(pw_json)) | ||
| except Exception: | ||
| return res | ||
| def walk(suites): | ||
| for s in suites: | ||
| for sp in s.get("specs", []): | ||
| rec = None | ||
| for t in sp.get("tests", []): | ||
| for r in t.get("results", []): | ||
| for e in (r.get("errors") or []): | ||
| mm = re.search(r"Received:.*?(\d{3})", e.get("message", "")) | ||
| if mm: | ||
| rec = int(mm.group(1)) | ||
| res[sp["title"]] = {"ok": sp.get("ok"), "received": rec} | ||
| walk(s.get("suites", [])) | ||
| walk(d.get("suites", [])) | ||
| return res | ||
|
|
||
|
|
||
| def main(): | ||
| ap = argparse.ArgumentParser() | ||
| ap.add_argument("--spec-dir", required=True) | ||
| ap.add_argument("--base-url", required=True) | ||
| ap.add_argument("--api-version", default="v2") | ||
| ap.add_argument("--admin-header", default="") | ||
| ap.add_argument("--deny-header", default="") | ||
| ap.add_argument("--pw-json", default="") | ||
| ap.add_argument("--show-body", action="store_true") | ||
| ap.add_argument("--max-body", type=int, default=400) | ||
| args = ap.parse_args() | ||
|
|
||
| pw = load_pw(args.pw_json) | ||
| specs = sorted(Path(args.spec_dir).glob("*-validation-api-tests.spec.ts")) | ||
| rows, mismatches, skipped = [], [], 0 | ||
| for spec in specs: | ||
| src = spec.read_text() | ||
| for title, block in split_tests(src): | ||
| d = parse_block(block, args.base_url, args.api_version) | ||
| if not d or d["expected"] is None: | ||
| skipped += 1 | ||
| continue | ||
| # Deny (auth-deny / 403) scenarios need the probe principal's header. | ||
| # Without --deny-header we'd re-issue them unauthenticated and get a | ||
| # bogus 401-vs-403 "mismatch", so skip them explicitly instead. | ||
| if d["headers_kind"].strip().startswith("denyProbeHeaders") and not args.deny_header: | ||
| skipped += 1 | ||
| continue | ||
| headers = curl_headers(d["headers_kind"], args.admin_header, args.deny_header) | ||
| code, body = run_curl(d["method"], d["url"], headers, d["body_json"], d["multipart"]) | ||
| pw_rec = pw.get(title, {}) | ||
| pw_status = ("pass" if pw_rec.get("ok") else f"FAIL({pw_rec.get('received')})") if pw_rec else "—" | ||
| match = code == d["expected"] | ||
| rows.append((title, d["expected"], pw_status, code, match)) | ||
| if not match: | ||
| mismatches.append((title, d["method"], d["url"], d["expected"], code, body)) | ||
|
|
||
| print(f"\n{'TEST':<58} {'EXP':>4} {'PW':>10} {'CURL':>5} OK") | ||
| print("-" * 88) | ||
| for title, exp, pw_status, code, match in rows: | ||
| print(f"{title[:58]:<58} {exp:>4} {pw_status:>10} {str(code):>5} {'✓' if match else '✗'}") | ||
| total, ok = len(rows), sum(1 for r in rows if r[4]) | ||
| print("-" * 88) | ||
| print(f"curl vs expected: {ok}/{total} match, {total - ok} mismatch" + | ||
| (f" ({skipped} unparsed/skipped)" if skipped else "")) | ||
|
|
||
|
esraagamal6 marked this conversation as resolved.
|
||
| if args.show_body and mismatches: | ||
| print("\n=== MISMATCH DETAIL (curl status != expected) ===") | ||
| for title, method, url, exp, code, body in mismatches: | ||
| print(f"\n• {title}\n {method} {url}\n expected {exp}, curl {code}") | ||
| if body: | ||
| print(" body:", body.strip()[: args.max_body]) | ||
|
|
||
| # 0 comparable tests means a broken parser / wrong --spec-dir / everything | ||
| # skipped — that's an error, not a silent pass. | ||
| if total == 0: | ||
| print(f"✗ no comparable tests (parsed 0; {skipped} skipped) — check --spec-dir/auth", file=sys.stderr) | ||
| sys.exit(2) | ||
| sys.exit(1 if (total - ok) else 0) | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| main() | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| #!/usr/bin/env bash | ||
| # End-to-end driver for the camunda-hub generated suites: | ||
| # 1. generate — positive (lifecycle) + request-validation (negatives) | ||
| # 2. run — Playwright: positive suite + each request-validation profile | ||
| # 3. curl-compare — independent curl oracle over the request-validation profiles | ||
| # (expected vs Playwright vs curl, status + body diff) | ||
| # | ||
| # Hub is Bearer-authenticated, so this mints tokens from Keycloak: | ||
| # - admin: c8-client → BEARER_TOKEN | ||
| # - deny: c8-client-deny → RBAC_DENY_PROBE_BEARER_TOKEN (rbac profile) | ||
| # | ||
| # Prereqs: Hub running (./docker/start-hub.sh) on HUB_UI_PORT, Keycloak on KEYCLOAK_PORT. | ||
| # | ||
| # Env overrides (all optional): | ||
| # HUB_UI_PORT=8088 KEYCLOAK_PORT=18080 CONFIG=camunda-hub | ||
| # RV_PROFILES="secured rbac" STEPS="generate run curl" | ||
| # SKIP_POSITIVE=1 (skip the positive suite) | ||
| # E2E_SOFT=1 (don't exit non-zero when the curl oracle finds mismatches) | ||
| set -euo pipefail | ||
|
|
||
| REPO_ROOT="$(cd "$(dirname "$0")/../.." && pwd)" | ||
| cd "$REPO_ROOT" | ||
|
|
||
| CONFIG="${CONFIG:-camunda-hub}" | ||
| HUB_UI_PORT="${HUB_UI_PORT:-8088}" | ||
| KEYCLOAK_PORT="${KEYCLOAK_PORT:-18080}" | ||
| RV_PROFILES="${RV_PROFILES:-secured rbac}" | ||
| STEPS="${STEPS:-generate run curl}" | ||
| KC="http://localhost:${KEYCLOAK_PORT}/auth/realms/camunda-platform/protocol/openid-connect/token" | ||
| CORE_URL="http://localhost:${HUB_UI_PORT}/api" # request-validation base (buildUrl adds /v2) | ||
| POS_URL="http://localhost:${HUB_UI_PORT}/api/v2" # positive suite base | ||
| RV_DIR="generated/${CONFIG}/request-validation" | ||
| OUT="test-results/e2e-${CONFIG}"; mkdir -p "$OUT" | ||
|
|
||
| step() { case " $STEPS " in *" $1 "*) return 0;; *) return 1;; esac; } | ||
| mint() { # client_id client_secret | ||
| curl -s -X POST "$KC" -d "client_id=$1&client_secret=$2&grant_type=client_credentials" \ | ||
| | python3 -c "import json,sys; d=json.load(sys.stdin); print(d.get('access_token',''))"; } | ||
|
|
||
| echo "▶ config=$CONFIG hub=$POS_URL steps='$STEPS' rv-profiles='$RV_PROFILES'" | ||
|
|
||
| # --- tokens --- | ||
| ADMIN_TOK="$(mint c8-client c8-secret)" | ||
| [ -n "$ADMIN_TOK" ] || { echo "✗ could not mint c8-client token — is Hub/Keycloak up?"; exit 1; } | ||
| DENY_TOK="$(mint c8-client-deny c8-deny-secret || true)" | ||
| # Empty header (not `Bearer `) when the token is missing, so the oracle skips | ||
| # deny scenarios instead of re-issuing them with an invalid Authorization header. | ||
| DENY_HEADER=""; [ -n "$DENY_TOK" ] && DENY_HEADER="Authorization: Bearer $DENY_TOK" | ||
| [ -n "$DENY_TOK" ] || echo "⚠ no c8-client-deny token (rbac/403 deny scenarios will be skipped by the oracle)" | ||
|
|
||
| # ============================ 1. GENERATE ============================ | ||
| if step generate; then | ||
| echo "── generate ─────────────────────────────" | ||
| if [ -z "${SKIP_POSITIVE:-}" ]; then | ||
| CONFIG="$CONFIG" npm run extract-graph >/dev/null | ||
| CONFIG="$CONFIG" npm run generate:scenarios >/dev/null | ||
| CONFIG="$CONFIG" npm run codegen:playwright:all >/dev/null | ||
| echo " ✓ positive suite generated" | ||
| fi | ||
| CONFIG="$CONFIG" npm run generate:request-validation >/dev/null | ||
| echo " ✓ request-validation generated ($(ls "$RV_DIR"/*/ -d 2>/dev/null | wc -l | tr -d ' ') profiles)" | ||
| fi | ||
|
|
||
| # ====================== 2. RUN (Playwright) ========================== | ||
| unset CAMUNDA_BASIC_AUTH_USER CAMUNDA_BASIC_AUTH_PASSWORD 2>/dev/null || true | ||
| if step run && [ -z "${SKIP_POSITIVE:-}" ]; then | ||
| echo "── run: positive lifecycle suite ────────" | ||
| BEARER_TOKEN="$ADMIN_TOK" API_BASE_URL="$POS_URL" CONFIG="$CONFIG" \ | ||
| npx playwright test -c path-analyser/playwright.config.ts --reporter=list || true | ||
| fi | ||
|
|
||
| # Playwright JSON report per request-validation profile (consumed by curl-compare) | ||
| run_rv() { # profile | ||
| local p="$1" cfg="$RV_DIR/$1/playwright.config.ts" | ||
| [ -f "$cfg" ] || { echo " ⚠ profile '$p' not generated — skipping"; return; } | ||
| BEARER_TOKEN="$ADMIN_TOK" RBAC_DENY_PROBE_BEARER_TOKEN="$DENY_TOK" \ | ||
| CORE_APPLICATION_URL="$CORE_URL" RV_PROFILE="$p" CONFIG="$CONFIG" \ | ||
| npx playwright test -c "$cfg" --reporter=json > "$OUT/pw-$p.json" 2>/dev/null || true | ||
| } | ||
|
|
||
| # ================== 2+3. RUN + CURL-COMPARE (per profile) ============ | ||
| for p in $RV_PROFILES; do | ||
| echo "── request-validation: $p ───────────────" | ||
| if step run; then run_rv "$p"; fi | ||
| if step curl; then | ||
| # Let the oracle's non-zero exit (mismatches) propagate: record it and | ||
| # continue the loop, then fail at the end unless E2E_SOFT=1. | ||
| python3 scripts/e2e/curl_compare.py \ | ||
| --spec-dir "$RV_DIR/$p" --base-url "$CORE_URL" --api-version v2 \ | ||
| --admin-header "Authorization: Bearer $ADMIN_TOK" \ | ||
| --deny-header "$DENY_HEADER" \ | ||
| --pw-json "$OUT/pw-$p.json" --show-body || RV_FAIL=1 | ||
| fi | ||
| done | ||
| echo "▶ done. Playwright reports + diffs under $OUT/" | ||
| if [ -n "${RV_FAIL:-}" ] && [ -z "${E2E_SOFT:-}" ]; then | ||
| echo "✗ curl/expected mismatches detected (set E2E_SOFT=1 to treat as non-fatal)"; exit 1 | ||
| fi |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.