Jon Chery
bee9d02f01
---ci---
project: acdl
phase: 40
milestone: v1.9
status: execute
---/ci---
Phase 40 — contract-interpolation (REQ-103, REQ-104, D-081):
Interpolation:
- core/contract_resolver.py: _expand_vars(value, context) recursively
expands ${env.<field>} + ${contract.<field>} tokens (dotted paths
supported, e.g. ${env.state_backend.bucket}). Unknown tokens raise
ValueError (fail loud). Expansion is post-schema-validation,
pre-IR-resolution.
- resolve() accepts environment_override (D-088) — overrides the
contract's environment field BEFORE schema validation so interpolation
context is consistent.
- env context loaded via _load_env (self-contained, works as script +
package import); 'environment' alias for env 'name' so
${env.environment} resolves.
Environment schema + bindings:
- schemas/environment.schema.json (draft 2020-12): name, account_id,
region, state_backend, network, runner_role_arn, autonomy, confidence_threshold.
- core/environments/qa.json, prod.json, dr.json placeholder bindings
(attested, thresholds 0.75/0.90/0.95, placeholder account_id with
stderr warning at load).
- core/environment_check.py: load(env_name) helper + placeholder warning.
Sample contracts:
- contracts/static-assets.yaml + microservice.yaml use
acdl-${env.environment}-${contract.module}-${env.account_id}-${env.region}
naming pattern (region + account id + environment).
Tests: +35 (test_environment_schema.py, test_interpolation.py,
test_sample_contracts_interpolate.py). 406 passed; run_ci.sh green;
run_platform.sh --check-only green. Existing fixture-based tests
preserved (instance.json static fixtures unaffected).
190 lines
7.7 KiB
Python
190 lines
7.7 KiB
Python
import json
|
|
import os
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
import jsonschema
|
|
import pytest
|
|
import yaml
|
|
|
|
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
|
|
|
ROOT = Path(__file__).resolve().parent.parent
|
|
|
|
|
|
class TestContractSchema:
|
|
def test_schema_is_valid_json_schema(self):
|
|
schema = json.load(open(ROOT / "schemas/contract.schema.json"))
|
|
jsonschema.Draft202012Validator.check_schema(schema)
|
|
|
|
def test_schema_requires_uses_module_environment_inputs(self):
|
|
schema = json.load(open(ROOT / "schemas/contract.schema.json"))
|
|
for field in ["uses", "module", "environment", "inputs"]:
|
|
assert field in schema["required"]
|
|
|
|
|
|
class TestResolveStaticAsset:
|
|
def test_resolve_static_asset_contract(self, tmp_path):
|
|
from core.contract_resolver import resolve
|
|
stack = resolve(str(ROOT / "contracts/static-assets.yaml"), str(ROOT))
|
|
assert stack["stack"]["name"] == "static-assets"
|
|
assert stack["stack"]["kind"] == "l2"
|
|
assert stack["stack"]["depth"] == 1
|
|
assert len(stack["resources"]) >= 1
|
|
|
|
def test_resolve_static_asset_has_s3_cloudfront_waf_resources(self):
|
|
from core.contract_resolver import resolve
|
|
stack = resolve(str(ROOT / "contracts/static-assets.yaml"), str(ROOT))
|
|
types = [r["type"] for r in stack["resources"]]
|
|
assert "aws:s3:bucket" in types
|
|
assert "aws:cloudfront:distribution" in types
|
|
assert "aws:cloudfront:originaccesscontrol" in types
|
|
assert "aws:wafv2:webacl" in types
|
|
|
|
def test_resolve_static_asset_has_s3_resource(self):
|
|
from core.contract_resolver import resolve
|
|
stack = resolve(str(ROOT / "contracts/static-assets.yaml"), str(ROOT))
|
|
s3_res = [r for r in stack["resources"] if r["type"] == "aws:s3:bucket"]
|
|
assert len(s3_res) == 1
|
|
assert s3_res[0]["inputs"]["bucket_name"] == "acdl-dev-static-assets-000000000000-us-east-1"
|
|
assert s3_res[0]["inputs"]["region"] == "us-east-1"
|
|
|
|
def test_resolve_static_asset_validates_against_stack_schema(self):
|
|
from core.contract_resolver import resolve
|
|
stack = resolve(str(ROOT / "contracts/static-assets.yaml"), str(ROOT))
|
|
schema = json.load(open(ROOT / "schemas/stack.schema.json"))
|
|
jsonschema.validate(stack, schema)
|
|
|
|
|
|
class TestResolveMicroservice:
|
|
def test_resolve_microservice_contract(self):
|
|
contract = {
|
|
"uses": "acdl/pipelines/deploy.yaml@v1",
|
|
"module": "microservice",
|
|
"environment": "dev",
|
|
"inputs": {
|
|
"image": "581513795199.dkr.ecr.us-east-1.amazonaws.com/acdl-microservice:latest",
|
|
"port": 8080,
|
|
"region": "us-east-1",
|
|
},
|
|
}
|
|
contract_path = ROOT / "contracts" / "test-microservice.yaml"
|
|
with open(contract_path, "w") as fh:
|
|
yaml.dump(contract, fh)
|
|
try:
|
|
from core.contract_resolver import resolve
|
|
stack = resolve(str(contract_path), str(ROOT))
|
|
assert stack["stack"]["name"] == "microservice"
|
|
assert stack["stack"]["kind"] == "l2"
|
|
assert len(stack["resources"]) >= 6
|
|
finally:
|
|
os.remove(contract_path)
|
|
|
|
|
|
class TestResolveL1Direct:
|
|
def test_resolve_s3_direct(self, tmp_path):
|
|
contract = {
|
|
"uses": "acdl/pipelines/deploy.yaml@v1",
|
|
"module": "s3",
|
|
"environment": "dev",
|
|
"inputs": {
|
|
"bucket_name": "my-test-bucket",
|
|
"region": "us-east-1",
|
|
},
|
|
}
|
|
contract_path = tmp_path / "test-s3.yaml"
|
|
with open(contract_path, "w") as fh:
|
|
yaml.dump(contract, fh)
|
|
from core.contract_resolver import resolve
|
|
stack = resolve(str(contract_path), str(ROOT))
|
|
assert stack["stack"]["name"] == "s3"
|
|
assert stack["stack"]["kind"] == "l1"
|
|
assert len(stack["resources"]) == 1
|
|
assert stack["resources"][0]["type"] == "aws:s3:bucket"
|
|
assert stack["resources"][0]["inputs"]["bucket_name"] == "my-test-bucket"
|
|
|
|
def test_resolve_s3_validates_against_stack_schema(self, tmp_path):
|
|
contract = {
|
|
"uses": "acdl/pipelines/deploy.yaml@v1",
|
|
"module": "s3",
|
|
"environment": "dev",
|
|
"inputs": {"bucket_name": "test", "region": "us-east-1"},
|
|
}
|
|
contract_path = tmp_path / "test-s3-schema.yaml"
|
|
with open(contract_path, "w") as fh:
|
|
yaml.dump(contract, fh)
|
|
from core.contract_resolver import resolve
|
|
stack = resolve(str(contract_path), str(ROOT))
|
|
schema = json.load(open(ROOT / "schemas/stack.schema.json"))
|
|
jsonschema.validate(stack, schema)
|
|
|
|
|
|
class TestResolveErrors:
|
|
def test_unknown_module_raises(self, tmp_path):
|
|
contract = {
|
|
"uses": "acdl/pipelines/deploy.yaml@v1",
|
|
"module": "nonexistent",
|
|
"environment": "dev",
|
|
"inputs": {},
|
|
}
|
|
contract_path = tmp_path / "bad.yaml"
|
|
with open(contract_path, "w") as fh:
|
|
yaml.dump(contract, fh)
|
|
from core.contract_resolver import resolve
|
|
with pytest.raises(ValueError, match="not found in registry"):
|
|
resolve(str(contract_path), str(ROOT))
|
|
|
|
def test_missing_required_field_fails_validation(self, tmp_path):
|
|
contract = {"uses": "acdl/pipelines/deploy.yaml@v1", "module": "s3"}
|
|
contract_path = tmp_path / "incomplete.yaml"
|
|
with open(contract_path, "w") as fh:
|
|
yaml.dump(contract, fh)
|
|
from core.contract_resolver import resolve
|
|
with pytest.raises(jsonschema.ValidationError):
|
|
resolve(str(contract_path), str(ROOT))
|
|
|
|
|
|
class TestDeployPipelineContract:
|
|
def test_deploy_pipeline_validates_against_schema(self):
|
|
schema = json.load(open(ROOT / "schemas/deploy-pipeline.schema.json"))
|
|
with open(ROOT / "pipelines/deploy.yaml") as fh:
|
|
contract = yaml.safe_load(fh)
|
|
jsonschema.validate(contract, schema)
|
|
|
|
def test_deploy_pipeline_has_six_stages(self):
|
|
with open(ROOT / "pipelines/deploy.yaml") as fh:
|
|
contract = yaml.safe_load(fh)
|
|
stage_names = [s["name"] for s in contract["stages"]]
|
|
assert "validate-contract" in stage_names
|
|
assert "resolve-stack" in stage_names
|
|
assert "terraform-plan" in stage_names
|
|
assert "checkov" in stage_names
|
|
assert "confidence" in stage_names
|
|
assert "apply" in stage_names
|
|
|
|
|
|
class TestL2OutputsResolution:
|
|
"""P1-7: L2 composition outputs[] is resolved into stack.outputs."""
|
|
|
|
def test_static_assets_outputs_present(self):
|
|
from core.contract_resolver import resolve
|
|
stack = resolve(str(ROOT / "contracts/static-assets.yaml"), str(ROOT))
|
|
assert "outputs" in stack, "stack.outputs must be present for L2 modules (P1-7)"
|
|
assert "distribution_domain_name" in stack["outputs"]
|
|
assert "bucket_arn" in stack["outputs"]
|
|
assert "web_acl_arn" in stack["outputs"]
|
|
|
|
def test_static_assets_output_from_field_resolves_to_resource_id(self):
|
|
from core.contract_resolver import resolve
|
|
stack = resolve(str(ROOT / "contracts/static-assets.yaml"), str(ROOT))
|
|
dist = stack["outputs"]["distribution_domain_name"]
|
|
assert "from" in dist
|
|
assert "output" in dist
|
|
assert dist["output"] == "distribution_domain_name"
|
|
|
|
def test_microservice_outputs_present(self):
|
|
from core.contract_resolver import resolve
|
|
stack = resolve(str(ROOT / "contracts/microservice.yaml"), str(ROOT))
|
|
assert "outputs" in stack, "stack.outputs must be present for L2 modules (P1-7)"
|
|
assert "lb_arn" in stack["outputs"]
|
|
assert "service_arn" in stack["outputs"] |