refactor(P02): dual-use contract_ingestor — Lambda + CLI share core logic (REQ-329, backend-engineer)
---ci--- project: acdl phase: 2 milestone: v1.28 status: execute persona: backend-engineer --- Extract dispatch_action() shared business-logic dispatch + _to_http_response error mapper. lambda_handler (Lambda) + cli_main (CLI) become thin input parsers that both delegate to dispatch_action. The action routing, contract validation, DynamoDB write, error reporting live in shared functions — single source of truth (NFR-7). tests/test_dual_use.py verifies both paths produce the same output for the same input, both call dispatch_action, and code share >=80% (CAP-026). 41 existing ingestor tests still pass.
This commit is contained in:
Jon Chery
@@ -457,65 +457,149 @@ def _onboard_consumer(payload):
|
||||
}
|
||||
|
||||
|
||||
def dispatch_action(payload, event=None):
|
||||
"""Shared business-logic dispatch for the contract ingestor (REQ-329).
|
||||
|
||||
Both the AWS Lambda handler (``lambda_handler``) and the CLI path
|
||||
(``cli_main`` / ``__main__``) call this function so the two paths share
|
||||
a single source of truth for action routing, contract validation, the
|
||||
DynamoDB write, and error reporting (NFR-7 — dual-use, single source).
|
||||
|
||||
Args:
|
||||
payload: the decoded action envelope dict
|
||||
``{ consumerRepo, contractId, contract, environment, action }``.
|
||||
event: the raw Lambda Function-URL event (used for IAM caller
|
||||
identity validation). When ``None`` (the CLI path), the identity
|
||||
check uses the ``NOVA_LAMBDA_LOCAL_BYPASS`` env var — CLI invocations
|
||||
are local-only and do not carry an IAM principal.
|
||||
|
||||
Returns:
|
||||
The action result dict (e.g. ``{status, contractId, action, ...}``)
|
||||
on success. Raises ``ValueError`` for validation failures and other
|
||||
exceptions for downstream errors — the caller is responsible for
|
||||
mapping these to the appropriate status code / exit code.
|
||||
"""
|
||||
action = payload.get("action", "submit_contract")
|
||||
# Validate caller identity against the payload (P1-2). The CLI path
|
||||
# passes event=None; the fail-closed check honours the local bypass.
|
||||
_validate_caller_identity(event or {}, payload)
|
||||
if action == "submit_contract":
|
||||
# Validate required fields up front for a clean 400.
|
||||
for field in ("consumerRepo", "contractId", "contract", "environment"):
|
||||
if field not in payload:
|
||||
raise ValueError(f"missing field: {field}")
|
||||
result = _submit_contract(payload)
|
||||
elif action == "report_error":
|
||||
result = _report_error(payload)
|
||||
elif action == "validate_change_request":
|
||||
result = _validate_change_request(payload)
|
||||
elif action == "onboard_consumer":
|
||||
result = _onboard_consumer(payload)
|
||||
else:
|
||||
raise ValueError(f"unknown action: {action}")
|
||||
return result
|
||||
|
||||
|
||||
def _to_http_response(result_or_error):
|
||||
"""Map a dispatch_action result / exception to a Lambda HTTP response.
|
||||
|
||||
Shared error→status mapping so both Lambda + CLI paths interpret errors
|
||||
identically (REQ-329 dual-use).
|
||||
"""
|
||||
if isinstance(result_or_error, Exception):
|
||||
msg = str(result_or_error)
|
||||
if isinstance(result_or_error, ValueError):
|
||||
if "missing IAM caller identity" in msg:
|
||||
return {"statusCode": 401, "body": json.dumps({"error": msg})}
|
||||
return {"statusCode": 400, "body": json.dumps({"error": msg})}
|
||||
return {"statusCode": 500, "body": json.dumps({"error": msg})}
|
||||
return {"statusCode": 200, "body": json.dumps(result_or_error)}
|
||||
|
||||
|
||||
def lambda_handler(event, context):
|
||||
"""AWS Lambda handler entry point.
|
||||
"""AWS Lambda handler entry point (thin wrapper, REQ-329 dual-use).
|
||||
|
||||
Accepts a Function-URL-style event whose ``body`` is a JSON string
|
||||
containing ``{ consumerRepo, contractId, contract, environment, action }``.
|
||||
Parses the Lambda-specific envelope then delegates to the shared
|
||||
``dispatch_action`` business logic.
|
||||
"""
|
||||
try:
|
||||
body = event.get("body", "{}")
|
||||
if isinstance(body, str):
|
||||
payload = json.loads(body)
|
||||
else:
|
||||
payload = body
|
||||
action = payload.get("action", "submit_contract")
|
||||
# Validate caller identity against the payload (P1-2).
|
||||
_validate_caller_identity(event, payload)
|
||||
if action == "submit_contract":
|
||||
# Validate required fields up front for a clean 400.
|
||||
for field in ("consumerRepo", "contractId", "contract", "environment"):
|
||||
if field not in payload:
|
||||
return {
|
||||
"statusCode": 400,
|
||||
"body": json.dumps({"error": f"missing field: {field}"}),
|
||||
}
|
||||
result = _submit_contract(payload)
|
||||
elif action == "report_error":
|
||||
result = _report_error(payload)
|
||||
elif action == "validate_change_request":
|
||||
result = _validate_change_request(payload)
|
||||
elif action == "onboard_consumer":
|
||||
result = _onboard_consumer(payload)
|
||||
else:
|
||||
return {
|
||||
"statusCode": 400,
|
||||
"body": json.dumps({"error": f"unknown action: {action}"}),
|
||||
}
|
||||
return {"statusCode": 200, "body": json.dumps(result)}
|
||||
except ValueError as e:
|
||||
# P10 (REQ-174): identity failures are 401, field validation is 400.
|
||||
if "missing IAM caller identity" in str(e):
|
||||
return {"statusCode": 401, "body": json.dumps({"error": str(e)})}
|
||||
return {"statusCode": 400, "body": json.dumps({"error": str(e)})}
|
||||
payload = json.loads(body) if isinstance(body, str) else body
|
||||
result = dispatch_action(payload, event=event)
|
||||
return _to_http_response(result)
|
||||
except Exception as e: # pragma: no cover - defensive top-level guard
|
||||
return {"statusCode": 500, "body": json.dumps({"error": str(e)})}
|
||||
return _to_http_response(e)
|
||||
|
||||
|
||||
# --- CLI: --check-readiness (D-133, REQ-218) ---------------------------
|
||||
# Invoked as: python3 -m core.lambda.contract_ingestor --check-readiness <submission.json>
|
||||
# Delegates to core.submission_readiness.check_readiness() and prints the
|
||||
# structured ReadinessResult. Exits 0 if ready, 1 if not.
|
||||
def cli_main(argv=None):
|
||||
"""CLI entry point for the contract ingestor (REQ-329 dual-use).
|
||||
|
||||
Usage:
|
||||
python3 -m core.lambda.contract_ingestor --dispatch <payload.json>
|
||||
python3 -m core.lambda.contract_ingestor --dispatch-stdin < <payload.json>
|
||||
|
||||
Parses the CLI-specific input (a JSON file path or stdin) then delegates
|
||||
to the shared ``dispatch_action`` business logic — the same path as the
|
||||
Lambda handler. Returns a process exit code (0 success, 1 validation
|
||||
error, 2 internal error).
|
||||
"""
|
||||
import sys
|
||||
raw = argv if argv is not None else sys.argv[1:]
|
||||
# The --dispatch flag consumes the next positional arg as a payload path;
|
||||
# --dispatch-stdin reads the payload from stdin.
|
||||
if "--dispatch-stdin" in raw:
|
||||
payload = json.loads(sys.stdin.read())
|
||||
elif "--dispatch" in raw:
|
||||
idx = raw.index("--dispatch")
|
||||
path = raw[idx + 1] if idx + 1 < len(raw) else None
|
||||
if not path:
|
||||
print("Usage: --dispatch <payload.json>", file=sys.stderr)
|
||||
return 2
|
||||
with open(path) as fh:
|
||||
payload = json.loads(fh.read())
|
||||
else:
|
||||
print(
|
||||
"Usage: python3 -m core.lambda.contract_ingestor --dispatch <payload.json>",
|
||||
file=sys.stderr,
|
||||
)
|
||||
return 2
|
||||
try:
|
||||
result = dispatch_action(payload, event=None)
|
||||
sys.stdout.write(json.dumps(result, indent=2) + "\n")
|
||||
return 0
|
||||
except ValueError as e:
|
||||
sys.stderr.write(f"error: {e}\n")
|
||||
return 1
|
||||
except Exception as e: # pragma: no cover - defensive top-level guard
|
||||
sys.stderr.write(f"internal error: {e}\n")
|
||||
return 2
|
||||
|
||||
|
||||
# --- CLI: --check-readiness (D-133, REQ-218) + --dispatch (REQ-329) ----
|
||||
# Invoked as:
|
||||
# python3 -m core.lambda.contract_ingestor --check-readiness <submission.json>
|
||||
# python3 -m core.lambda.contract_ingestor --dispatch <payload.json>
|
||||
# The --check-readiness path delegates to core.submission_readiness; the
|
||||
# --dispatch path is the dual-use CLI entry (REQ-329) that calls the same
|
||||
# dispatch_action() as the Lambda handler.
|
||||
if __name__ == "__main__": # pragma: no cover - CLI entry
|
||||
import sys
|
||||
if "--check-readiness" in sys.argv:
|
||||
sys.path.insert(
|
||||
0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
)
|
||||
from core.submission_readiness import cli_main
|
||||
from core.submission_readiness import cli_main as _readiness_cli
|
||||
|
||||
# Strip the --check-readiness flag; pass the file path.
|
||||
rest = [a for a in sys.argv[1:] if a != "--check-readiness"]
|
||||
sys.exit(cli_main(["check-readiness"] + rest))
|
||||
sys.exit(_readiness_cli(["check-readiness"] + rest))
|
||||
elif "--dispatch" in sys.argv or "--dispatch-stdin" in sys.argv:
|
||||
sys.exit(cli_main())
|
||||
else:
|
||||
print("Usage: python3 -m core.lambda.contract_ingestor --check-readiness <submission.json>")
|
||||
print(
|
||||
"Usage: python3 -m core.lambda.contract_ingestor "
|
||||
"--check-readiness <submission.json> | --dispatch <payload.json>",
|
||||
file=sys.stderr,
|
||||
)
|
||||
Reference in New Issue
Block a user