Jon Chery
cd637808f5
---ci---
project: acdl
phase: 41
milestone: v1.9
status: execute
---/ci---
Phase 41 — per-environment-ci-jobs (REQ-105, REQ-106, D-082):
Per-env contracts (REQ-105):
- contracts/static-assets.{dev,qa,prod,dr}.yaml + microservice.{dev,qa,prod,dr}.yaml
(8 files, each sets environment: to its own name, uses interpolation).
- Default contracts/static-assets.yaml + microservice.yaml preserved (backwards compat).
Deploy workflow environment input (REQ-106):
- .github/workflows/deploy.yml + .gitea/workflows/deploy.yml (byte-identical):
new 'environment' workflow_call input (default empty, override).
- scripts/run_platform.sh: --environment <name> flag; exports
ACDL_ENVIRONMENT_OVERRIDE; re-runs env check against the override.
- core/contract_resolver.py: resolve(environment_override=...) (D-088);
CLI honors --environment flag + ACDL_ENVIRONMENT_OVERRIDE env var.
Consumer guide (REQ-106):
- docs/consumer-guide.md: 'Per-environment deployment' section with 4
caller-workflow examples (dev/qa/prod/dr), HITL gate structure
(approve_qa/approve_prod/approve_dr, D-042), interpolation reference table.
- Documents promotion-without-editing + hybrid model (per-env contracts
OR single contract + env input).
Tests: +40 (test_per_env_contracts.py, test_deploy_workflow_env_input.py,
test_consumer_guide_per_env_section.py). 446 passed; run_ci.sh green;
deploy workflows byte-identical.
87 lines
3.0 KiB
Python
87 lines
3.0 KiB
Python
"""REQ-105: per-environment contract files exist + validate + resolve."""
|
|
import json
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
import jsonschema
|
|
import pytest
|
|
import yaml
|
|
|
|
ROOT = Path(__file__).resolve().parent.parent
|
|
sys.path.insert(0, str(ROOT))
|
|
|
|
from core.contract_resolver import resolve
|
|
|
|
SCHEMA = json.loads((ROOT / "schemas" / "contract.schema.json").read_text())
|
|
|
|
PER_ENV_CONTRACTS = [
|
|
"contracts/static-assets.dev.yaml",
|
|
"contracts/static-assets.qa.yaml",
|
|
"contracts/static-assets.prod.yaml",
|
|
"contracts/static-assets.dr.yaml",
|
|
"contracts/microservice.dev.yaml",
|
|
"contracts/microservice.qa.yaml",
|
|
"contracts/microservice.prod.yaml",
|
|
"contracts/microservice.dr.yaml",
|
|
]
|
|
|
|
|
|
@pytest.mark.parametrize("rel", PER_ENV_CONTRACTS)
|
|
def test_per_env_contract_validates_against_schema(rel):
|
|
contract = yaml.safe_load((ROOT / rel).read_text())
|
|
jsonschema.validate(contract, SCHEMA)
|
|
|
|
|
|
@pytest.mark.parametrize("rel", PER_ENV_CONTRACTS)
|
|
def test_per_env_contract_resolves(rel):
|
|
stack = resolve(str(ROOT / rel))
|
|
assert stack["stack"]["name"] in ("static-assets", "microservice")
|
|
|
|
|
|
def test_static_assets_dev_has_dev_environment():
|
|
c = yaml.safe_load((ROOT / "contracts/static-assets.dev.yaml").read_text())
|
|
assert c["environment"] == "dev"
|
|
|
|
|
|
def test_static_assets_qa_has_qa_environment():
|
|
c = yaml.safe_load((ROOT / "contracts/static-assets.qa.yaml").read_text())
|
|
assert c["environment"] == "qa"
|
|
|
|
|
|
def test_static_assets_prod_has_prod_environment():
|
|
c = yaml.safe_load((ROOT / "contracts/static-assets.prod.yaml").read_text())
|
|
assert c["environment"] == "prod"
|
|
|
|
|
|
def test_static_assets_dr_has_dr_environment():
|
|
c = yaml.safe_load((ROOT / "contracts/static-assets.dr.yaml").read_text())
|
|
assert c["environment"] == "dr"
|
|
|
|
|
|
def test_per_env_contracts_use_interpolation():
|
|
"""Each per-env contract uses ${env.*} interpolation for the bucket name."""
|
|
for rel in PER_ENV_CONTRACTS:
|
|
text = (ROOT / rel).read_text()
|
|
assert "${env.environment}" in text
|
|
assert "${env.account_id}" in text
|
|
|
|
|
|
def test_per_env_qa_resolves_to_qa_bucket_name():
|
|
stack = resolve(str(ROOT / "contracts/static-assets.qa.yaml"))
|
|
s3 = [r for r in stack["resources"] if r["type"] == "aws:s3:bucket"][0]
|
|
assert s3["inputs"]["bucket_name"] == "acdl-qa-static-assets-000000000000-us-east-1"
|
|
|
|
|
|
def test_per_env_prod_resolves_to_prod_bucket_name():
|
|
stack = resolve(str(ROOT / "contracts/static-assets.prod.yaml"))
|
|
s3 = [r for r in stack["resources"] if r["type"] == "aws:s3:bucket"][0]
|
|
assert s3["inputs"]["bucket_name"] == "acdl-prod-static-assets-000000000000-us-east-1"
|
|
|
|
|
|
def test_default_dev_contract_still_works():
|
|
"""The existing contracts/static-assets.yaml remains the dev default."""
|
|
c = yaml.safe_load((ROOT / "contracts/static-assets.yaml").read_text())
|
|
assert c["environment"] == "dev"
|
|
stack = resolve(str(ROOT / "contracts/static-assets.yaml"))
|
|
s3 = [r for r in stack["resources"] if r["type"] == "aws:s3:bucket"][0]
|
|
assert s3["inputs"]["bucket_name"] == "acdl-dev-static-assets-000000000000-us-east-1" |