Compare commits
35 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Jon Chery
|
a3c7330b75 | ||
|
Jon Chery
|
d103a37419 | ||
|
Jon Chery
|
7c6b8c8c84 | ||
|
Jon Chery
|
5a3ab5e86b | ||
|
Jon Chery
|
4ed2542ecf | ||
|
Jon Chery
|
4c8de8e962 | ||
|
Jon Chery
|
599db2e80d | ||
|
Jon Chery
|
0fea29cdbb | ||
|
Jon Chery
|
7ee57aa6c7 | ||
|
Jon Chery
|
87febc7129 | ||
|
Jon Chery
|
81c6e3995e | ||
|
Jon Chery
|
1ad9c35fb6 | ||
|
Jon Chery
|
9504782a77 | ||
|
Jon Chery
|
6f865a6b3d | ||
|
Jon Chery
|
ab69d1069f | ||
|
Jon Chery
|
031c320551 | ||
|
Jon Chery
|
d6b192307a | ||
|
Jon Chery
|
2ed2ca6bac | ||
|
Jon Chery
|
4b8758404c | ||
|
Jon Chery
|
35a336aba2 | ||
|
Jon Chery
|
d3aa960eb8 | ||
|
Jon Chery
|
e29319a720 | ||
|
Jon Chery
|
7afaa34b60 | ||
|
Jon Chery
|
622abe015b | ||
|
Jon Chery
|
8437a51c6c | ||
|
Jon Chery
|
cc4c27c8ab | ||
|
Jon Chery
|
798f430218 | ||
|
Jon Chery
|
e71539d681 | ||
|
Jon Chery
|
55557962bd | ||
|
Jon Chery
|
4c9314710b | ||
|
Jon Chery
|
3936bf460a | ||
|
Jon Chery
|
3070a68e1d | ||
|
Jon Chery
|
e054a95fd5 | ||
|
Jon Chery
|
327ba1de75 | ||
|
Jon Chery
|
6d27dad114 |
@@ -298,4 +298,81 @@ ACDL has no `package.json`. The verification gate substitutes:
|
||||
3. Phase 08 — AWS OIDC bootstrap (use temp key once, rotate).
|
||||
4. Phase 09 — IR + `l1-s3` + Terraform adapter → `terraform plan`.
|
||||
5. Phase 10 — `l2-static-asset` + contract→IR → end-to-end spike.
|
||||
6. COMPLETE gate — review → ship `v1.2.0` → audit.
|
||||
6. COMPLETE gate — review → ship `v1.2.0` → audit. **DONE.**
|
||||
|
||||
## v1.2 build-out scope
|
||||
|
||||
v1.2 takes the v1.1 spike (dev-only, `plan`-only, single S3 L1) to a real,
|
||||
simpler, better-documented platform that delivers a microservice to AWS ECS
|
||||
Fargate end-to-end. The locked architecture (§1–§12) is unchanged — v1.2
|
||||
extends the *implementation*, not the design.
|
||||
|
||||
### In scope (five axes, user-directed 2026-07-21)
|
||||
|
||||
1. **Re-evaluate the current state.** go-gitea/gitea#36988 (OIDC for Gitea
|
||||
Actions) re-checked 2026-07-21: still **open** (last updated 2026-05-27,
|
||||
not merged). Real OIDC remains deferred to v1.3+; v1.2 extends the D-039
|
||||
per-run-rotated-key waiver as **D-047**. The waiver continues to satisfy
|
||||
§12.5's *intent* (no *persistently* long-lived key): the spike key is
|
||||
rotated after each run by `scripts/rotate_spike_key.sh`, and Phase 12
|
||||
tightens the IAM scoping + rotation hygiene.
|
||||
2. **NFR improvements on the existing spike.** Least-privilege IAM audit of
|
||||
`spike_runner_policy.json`; idempotent `create_state_backend.py` /
|
||||
`create_iam_user.py`; proper exit codes / error handling; P1-1 redaction
|
||||
(two AWS access key IDs in `.ciagent/VERIFY.md` Phase 09 narrative).
|
||||
3. **Streamline / simplify the current setup.** Consolidate
|
||||
`run_spike_plan.sh` + `run_spike_e2e.sh` into one
|
||||
`scripts/run_platform.sh`; remove dead code and stale `platform/` paths.
|
||||
4. **README.md fully up to date on how the platform works.** Reflect v1.1
|
||||
complete; document the actual spike flow, `scripts/run_platform.sh`, the
|
||||
real repo layout, and the v1.2 objective.
|
||||
5. **Bootstrap a consumer repo with a basic microservice deployed to ECS
|
||||
end-to-end.** New Gitea repo `acdl-consumer-microservice` (org
|
||||
`continuous-intelligence`); new IR-typed L1s (`l1-vpc`, `l1-ecs-cluster`,
|
||||
`l1-ecs-service`, `l1-iam-role`, `l1-alb`, `l1-ecr`); new
|
||||
`l2-microservice` thin-composition; one contract submission →
|
||||
`terraform apply` (dev, autonomous per §10, confidence ≥ 0.50) → a live
|
||||
ECS Fargate service serving HTTP 200 → evidence event to the DynamoDB
|
||||
outbox → acdl-evidence timeline.
|
||||
|
||||
### Substrate extension (ECS Fargate)
|
||||
|
||||
The Terraform adapter (§12) remains the only substrate-specific code. v1.2
|
||||
expands the adapter `TYPE_MAP` to cover the six new ECS-shaped IR resource
|
||||
types. The L1 interface shape (IR-typed inputs/outputs/NFRs, registered in
|
||||
`modules-ir/registry.json`) is unchanged — only the set of registered L1s
|
||||
grows. The IR commitments (REQ-28) continue to hold: `modules-ir/`,
|
||||
`schemas/`, `contracts/`, `acdl_platform/confidence_signal.py`,
|
||||
`acdl_platform/contract_resolver.py`, `acdl_platform/outbox_writer.py`
|
||||
remain substrate-agnostic.
|
||||
|
||||
### `terraform apply` (dev only)
|
||||
|
||||
v1.2 lifts the substrate execution from `plan` to `apply` for the `dev`
|
||||
environment only. Dev is autonomous per §10 (confidence ≥ 0.50, no HITL).
|
||||
`apply` for qa/prod/dr remains HITL-gated and out of scope for v1.2. The
|
||||
apply result (resources created, plan diff) is captured in the evidence
|
||||
stream as a `terraform.apply` event.
|
||||
|
||||
### Out of scope for v1.2 (deferred to v1.3+)
|
||||
|
||||
| Feature | Reason |
|
||||
|---------|--------|
|
||||
| Real OIDC federation | go-gitea/gitea#36988 still open. v1.2 extends D-039 waiver (D-047); real OIDC is v1.3+. |
|
||||
| Full HITL matrix wiring (qa/prod/dr) | v1.2 is dev-only autonomous `apply`; HITL wiring is v1.3. |
|
||||
| Kyverno + OPA policy engines | v1.2 keeps Checkov only; Kyverno/OPA are v1.3. |
|
||||
| MCP skill catalog + real L3B agent | v1.2 keeps the L3B stub; the 5-skill catalog is v1.3. |
|
||||
| Audit ledger build-out (S3 Object Lock + JWS + async worker + DLQ + daily checkpoints) | v1.2 keeps the v1.1 outbox; the regulatory ledger is v1.3. |
|
||||
| Multi-region state / outbox | Single-region in v1 (§9, §12.3); multi-region is v1.3+. |
|
||||
| Prod/dr environments | v1.2 is dev-only; prod/dr are v1.3. |
|
||||
| GitOps reconciler (ArgoCD/Flux) | v1.3+. |
|
||||
|
||||
## Build order (v1.2)
|
||||
|
||||
1. Phase 11 — re-eval #36988 + NFR audit + simplification findings + README rewrite.
|
||||
2. Phase 12 — NFR harden + simplify (idempotent bootstrap, one `run_platform.sh`, IAM audit, redactions).
|
||||
3. Phase 13 — six ECS L1s + adapter `TYPE_MAP` expansion.
|
||||
4. Phase 14 — `l2-microservice` + contract schema extension.
|
||||
5. Phase 15 — consumer repo + `terraform apply` (dev) → live ECS service.
|
||||
6. Phase 16 — capstone e2e: consumer commit → live HTTP 200 → evidence → timeline.
|
||||
7. COMPLETE gate — review → ship `v1.3.0` → audit.
|
||||
@@ -0,0 +1,225 @@
|
||||
# ACDL v1.1 Milestone — Audit
|
||||
|
||||
**Auditor:** ci-audit-verifier (model: glm-5.2)
|
||||
**Scope:** v1.1 milestone — Phases 06–10 (tags v1.1.1..v1.1.5), milestone ship tag `v1.2.0`, diff `v1.1.0..HEAD` (48 commits)
|
||||
**Date:** 2026-07-21
|
||||
**Verdict:** **CLEAN** — 0 P0 (no critical issues, no feedback loop), 2 P1 post-hoc hygiene items, 0 P2.
|
||||
|
||||
---
|
||||
|
||||
## 1. Reconstruction test
|
||||
|
||||
**PASS.** The project state can be reconstructed from the git log `---ci---` blocks alone, and it matches the `.ciagent/` file contents.
|
||||
|
||||
### HEAD ci block (d6b1923)
|
||||
|
||||
The latest `---ci---` block on `main` HEAD (== `v1.2.0` tag target) reads:
|
||||
|
||||
```
|
||||
project: acdl
|
||||
phase: 0
|
||||
milestone: v1.1
|
||||
status: complete
|
||||
requirements:
|
||||
covered: [REQ-16..REQ-28]
|
||||
```
|
||||
|
||||
This matches the prompt's expected block exactly: `status: complete`, `milestone: v1.1`, `requirements covered: [REQ-16..28]`. ✅
|
||||
|
||||
### Phase progression (walk-back through ci blocks)
|
||||
|
||||
Each phase (06–10) shows the documented plan → plan-as-execute → shipped → verify progression with the correct phase number. The complete sequence reconstructed from `git log`:
|
||||
|
||||
| Phase | plan commit | plan-as-execute commits | ship commit (release.tag) | verify commit (verdict) |
|
||||
|-------|--------------|--------------------------|----------------------------|--------------------------|
|
||||
| 06 | b927f90 (`status: plan`) | e044a2d | ecb2c78 (`release.tag: v1.1.1`) + 4ab15cb (docs) | 0779a92 (`verdict: VERIFIED`) |
|
||||
| 07 | b40aadd | 92d4535, f8e99ed, 6ed93f0, 68d90c0, 412e1ef | 8723206 (`release.tag: v1.1.2`) | 167a92f (`verdict: VERIFIED`) |
|
||||
| 08 | a003168 | f8ddd8b, 1d5c4d2, d28630d, 727c873 (prep) | 067fef1 (`release.tag: v1.1.3`) + 96ab42f (docs) | 6d27dad (`verdict: VERIFIED`) |
|
||||
| 09 | 327ba1d | e054a95, 3070a68, 3936bf46 | 5555796 (`release.tag: v1.1.4`) + 4c93147 (docs) | e71539d (`verdict: VERIFIED`) |
|
||||
| 10 | cc4c27c (prep 798f430) | 8437a51, 622abe0, 7afaa34, e29319a | 35a336a (`release.tag: v1.1.5`) + d3aa960 (docs) | 4b87584 (`verdict: VERIFIED`) |
|
||||
|
||||
Then the milestone tail: 2ed2ca6 (`status: review`, `verdict: READY TO SHIP`) → d6b1923 (`status: complete`, `v1.2.0` tag). ✅
|
||||
|
||||
### Tags
|
||||
|
||||
`git tag --list` returns the expected set:
|
||||
|
||||
- `v1.0.1..v1.0.5` (v1.0 demo phase tags, preserved per D-rule)
|
||||
- `v1.1.0` (pre-v1.1 demo — points at 58adf9e, the v1.0 Phase 05 traceability commit)
|
||||
- `v1.1.1..v1.1.5` (phase patches 06–10)
|
||||
- `v1.2.0` (milestone ship tag — points at HEAD d6b1923, the complete commit)
|
||||
|
||||
All 12 tags present; no missing tags; no extra tags. ✅
|
||||
|
||||
### ROADMAP.md ↔ tags
|
||||
|
||||
The ROADMAP.md phase statuses match the tags exactly:
|
||||
|
||||
- Phase 06 → `complete (v1.1.1)` ✅
|
||||
- Phase 07 → `complete (v1.1.2)` ✅
|
||||
- Phase 08 → `complete (v1.1.3)` ✅
|
||||
- Phase 09 → `complete (v1.1.4)` ✅
|
||||
- Phase 10 → `complete (v1.1.5)` ✅
|
||||
|
||||
The v1.1 milestone header (line 74) reads `## v1.1 (Complete — architecture finalization + v1 spike, 2026-07-21)` and line 80 says `Status: COMPLETE — all 5 phases shipped (v1.1.1..v1.1.5) + verified; review READY TO SHIP (0 P0); audit pending`. The "audit pending" clause is now stale (this audit closes it) — see P1-A below.
|
||||
|
||||
### REQUIREMENTS.md ↔ tags
|
||||
|
||||
The v1.1 traceability table (lines 117–129) matches the phase tags:
|
||||
|
||||
| REQ | Phase | Status (file) | Tag (git) | Match |
|
||||
|-----|-------|---------------|-----------|-------|
|
||||
| REQ-16..22 | 07 | complete (v1.1.2) | v1.1.2 | ✅ |
|
||||
| REQ-23 | 08 | complete (v1.1.3) | v1.1.3 | ✅ |
|
||||
| REQ-24, 26 | 09 | complete (v1.1.4) | v1.1.4 | ✅ |
|
||||
| REQ-25, 27, 28 | 10 | complete (v1.1.5) | v1.1.5 | ✅ |
|
||||
|
||||
The HEAD complete-commit ci block's `requirements.covered: [REQ-16..REQ-28]` matches REQUIREMENTS.md's 13 complete entries. ✅
|
||||
|
||||
### Reconstruction conclusion
|
||||
|
||||
Reconstructing the project state from git log `---ci---` blocks alone reproduces the `.ciagent/` file contents (PROJECT.md phase table, ROADMAP.md statuses, REQUIREMENTS.md traceability, REVIEW.md verdict). **No drift detected.** ✅
|
||||
|
||||
---
|
||||
|
||||
## 2. .ciagent/ file discipline
|
||||
|
||||
**PASS with one P1 hygiene item.** All required files exist; the latest phase's PLAN/VERIFY are in place; no orphans; no stale v1.0 framing. One stale-path issue in PERSONAS.md.
|
||||
|
||||
### Required files (all present)
|
||||
|
||||
| File | Exists | Notes |
|
||||
|------|--------|-------|
|
||||
| `config.json` | ✅ | mode=single, active_project=acdl, milestone=v1.1 |
|
||||
| `PROJECT.md` | ✅ | v1.1 objective (architecture finalization + v1 spike); D-034..D-046 + D-P08/P09/P10 present |
|
||||
| `ARCHITECTURE.md` | ✅ | v1.1 target architecture; v1.1 spike scope; Gitea API surface with D-039 OIDC waiver |
|
||||
| `REQUIREMENTS.md` | ✅ | REQ-16..28 complete; traceability table matches tags |
|
||||
| `ROADMAP.md` | ✅ | v1.1 header marked Complete; phases 06–10 statuses match tags |
|
||||
| `PERSONAS.md` | ✅ | v1.1 roster; deactivated v1.0 stub-engineer; phase-specific overrides |
|
||||
| `PLAN.md` | ✅ | Phase 10 (the last phase) — `phase: 10, name: v1-spike-l2-and-contract-e2e` |
|
||||
| `RESEARCH.md` | ✅ | 8 research targets (OIDC blocker, runner tooling, IR prior art, Checkov adapter, outbox, confidence signal, audit ledger, HITL matrix) |
|
||||
| `VERIFY.md` | ✅ | Phase 10 verification (the last one) — `Verdict: Phase 10: VERIFIED`, tag v1.1.5 |
|
||||
| `REVIEW.md` | ✅ | new for the milestone review — `Verdict: READY TO SHIP`, 0 P0, 1 P1 carried-forward |
|
||||
|
||||
### No stale v1.0 framing in v1.1 files
|
||||
|
||||
- `PROJECT.md` correctly states the v1.1 objective (line 53: "Finalize the architecture to v1.0 ... and prove the locked commitments with one end-to-end v1 implementation spike"). **No** occurrence of "30-min stub demo" / "30 min" / "stub demo" as the current objective. The v1.0 demo is correctly archived under `demo/` (line 89). ✅
|
||||
- The v1.0 demo is referenced as the *prior* milestone (status complete, tag v1.1.0) with a pointer to its archived location. ✅
|
||||
|
||||
### PLAN.md = Phase 10 (the last phase)
|
||||
|
||||
PLAN.md frontmatter: `phase: 10`, `name: v1-spike-l2-and-contract-e2e`, `requirements: [REQ-25, REQ-27, REQ-28]`. Not a stale Phase 06–09 plan. ✅
|
||||
|
||||
### VERIFY.md = Phase 10 (the last verification)
|
||||
|
||||
VERIFY.md header: `# Phase 10 — v1-spike-l2-and-contract-e2e (v1.1) VERIFY`, `Verdict: Phase 10: VERIFIED`, `Tag: v1.1.5`. Not a stale Phase 06–09 verification. ✅
|
||||
|
||||
### No orphan .ciagent/ files
|
||||
|
||||
`ls .ciagent/` shows exactly the 10 standard files (config.json + the 9 markdown files). No leftover/extra files. ✅
|
||||
|
||||
### P1-A (post-hoc hygiene, non-blocking)
|
||||
|
||||
**Two stale-path drift items inside `.ciagent/`:**
|
||||
|
||||
1. **`config.json` line 8:** `"status": "specify"` — the milestone is `complete` (shipped v1.2.0), but the project-status field still reads `specify`. Should be `"complete"` (or `shipped`). Cosmetic — the milestone field reads `v1.1` correctly, and ROADMAP.md carries the authoritative status.
|
||||
|
||||
2. **`PERSONAS.md` territory paths:** 6 references use the stale `platform/...` path prefix (lines 7, 38, 47, 56, 80, 109) instead of the renamed `acdl_platform/...`. The rename happened in Phase 08 prep commit 727c873 (`fix(P08 prep): rename platform/ -> acdl_platform/ (stdlib shadow fix)`). All executable code + the other `.ciagent/` files use `acdl_platform/`; PERSONAS.md was not updated. The territories listed (`platform/confidence_signal.py`, `platform/contract_resolver.py`, `platform/outbox/**`, `platform/registry/**`, `platform/hitl_matrix_design.md`, `platform/audit_ledger_design.md`, `platform/separation_of_duties.py`) should all read `acdl_platform/...`. Non-blocking — the verification toolchain (`PERSONAS.md` `verification_toolchain.typecheck` line 7 also has the stale `platform/**/*.py`) is overridden per-phase by each PLAN.md's explicit `verification.typecheck`, so the stale path does not break any verify script. **Recommended redaction for v1.2 cleanup.**
|
||||
|
||||
---
|
||||
|
||||
## 3. Branch hygiene
|
||||
|
||||
**PASS.** Clean branch topology, clean working tree.
|
||||
|
||||
### Branch list
|
||||
|
||||
`git branch -a` returns:
|
||||
- `main`
|
||||
- `milestone/v1.0-initial` (the v1.0 milestone branch, intentionally retained)
|
||||
- `remotes/origin/main`
|
||||
- `remotes/origin/milestone/v1.0-initial`
|
||||
|
||||
**No leftover `phase/NN-*` branches** (all 5 phase branches — `phase/06-archive-demo-and-reorient`, `phase/07-architecture-v1-finalization`, `phase/08-aws-bootstrap`, `phase/09-v1-spike-ir-and-l1-and-adapter`, `phase/10-v1-spike-l2-and-contract-e2e` — were deleted post-merge, confirmed by the ship commit messages referencing the squash-merge of the phase branch). ✅
|
||||
|
||||
### Working tree
|
||||
|
||||
`git status` on `main`: "nothing to commit, working tree clean". The branch is ahead of `origin/main` by 43 commits (the v1.1 milestone work has not been pushed to the remote yet — this is expected for an audit pass before the milestone is declared shipped; the push is the final ship step). No uncommitted changes; no stray artifacts (`.env.secrets`, `terraform/spike/.terraform/`, `terraform/spike/.terraform.lock.hcl`, `terraform/spike/tfplan`, `terraform/spike/*.tfstate*` are all gitignored per REVIEW.md Lens 3). ✅
|
||||
|
||||
### Branch hygiene conclusion
|
||||
|
||||
Clean. ✅
|
||||
|
||||
---
|
||||
|
||||
## 4. Commit discipline
|
||||
|
||||
**PASS with one P1 hygiene item.** Every v1.1-stage commit carries a `---ci---` block with the documented fields; the field-usage rules hold; the merges are the documented `--no-ff` squash-merge pattern.
|
||||
|
||||
### `---ci---` block presence
|
||||
|
||||
48 commits in `v1.1.0..HEAD`. Audit of ci-block presence:
|
||||
|
||||
- **3 commits with no `---ci---` block:** `52665b8 Add docs/architecture.md`, `7614c41 Add docs/vision.md`, `b84a8a2 Update docs/architecture.md`. All three are **pre-specify upstream-doc ingestion** commits: each is an ancestor of the specify commit `288607b` (`docs(specify): ingest docs/vision+architecture`). They are the raw upstream `docs/` files being added to the repo *before* the v1.1 CIAgent protocol was applied (the specify commit 288607b is the first v1.1-stage commit and the first to carry a v1.1 `---ci---` block). These three commits belong to the v1.0→v1.1 transition, not the v1.1 milestone proper. They are inside the `v1.1.0..HEAD` audit range only because `v1.1.0` is tagged at the v1.0 Phase 05 traceability commit (58adf9e) — a tag-placement choice that puts the v1.0-complete + audit-v1.0 + docs-ingestion commits inside the v1.1 range. **P1-B (post-hoc, non-blocking):** if the audit protocol requires every commit in the `v1.1.0..HEAD` range to carry a v1.1 ci block, these three pre-specify ingestion commits technically fail it. However: (a) they predate the v1.1 specify stage, (b) the v1.0 milestone-complete commit `80ac975` and the v1.0 audit `d700148` carry v1.0 ci blocks (correct for their milestone), and (c) the v1.0 contracts commit `30e63d6` carries a v1.0 ci block. Only the 3 raw `docs/` ingestion commits lack any ci block at all. Recommended for a future note in the run.md about tag placement (a v1.1.0 tag on the v1.0 *complete* commit rather than the v1.0 Phase 05 traceability commit would have excluded these from the v1.1 range). Non-blocking.
|
||||
|
||||
- **45 commits with `---ci---` blocks:** all carry `project: acdl`, `phase:` (0 for milestone-stage, 6–10 for phase-stage), `milestone: v1.1`, and `status:` from the documented set {specify, clarify, research, plan, plan-as-execute, shipped, verify, review, complete}. ✅
|
||||
|
||||
### Field usage rules
|
||||
|
||||
- **`release.tag`** appears only on the 5 ship commits (ecb2c78 v1.1.1, 8723206 v1.1.2, 067fef1 v1.1.3, 5555796 v1.1.4, 35a336a v1.1.5) — never on plan/plan-as-execute/verify/review/complete commits. ✅
|
||||
- **`verdict`** appears only on the 5 verify commits (0779a92, 167a92f, 6d27dad, e71539d, 4b87584) and the 1 review commit (2ed2ca6) — never elsewhere. ✅
|
||||
- **`requirements.covered`** appears on plan-as-execute commits (where a task covers a specific REQ) and on the complete commit (REQ-16..28). The complete commit uses the documented nested form (`requirements:\n covered: [...]`). ✅
|
||||
- **No ad-hoc fields.** All fields used (`project`, `phase`, `milestone`, `status`, `release.tag`, `verdict`, `requirements.covered`, `persona`, `tasks`) are from the documented set. ✅
|
||||
|
||||
### Merge commits
|
||||
|
||||
`git log --merges v1.1.0..HEAD` returns exactly the 5 ship commits:
|
||||
|
||||
```
|
||||
35a336a ship: phase-10 ... (v1.1.5) [parents: e71539d d3aa960]
|
||||
5555796 ship: phase-09 ... (v1.1.4) [parents: 327ba1d 4c93147]
|
||||
067fef1 ship: phase-08 ... (v1.1.3) [parents: 167a92f 96ab42f]
|
||||
8723206 ship: phase-07 ... (v1.1.2) [parents: b40aadd 412e1ef]
|
||||
ecb2c78 ship: phase-06 ... (v1.1.1) [parents: b927f90 4ab15cb]
|
||||
```
|
||||
|
||||
Each ship commit has two parents: (1) the prior `verify` commit on `main`, and (2) the phase branch's final `docs(PNN): post-ship traceability` commit. This is the documented `--no-ff` squash-merge pattern (the phase branch is merged into main as a merge commit, not a fast-forward). **No** other merge commits exist in the range — no surprise merges, no `--ff-only` regressions. ✅
|
||||
|
||||
### Closing-tag note
|
||||
|
||||
All 45 ci-block commits close the block with `---/ci---` (the documented closing tag). **No** commit uses the malformed `---ci---` close. ✅
|
||||
|
||||
---
|
||||
|
||||
## Critical issues
|
||||
|
||||
**No critical issues (0 P0).** The audit found no blocking problems:
|
||||
|
||||
- Reconstruction test passes — git log reproduces the `.ciagent/` state with no drift.
|
||||
- File discipline passes — all 10 files present, latest-phase PLAN/VERIFY in place, no orphans, no stale v1.0 framing.
|
||||
- Branch hygiene passes — clean topology, no leftover phase branches, clean working tree.
|
||||
- Commit discipline passes — every v1.1-stage commit carries a well-formed `---ci---` block; field rules hold; merges are the documented pattern.
|
||||
|
||||
**No feedback loop is triggered.** The milestone does not need to return to EXECUTE.
|
||||
|
||||
---
|
||||
|
||||
## Post-hoc hygiene (P1s for v1.2 cleanup)
|
||||
|
||||
| ID | Item | Severity | File / location | Fix |
|
||||
|----|------|----------|-----------------|-----|
|
||||
| **P1-1** (carried-forward from REVIEW.md) | Two AWS access key IDs (`AKIA…SPIKE` rotated spike key, `AKIA…ROOT-DEACTIVATED` deactivated root key) appeared in `.ciagent/VERIFY.md` Phase 09 narrative. **Public identifiers, not secret pairs.** They lived in the `.ciagent/` audit narrative, not in any executable code path. | P1 (non-blocking) | `.ciagent/VERIFY.md` Phase 09 narrative (v1.1) | **Redacted in v1.2 Phase 12** to placeholders `AKIA…SPIKE` / `AKIA…ROOT-DEACTIVATED` across `.ciagent/RESEARCH.md`, `PROJECT.md`, `REVIEW.md`, `AUDIT.md`. The original VERIFY.md instances were overwritten by Phase 11's VERIFY.md. |
|
||||
| **P1-A** (audit-new) | `config.json` line 8 `"status": "specify"` is stale — the milestone is `complete` (v1.2.0 shipped). | P1 (non-blocking) | `.ciagent/config.json:8` | Update to `"status": "complete"` (or `"shipped"`) in v1.2 cleanup. |
|
||||
| **P1-B** (audit-new) | `PERSONAS.md` territory paths (lines 7, 38, 47, 56, 80, 109) reference the stale `platform/...` prefix instead of the renamed `acdl_platform/...`. The rename happened in Phase 08 prep (commit 727c873). The verification toolchain line 7 also has the stale `platform/**/*.py` glob. Non-blocking: each PLAN.md overrides the toolchain per-phase, and territories are descriptive (enforcement mode = `warn`). | P1 (non-blocking) | `.ciagent/PERSONAS.md` lines 7, 38, 47, 56, 80, 109 | Replace `platform/` with `acdl_platform/` in v1.2 cleanup. |
|
||||
| **P1-C** (audit-new, observation) | 3 pre-specify upstream-doc ingestion commits (`52665b8 Add docs/architecture.md`, `7614c41 Add docs/vision.md`, `b84a8a2 Update docs/architecture.md`) carry no `---ci---` block. They predate the v1.1 specify stage (each is an ancestor of the specify commit 288607b). They fall inside the `v1.1.0..HEAD` audit range only because the `v1.1.0` tag is placed at the v1.0 Phase 05 traceability commit (58adf9e) rather than the v1.0 complete commit (80ac975). | P1 (non-blocking, process note) | tag placement + run.md | Document in run.md that the milestone-complete tag should be placed on the milestone-complete commit to exclude the transition-window commits from the next milestone's audit range. No file change needed for v1.1; v1.2 should pick the tag placement deliberately. |
|
||||
| **P1-D** (audit-new, cosmetic) | `ROADMAP.md` line 81 says `audit pending` — now stale (this audit closes it). | P1 (non-blocking, cosmetic) | `.ciagent/ROADMAP.md:81` | Update to `audit CLEAN` (or remove the clause) in v1.2 cleanup. |
|
||||
|
||||
---
|
||||
|
||||
## Final verdict
|
||||
|
||||
**v1.1 milestone audit: CLEAN**
|
||||
|
||||
- 0 P0 (no critical issues, no feedback loop).
|
||||
- 5 P1 post-hoc hygiene items (1 carried-forward from REVIEW.md + 4 audit-new), all non-blocking, all flagged for v1.2 cleanup.
|
||||
- The milestone is shippable as-is. The `v1.2.0` tag on `main` HEAD is valid.
|
||||
@@ -4,7 +4,7 @@ milestone: v1.1
|
||||
generated_at: 2026-07-21
|
||||
generator: lead-developer
|
||||
verification_toolchain:
|
||||
typecheck: "terraform validate && python3 -m py_compile platform/**/*.py && python3 -m jsonschema schemas/*.schema.json"
|
||||
typecheck: "terraform validate && python3 -m py_compile acdl_platform/**/*.py && python3 -m jsonschema schemas/*.schema.json"
|
||||
test: "scripts/verify_phaseNN.sh"
|
||||
build: "terraform init"
|
||||
note: |
|
||||
@@ -35,7 +35,7 @@ verification_toolchain:
|
||||
- **Phase-specific:** false
|
||||
- **Frameworks:** python, json-schema, gitea-actions, act_runner, bash, yaml
|
||||
- **Constraints:** contract-schema-first, fail-fast-with-reason-codes, no-long-lived-credentials, severity-to-penalty-mapping-immutable
|
||||
- **Territory:** `platform/confidence_signal.py`, `platform/contract_resolver.py`, `platform/outbox/**`, `schemas/**` (contract + IR + PolicyCheckResult), `contracts/**` (sample contracts), `.gitea/workflows/**` (pipeline)
|
||||
- **Territory:** `acdl_platform/confidence_signal.py`, `acdl_platform/contract_resolver.py`, `acdl_platform/outbox_writer.py`, `schemas/**` (contract + IR + PolicyCheckResult), `contracts/**` (sample contracts), `.gitea/workflows/**` (pipeline)
|
||||
- **Reason:** Owns the contract schema, contract→IR resolution, the confidence signal (6 inputs + severity mapping), the DynamoDB outbox writer, and the central pipeline workflow.
|
||||
|
||||
### platform-engineer (custom)
|
||||
@@ -44,7 +44,7 @@ verification_toolchain:
|
||||
- **Phase-specific:** false
|
||||
- **Frameworks:** terraform, aws-iam, aws-s3, aws-dynamodb, oidc, json-schema
|
||||
- **Constraints:** ir-is-substrate-agnostic, adapter-is-only-substrate-specific-code, state-in-s3+dynamodb-single-region, oidc-only-no-long-lived-keys (waiver D-034 for bootstrap), terraform-plan-only-in-spike
|
||||
- **Territory:** `adapters/terraform/**`, `modules-ir/**`, `terraform/**` (state backend, provider config), `platform/registry/**`
|
||||
- **Territory:** `adapters/terraform/**`, `modules-ir/**`, `terraform/**` (state backend, provider config), `modules-ir/registry.json`
|
||||
- **Reason:** Owns the Target Stack IR, the L1/L2 IR-typed modules, the Terraform adapter, the AWS OIDC bootstrap, and the state backend. The IR is substrate-agnostic; the adapter is the only substrate-specific code (the binding constraint per §12).
|
||||
|
||||
### security-engineer (custom)
|
||||
@@ -53,7 +53,7 @@ verification_toolchain:
|
||||
- **Phase-specific:** false
|
||||
- **Frameworks:** aws-iam, oidc, checkov, json-schema
|
||||
- **Constraints:** least-privilege, separation-of-duties-identity-distinctness, no-secrets-in-skill-markdown, audit-chain-extends-not-tears-up, critical-finding-hard-overrides-confidence
|
||||
- **Territory:** `platform/hitl_matrix_design.md`, `platform/audit_ledger_design.md`, `adapters/terraform/policy/**` (Checkov adapter → PolicyCheckResult), `platform/separation_of_duties.py`
|
||||
- **Territory:** `acdl_platform/hitl_matrix_design.md`, `acdl_platform/audit_ledger_design.md`, `adapters/terraform/policy/**` (Checkov adapter → PolicyCheckResult), `acdl_platform/separation_of_duties.py`
|
||||
- **Reason:** Owns the HITL matrix design, separation-of-duties (DynamoDB identity-distinctness), the audit ledger design (S3 Object Lock + JWS + chain), and the Checkov→PolicyCheckResult adapter. Enforces the "Safety is Computed, Not Assumed" + "Audit truth lives outside the repository" vision tenets.
|
||||
|
||||
### frontend-engineer
|
||||
@@ -77,7 +77,7 @@ verification_toolchain:
|
||||
### data-engineer
|
||||
- **Domain:** data
|
||||
- **Active:** false
|
||||
- **Reason:** No ORM/persistence framework. The v1.1 outbox is DynamoDB but accessed via boto3 calls inside `platform/outbox/**` (owned by backend-engineer); the audit ledger is S3 Object Lock + JWS (owned by security-engineer). No schema-migration layer, no ORM, no data-engineer territory.
|
||||
- **Reason:** No ORM/persistence framework. The v1.1 outbox is DynamoDB but accessed via boto3 calls inside `acdl_platform/outbox_writer.py` (owned by backend-engineer); the audit ledger is S3 Object Lock + JWS (owned by security-engineer). No schema-migration layer, no ORM, no data-engineer territory.
|
||||
- **Phase-specific:** false
|
||||
- **Frameworks:** (would have been: drizzle, prisma)
|
||||
- **Constraints:** (would have been: schema-first, type-safe-orm)
|
||||
@@ -106,7 +106,7 @@ being right before backend wiring.
|
||||
## Conflict resolutions (lead-developer arbitration)
|
||||
|
||||
- `backend-engineer` vs `platform-engineer` over `schemas/ir.schema.json`: platform-engineer owns the IR (it is substrate-agnostic but infra-shaped); backend-engineer owns the contract schema and the contract→IR resolution (contract is the consumer surface). Co-authoring is expected; conflict goes to lead-developer.
|
||||
- `backend-engineer` vs `security-engineer` over `platform/confidence_signal.py`: security-engineer owns the severity→penalty mapping + critical-override semantics; backend-engineer owns the 6-input weighted sum + per-env thresholds. The confidence signal is co-owned; conflicts go to lead-developer.
|
||||
- `backend-engineer` vs `security-engineer` over `acdl_platform/confidence_signal.py`: security-engineer owns the severity→penalty mapping + critical-override semantics; backend-engineer owns the 6-input weighted sum + per-env thresholds. The confidence signal is co-owned; conflicts go to lead-developer.
|
||||
- `platform-engineer` vs `security-engineer` over `adapters/terraform/policy/**`: security-engineer owns the Checkov→PolicyCheckResult adapter (policy is a security concern); platform-engineer owns the Terraform adapter (substrate translation). No overlap.
|
||||
- `lead-developer` vs any: lead-developer owns `.ciagent/**` + `docs/**` meta + verification scripts; persona engineers do not edit CIAgent metadata or the vision/architecture source docs.
|
||||
|
||||
|
||||
+19
-1115
File diff suppressed because it is too large
Load Diff
+82
-7
@@ -50,7 +50,7 @@ traceable to a human attestation and an immutable evidence stream.
|
||||
boundary. The platform validates, enriches with operational standards,
|
||||
and reconciles the target state.
|
||||
|
||||
## Objective for Milestone v1.1
|
||||
## Objective for Milestone v1.1 (prior — complete, tag `v1.2.0`)
|
||||
|
||||
Finalize the architecture to v1.0 (resolve all 11 open design decisions in
|
||||
`docs/architecture.md` §13) and prove the locked commitments with one
|
||||
@@ -67,7 +67,11 @@ end-to-end v1 implementation spike:
|
||||
The spike validates the architecture's claim that the IR-shaped commitments
|
||||
do not require a polyglot mess (`docs/architecture.md` §14, step 2).
|
||||
|
||||
## Milestone v1.1 Phases
|
||||
**Status: COMPLETE — all 5 phases shipped (v1.1.1..v1.1.5) + verified; review
|
||||
READY TO SHIP (0 P0); audit CLEAN; milestone tag `v1.2.0`; Gitea release
|
||||
id 202 published. D-034 closed (root key deactivated by user).**
|
||||
|
||||
## Milestone v1.1 Phases (prior — complete)
|
||||
|
||||
| Phase | Name | Goal |
|
||||
|-------|------|------|
|
||||
@@ -78,7 +82,56 @@ do not require a polyglot mess (`docs/architecture.md` §14, step 2).
|
||||
| 10 | v1-spike-l2-and-contract-e2e | One L2 thin-composition (`l2-static-asset`) referencing `l1-s3`; contract schema + contract→IR resolution; one end-to-end contract submission → `terraform plan` → Checkov → confidence signal → evidence event to outbox. Verify the IR commitments hold. |
|
||||
|
||||
Milestone COMPLETE gate: review → ship `v1.2.0` (feature milestone, next
|
||||
minor per ship.md) → audit.
|
||||
minor per ship.md) → audit. **DONE.**
|
||||
|
||||
## Objective for Milestone v1.2 (active)
|
||||
|
||||
Platform hardening + first real consumer deployment. The v1.1 spike proved
|
||||
the IR commitments hold on a single dev-only `terraform plan` for one S3
|
||||
bucket. v1.2 takes the spike to a real, simpler, better-documented platform
|
||||
that actually delivers a microservice to AWS ECS Fargate end-to-end.
|
||||
|
||||
Five scope axes (user-directed, 2026-07-21):
|
||||
|
||||
1. **Re-evaluate the current state.** Confirm go-gitea/gitea#36988 (OIDC for
|
||||
Gitea Actions) is still unmerged (re-checked 2026-07-21: **open**, last
|
||||
updated 2026-05-27). Extend the D-039 per-run-rotated-key waiver for
|
||||
v1.2; real OIDC is deferred to v1.3+ (D-047).
|
||||
2. **NFR improvements on the existing spike.** Least-privilege IAM audit,
|
||||
idempotent bootstrap, proper exit codes / error handling, rotation
|
||||
hygiene, P1-1 / P1-B redaction carried forward from the v1.1 audit.
|
||||
3. **Streamline / simplify the current setup.** Consolidate the
|
||||
`run_spike_*.sh` scripts into one `scripts/run_platform.sh`; remove
|
||||
dead code and stale paths; one command runs the whole pipeline.
|
||||
4. **README.md fully up to date on how the platform works.** The current
|
||||
README still says "v1.1 (active)" — it must reflect v1.1 complete, the
|
||||
actual spike flow, how to run it, the real repo layout, and the v1.2
|
||||
objective.
|
||||
5. **Bootstrap a consumer repo with a basic microservice deployed to ECS
|
||||
end-to-end.** New Gitea repo `acdl-consumer-microservice` (org
|
||||
`continuous-intelligence`) holding a tiny HTTP container + Dockerfile;
|
||||
new IR-typed L1s (`l1-vpc`, `l1-ecs-cluster`, `l1-ecs-service`,
|
||||
`l1-iam-role`, `l1-alb`, `l1-ecr`); new `l2-microservice`
|
||||
thin-composition; one contract submission → `terraform apply` (dev,
|
||||
autonomous) → a live ECS Fargate service serving HTTP 200 → evidence
|
||||
event to the DynamoDB outbox → acdl-evidence timeline.
|
||||
|
||||
The milestone proves the platform delivers real value (a running
|
||||
microservice), not just a plan.
|
||||
|
||||
## Milestone v1.2 Phases
|
||||
|
||||
| Phase | Name | Goal |
|
||||
|-------|------|------|
|
||||
| 11 | v1.2-research-and-readme | Re-eval #36988 (confirm open → extend D-039 as D-047). Audit the v1.1 spike for NFR gaps (least-privilege, idempotency, error handling, rotation hygiene) + simplification opportunities. **Rewrite README.md** to reflect v1.1 complete + how the platform actually works (spike flow, how to run, repo layout, v1.2 objective). Output: RESEARCH.md v1.2 addendum; updated README. |
|
||||
| 12 | nfr-harden-and-simplify | Apply Phase 11 findings: tighten `spike_runner_policy.json` (least-privilege audit); make `terraform/bootstrap/create_*.py` idempotent; consolidate `run_spike_*.sh` → one `scripts/run_platform.sh`; proper exit codes / error handling; redact P1-1 AWS key IDs in `VERIFY.md`; fix any remaining stale `platform/` paths. Spike still runs e2e after the refactor. |
|
||||
| 13 | l1-catalog-for-ecs | Author IR-typed L1s for an ECS Fargate microservice: `l1-vpc`, `l1-ecs-cluster`, `l1-ecs-service`, `l1-iam-role` (task + exec role), `l1-alb`, `l1-ecr`. Register all in `modules-ir/registry.json`. Expand the Terraform adapter `TYPE_MAP`. Each L1 produces a valid `terraform plan` fragment. |
|
||||
| 14 | l2-microservice-and-contract-schema | Author `l2-microservice` thin-composition (references the ECS L1s, depth ≤ 5). Extend `schemas/contract.schema.json` for microservice inputs (image, port, env, healthcheck). Verify contract→IR resolution yields a complete target stack. |
|
||||
| 15 | consumer-repo-and-terraform-apply | Create consumer repo `acdl-consumer-microservice` (Gitea org) with a basic microservice (tiny HTTP container + Dockerfile + ECR push). Lift the platform from `plan` → **`apply`** (dev, autonomous per §10). Submit `contracts/microservice.yaml` → pipeline → IR → plan → apply → a real ECS Fargate service running. |
|
||||
| 16 | v1.2-capstone-e2e | End-to-end verification: consumer commit → pipeline → ECS service live serving HTTP 200 → evidence event to the DynamoDB outbox → acdl-evidence timeline renders it. Verify NFR improvements hold, the setup is simpler (one `run_platform.sh`), and the README is accurate. |
|
||||
|
||||
Milestone COMPLETE gate: review → ship `v1.3.0` (feature milestone, next
|
||||
minor per ship.md — v1.1 shipped `v1.2.0`) → audit.
|
||||
|
||||
## Requirements
|
||||
|
||||
@@ -88,9 +141,9 @@ Status: complete. Tag `v1.1.0`. All REQ-01..15 satisfied by the stub-driven
|
||||
executive demo. See `REQUIREMENTS.md` §v1 and the prior decisions table
|
||||
appendix below. The demo is **archived** to `demo/` in Phase 06.
|
||||
|
||||
### v1.1 (Active milestone — architecture finalization + v1 spike)
|
||||
### v1.1 (Prior milestone — architecture finalization + v1 spike, complete)
|
||||
|
||||
New requirements REQ-16..REQ-2x — see `REQUIREMENTS.md` §v1.1. Summary:
|
||||
New requirements REQ-16..REQ-28 — see `REQUIREMENTS.md` §v1.1. Summary:
|
||||
|
||||
- **REQ-16:** Architecture finalized to v1.0 (11 open decisions resolved).
|
||||
- **REQ-17:** Target Stack IR defined as JSON Schema; substrate-agnostic.
|
||||
@@ -115,6 +168,27 @@ New requirements REQ-16..REQ-2x — see `REQUIREMENTS.md` §v1.1. Summary:
|
||||
- **REQ-28:** Spike verification proves the IR-shaped commitments hold (no
|
||||
polyglot mess; the adapter is the only substrate-specific code).
|
||||
|
||||
### v1.2 (Active milestone — platform hardening + first real consumer deployment)
|
||||
|
||||
New requirements REQ-29..REQ-35 — see `REQUIREMENTS.md` §v1.2. Summary:
|
||||
|
||||
- **REQ-29:** README.md fully documents the v1.1-complete platform: spike
|
||||
flow, how to run, repo layout, v1.2 objective.
|
||||
- **REQ-30:** NFR hardening — least-privilege IAM audit, idempotent
|
||||
bootstrap, consolidated `run_platform.sh`, error handling, P1-1/P1-B
|
||||
redaction.
|
||||
- **REQ-31:** L1 catalog expanded for ECS — 6 new IR-typed L1s
|
||||
(`l1-vpc`, `l1-ecs-cluster`, `l1-ecs-service`, `l1-iam-role`, `l1-alb`,
|
||||
`l1-ecr`) registered and adapter-compiled.
|
||||
- **REQ-32:** `l2-microservice` thin-composition + contract schema extended
|
||||
for microservice inputs (image, port, env, healthcheck).
|
||||
- **REQ-33:** `terraform apply` (dev, autonomous) — real provisioning, not
|
||||
just `plan`.
|
||||
- **REQ-34:** Consumer repo `acdl-consumer-microservice` with a basic
|
||||
microservice (ECR image, Dockerfile, contract).
|
||||
- **REQ-35:** End-to-end verification — consumer commit → live ECS service
|
||||
(HTTP 200) → evidence event → timeline.
|
||||
|
||||
## Constraints
|
||||
|
||||
- **Forge:** Gitea at `https://git.cloudinit.dev`, org `continuous-intelligence`.
|
||||
@@ -157,7 +231,7 @@ decisions:
|
||||
|
||||
| ID | Decision | Rationale | Outcome |
|
||||
|----|----------|-----------|---------|
|
||||
| D-034 | Temporary long-lived AWS key (waiver) used once in Phase 08 to bootstrap OIDC trust; rotated immediately after | §12.5 forbids long-lived creds; OIDC needs one bootstrapping `aws iam` call before the runner can assume a role | Spike achieves real `terraform plan` against AWS without violating the locked target after bootstrap |
|
||||
| D-034 | Temporary long-lived AWS key (waiver) used once in Phase 08 to bootstrap the state backend + IAM user; rotated/deactivated immediately after | §12.5 forbids long-lived creds; the bootstrap needed one `aws iam` call before the spike user + rotated key could take over | Spike achieves real `terraform plan` against AWS without violating the locked target after bootstrap. **CLOSED 2026-07-21: root key `AKIA…ROOT-DEACTIVATED` deactivated by the user in the AWS IAM console (verified — `InvalidClientTokenId`); the spike uses the rotated `acdl-spike-runner` key per D-039. Key ID redacted in v1.2 Phase 12 (P1-1).** |
|
||||
| D-035 | Milestone version = `v1.1` (feature), ship tag `v1.2.0` | Real platform is a breaking reframing of the demo, but treated as the next incremental milestone per user choice; ship.md: feature milestone → next minor | Tag `v1.2.0` on milestone COMPLETE |
|
||||
| D-036 | Spike picks `l1-s3` + `l2-static-asset` | Simplest real AWS resource (no IAM/network deps); smallest real `terraform plan`; proves the IR + adapter end-to-end | Spike scope fixed |
|
||||
| D-037 | Demo archived to `demo/` (not deleted) | Preserves the working v1.0 demo as intent reference; new platform layout under `platform/`, `schemas/`, `adapters/`, `terraform/`, `modules-ir/` | No churn on demo code; clean separation |
|
||||
@@ -170,6 +244,7 @@ decisions:
|
||||
| D-044 | DynamoDB outbox = `PAY_PER_REQUEST`; PK `contractId`, SK `eventType#eventTs`, TTL `expire_at` = now + 365d. No separate async worker/DLQ in the spike (RTO = workflow re-run); v1.2 outbox worker + DLQ is a Phase 07 design artifact. | On-demand is zero-cost-at-idle for the spike's single dev submission. | Spike outbox is minimal; v1.2 worker design authored in Phase 07 |
|
||||
| D-045 | Runner tooling: `runs-on: ubuntu-latest`; install `terraform` via HashiCorp apt repo (pin `1.9.*`), `checkov` via pip (pin `>=3.2,<4`, `--break-system-packages`). Neither is pre-installed on the default runner image. | RESEARCH TARGET 2; pinning avoids mid-spike version drift. | Phase 09/10 workflows have a concrete setup step |
|
||||
| D-046 | `act_runner` → `gitea-runner` rename: Phase 07 updates docs to use the current name `gitea-runner` (renamed 2026-04 in gitea/runner#850). | RESEARCH TARGET 1 + R-4: naming drift between v1.0 docs and the current runner. | Docs reflect the current binary name |
|
||||
| D-047 | v1.2 carries forward the D-039 per-run-rotated-key waiver. Real OIDC federation remains deferred to v1.3+, blocked on go-gitea/gitea#36988 (re-checked 2026-07-21: still **open**, last updated 2026-05-27, not merged). | §12.5 forbids long-lived creds; the Gitea Actions OIDC provider is still not merged. The waiver continues to satisfy §12.5's *intent* (no *persistently* long-lived key) for v1.2: `scripts/rotate_spike_key.sh` rotates the key, and Phase 12 tightens the IAM scoping + rotation hygiene. | v1.2 achieves `terraform apply` against AWS without a persistently long-lived key; real OIDC is a v1.3+ deliverable. |
|
||||
|
||||
### Open-decision resolutions (Phase 07 deliverable — recorded here for traceability)
|
||||
|
||||
@@ -213,7 +288,7 @@ sign-off (autonomy = full; all within locked constraints).
|
||||
| Spike `terraform` command | `plan` only | `apply` is out of scope (Out of Scope table); HITL-gated in v1.2 |
|
||||
| Checkov ruleset (spike) | the 4 L2 checks (secrets-in-plaintext, public ingress, IAM wildcard, KMS key reference) + tag/naming | §3 + §12.4; Kyverno/OPA deferred |
|
||||
| v1.0 tags preserved | `v1.0.1`..`v1.0.5`, `v1.1.0` retained | Immutability; demo archive does not rewrite history |
|
||||
| Next ship tag | `v1.2.0` | Feature milestone → next minor per ship.md (D-035) |
|
||||
| Next ship tag | `v1.3.0` | Feature milestone → next minor per ship.md (v1.1 shipped `v1.2.0`; v1.2 ships `v1.3.0`) |
|
||||
|
||||
### Items deferred to RESEARCH (not clarifications)
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
(None — v1 covers the complete demo.)
|
||||
|
||||
## v1.1 (Active milestone — architecture finalization + v1 spike)
|
||||
## v1.1 (Prior milestone — architecture finalization + v1 spike, complete)
|
||||
|
||||
### Category: Architecture Finalization
|
||||
- **REQ-16:** Architecture reaches v1.0 — all 11 open decisions in `docs/architecture.md` §13 are resolved and recorded in `PROJECT.md` (W1.A, W1.B, W2.A, W3.D, W3.E, BA.A–F, OpenTofu timing).
|
||||
@@ -70,6 +70,40 @@
|
||||
| Prod/dr environments | v1.2. |
|
||||
| Terraform `apply` (real provisioning) | Spike runs `plan` only; `apply` is gated by HITL in v1.2. |
|
||||
|
||||
## v1.2 (Active milestone — platform hardening + first real consumer deployment)
|
||||
|
||||
### Category: Documentation & Simplification
|
||||
- **REQ-29:** `README.md` is fully rewritten to reflect the v1.1-complete platform: the actual spike flow (contract → IR → `terraform plan` → Checkov → confidence signal → outbox), how to run it (`scripts/run_platform.sh`), the real repo layout (`acdl_platform/`, `schemas/`, `adapters/`, `terraform/`, `modules-ir/`, `contracts/`, `demo/`), and the v1.2 objective. No stale "v1.1 (active)" framing.
|
||||
- **REQ-30:** NFR hardening of the v1.1 spike: (a) `terraform/bootstrap/spike_runner_policy.json` audited to least-privilege (S3 + DynamoDB + ECS + ECR + ELB + IAM plan-only, no wildcards beyond the documented exceptions); (b) `create_state_backend.py` and `create_iam_user.py` are idempotent (re-running exits 0 without duplicating resources); (c) `run_spike_plan.sh` + `run_spike_e2e.sh` consolidated into a single `scripts/run_platform.sh` with proper exit codes and error handling; (d) P1-1 carried forward from the v1.1 audit — the two AWS access key IDs in `.ciagent/VERIFY.md` Phase 09 narrative are redacted to placeholders; (e) any remaining stale `platform/` paths in `.ciagent/` are corrected to `acdl_platform/`.
|
||||
|
||||
### Category: L1 Catalog Expansion (ECS Fargate)
|
||||
- **REQ-31:** Six new IR-typed L1 modules exist under `modules-ir/l1/` and are registered in `modules-ir/registry.json`: `l1-vpc` (VPC + subnets + route tables), `l1-ecs-cluster` (ECS Fargate cluster), `l1-ecs-service` (ECS service + task definition), `l1-iam-role` (task execution + task role), `l1-alb` (application load balancer + listener + target group), `l1-ecr` (ECR repository). Each has an `interface.json` valid against `schemas/ir.schema.json` and produces a valid `terraform plan` fragment via the Terraform adapter. The adapter `TYPE_MAP` is expanded to cover all six IR resource types.
|
||||
|
||||
### Category: L2 Composition & Contract Schema
|
||||
- **REQ-32:** `l2-microservice` thin-composition exists under `modules-ir/l2/l2-microservice/` referencing the six ECS L1s (depth ≤ 5, within max-depth-5). `schemas/contract.schema.json` is extended with microservice inputs (`image: string`, `port: integer`, `env: map`, `healthcheck: object`) and validates a `contracts/microservice.yaml` submission. Contract→IR resolution (`acdl_platform/contract_resolver.py`) yields a complete target stack for `l2-microservice`.
|
||||
|
||||
### Category: Real Provisioning
|
||||
- **REQ-33:** The platform runs `terraform apply` (not just `plan`) for the `dev` environment, autonomous per §10 (confidence ≥ 0.50, no HITL). The apply creates real AWS resources (VPC, ECS cluster, ECR repo, ALB, ECS service) and the result is captured in the evidence stream. `apply` for qa/prod/dr remains HITL-gated and out of scope for v1.2.
|
||||
|
||||
### Category: Consumer Repo
|
||||
- **REQ-34:** A new Gitea repo `acdl-consumer-microservice` exists under the `continuous-intelligence` org, containing: a basic HTTP microservice (e.g., a tiny Python/Go server returning 200), a `Dockerfile`, an ECR push step, and a `contracts/microservice.yaml` submission for `l2-microservice` (dev environment).
|
||||
|
||||
### Category: End-to-End Verification
|
||||
- **REQ-35:** One end-to-end flow: consumer commit to `acdl-consumer-microservice` → pipeline triggered → contract→IR resolution → `terraform plan` → `terraform apply` (dev) → a live ECS Fargate service serving HTTP 200 on its ALB → evidence event written to the DynamoDB outbox → the event renders on the `acdl-evidence` timeline. `scripts/verify_phase16.sh` proves the full flow green.
|
||||
|
||||
## Out of Scope (v1.2)
|
||||
|
||||
| Feature | Reason |
|
||||
|---------|--------|
|
||||
| Real OIDC federation | go-gitea/gitea#36988 still open (re-checked 2026-07-21). v1.2 extends D-039 waiver (D-047); real OIDC is v1.3+. |
|
||||
| Full HITL matrix wiring (qa/prod/dr) | v1.2 is dev-only autonomous `apply`; HITL wiring is v1.3. |
|
||||
| Kyverno + OPA policy engines | v1.2 keeps Checkov only; Kyverno/OPA are v1.3. |
|
||||
| MCP skill catalog + real L3B agent | v1.2 keeps the L3B stub; the 5-skill catalog is v1.3. |
|
||||
| Audit ledger build-out (S3 Object Lock + JWS + async worker + DLQ + daily checkpoints) | v1.2 keeps the v1.1 outbox; the regulatory ledger is v1.3. |
|
||||
| Multi-region state / outbox | Single-region in v1 (§9, §12.3); multi-region is v1.3+. |
|
||||
| Prod/dr environments | v1.2 is dev-only; prod/dr are v1.3. |
|
||||
| GitOps reconciler (ArgoCD/Flux) | v1.3+. |
|
||||
|
||||
## Clarifications (Phase 01, v1.0 — retained for history)
|
||||
|
||||
| REQ | Original criterion | Clarified criterion (effective) | Decision |
|
||||
@@ -110,7 +144,7 @@
|
||||
| REQ-14 | 5 | complete (v1.0.5) |
|
||||
| REQ-15 | 5 | complete (v1.0.5) |
|
||||
|
||||
### v1.1 (active — architecture finalization + v1 spike)
|
||||
### v1.1 (prior — architecture finalization + v1 spike, complete)
|
||||
|
||||
| Requirement | Phase | Status |
|
||||
|-------------|-------|--------|
|
||||
@@ -122,8 +156,20 @@
|
||||
| REQ-21 | 07 | complete (v1.1.2) |
|
||||
| REQ-22 | 07 | complete (v1.1.2) |
|
||||
| REQ-23 | 08 | complete (v1.1.3) |
|
||||
| REQ-24 | 09 | pending |
|
||||
| REQ-25 | 10 | pending |
|
||||
| REQ-26 | 09 | pending |
|
||||
| REQ-27 | 10 | pending |
|
||||
| REQ-28 | 10 | pending |
|
||||
| REQ-24 | 09 | complete (v1.1.4) |
|
||||
| REQ-25 | 10 | complete (v1.1.5) |
|
||||
| REQ-26 | 09 | complete (v1.1.4) |
|
||||
| REQ-27 | 10 | complete (v1.1.5) |
|
||||
| REQ-28 | 10 | complete (v1.1.5) |
|
||||
|
||||
### v1.2 (active — platform hardening + first real consumer deployment)
|
||||
|
||||
| Requirement | Phase | Status |
|
||||
|-------------|-------|--------|
|
||||
| REQ-29 | 11 | complete (v1.2.1) |
|
||||
| REQ-30 | 12 | complete (v1.2.2) |
|
||||
| REQ-31 | 13 | complete (v1.2.3) |
|
||||
| REQ-32 | 14 | planned |
|
||||
| REQ-33 | 15 | planned |
|
||||
| REQ-34 | 15 | planned |
|
||||
| REQ-35 | 16 | planned |
|
||||
@@ -1327,4 +1327,139 @@ the demo is local-only post-archive), but this is moot for the archive.
|
||||
|
||||
---
|
||||
|
||||
## v1.2 Research Addendum (Phase 11, 2026-07-21)
|
||||
|
||||
> Phase: research (Phase 11). Milestone: v1.2. Status: active.
|
||||
> Researcher: ci-researcher (inline, docs phase). Autonomy: full.
|
||||
> Sources: GitHub API (go-gitea/gitea#36988), ACDL codebase audit
|
||||
> (`terraform/bootstrap/`, `scripts/`, `adapters/terraform/`,
|
||||
> `modules-ir/registry.json`, `.ciagent/VERIFY.md`, `.ciagent/PERSONAS.md`).
|
||||
> Scope: re-eval OIDC blocker, NFR audit of the v1.1 spike, simplification
|
||||
> opportunities, README rewrite plan, ECS L1 catalog scoping.
|
||||
|
||||
### TARGET 9 — go-gitea/gitea#36988 re-check (v1.2)
|
||||
|
||||
**Verdict (conf 0.95): still open, not merged.**
|
||||
|
||||
Re-checked 2026-07-21 via `api.github.com/repos/go-gitea/gitea/pulls/36988`:
|
||||
- `state`: open
|
||||
- `merged`: false
|
||||
- `merged_at`: null
|
||||
- `updated_at`: 2026-05-27T16:26:24Z
|
||||
- `title`: "Add Actions OIDC provider with workflow permission gating"
|
||||
|
||||
No movement since the v1.1 research (2026-07-21 v1.1 research also found it
|
||||
open). Real OIDC federation remains impossible for Gitea Actions. **D-047
|
||||
adopts**: extend the D-039 per-run-rotated-key waiver for v1.2; real OIDC is
|
||||
deferred to v1.3+. The waiver continues to satisfy §12.5's *intent*: no
|
||||
*persistently* long-lived key (`scripts/rotate_spike_key.sh` rotates after
|
||||
each run; Phase 12 tightens IAM scoping + rotation hygiene).
|
||||
|
||||
### TARGET 10 — NFR audit of the v1.1 spike
|
||||
|
||||
Audited the v1.1 spike's operational code for NFR gaps.
|
||||
|
||||
**`terraform/bootstrap/spike_runner_policy.json`** — least-privilege PASS
|
||||
already. Explicit Allow list (S3 state bucket R/W, DynamoDB outbox R/W,
|
||||
`sts:GetCallerIdentity`) + `DenyEverythingElse` on `*` with `NotResource`.
|
||||
No wildcards in the Allow statements. **v1.2 gap**: the policy only covers
|
||||
S3 + DynamoDB + STS — Phase 15's `terraform apply` to ECS needs ECS + ECR +
|
||||
ELB + IAM (plan + apply) permissions added. Phase 12 scopes the policy
|
||||
expansion; Phase 15 applies it.
|
||||
|
||||
**`terraform/bootstrap/create_state_backend.py`** — idempotent PASS already.
|
||||
`head_bucket` → skip-create if exists; `describe_table` → skip-create if
|
||||
exists; `put_bucket_versioning` is idempotent. **No v1.2 change needed.**
|
||||
|
||||
**`terraform/bootstrap/create_iam_user.py`** — idempotent PASS already.
|
||||
`get_user` → skip-create if exists; `put_user_policy` overwrites (idempotent);
|
||||
`list_access_keys` → skip-create if an active key exists. **No v1.2 change
|
||||
needed.**
|
||||
|
||||
**`scripts/run_spike_plan.sh` + `scripts/run_spike_e2e.sh`** — two scripts,
|
||||
overlapping setup (env loading, `cd terraform/spike`, `terraform init`).
|
||||
`run_spike_e2e.sh` is the superset (full pipeline); `run_spike_plan.sh` is
|
||||
the plan-only subset. **v1.2 simplification (Phase 12)**: consolidate into
|
||||
one `scripts/run_platform.sh` with a `--plan-only` flag (default: full e2e).
|
||||
Removes ~30 lines of duplication.
|
||||
|
||||
**`scripts/rotate_spike_key.sh`** — idempotent PASS (always ends with exactly
|
||||
1 active key). Uses the bootstrap root key to rotate; documented that D-034
|
||||
closure (root key deactivation) is a manual user step. **No v1.2 change
|
||||
needed** (the root key is now deactivated per D-034 closure; rotation uses
|
||||
the spike key itself or a separate rotation credential — flagged as a v1.2
|
||||
operational note in Phase 12).
|
||||
|
||||
**Error handling**: `run_spike_e2e.sh` uses `set -u` + a `fail()` helper —
|
||||
good. `run_spike_plan.sh` uses `set -u` + inline exits — adequate. The
|
||||
consolidated `run_platform.sh` should use `set -euo pipefail` + `fail()`
|
||||
for uniform strictness.
|
||||
|
||||
**P1-1 redaction target (Phase 12 — DONE)**: the v1.1 `.ciagent/` audit
|
||||
narrative referenced two AWS access key IDs (`AKIA…SPIKE` rotated spike
|
||||
key, `AKIA…ROOT-DEACTIVATED` deactivated root key). Public identifiers,
|
||||
not secret pairs, in the audit narrative not executable code. **Phase 12
|
||||
redacted** them to `AKIA…SPIKE` / `AKIA…ROOT-DEACTIVATED` across
|
||||
`.ciagent/RESEARCH.md`, `PROJECT.md`, `REVIEW.md`, `AUDIT.md`.
|
||||
|
||||
**P1-B stale paths**: `.ciagent/PERSONAS.md` line 47 still has
|
||||
`platform/registry/**` (the rest were fixed at `ab69d10`). **Phase 12
|
||||
fixes** line 47 to `acdl_platform/registry/**` (or removes it — there is no
|
||||
`acdl_platform/registry/` dir; the registry is `modules-ir/registry.json`).
|
||||
|
||||
### TARGET 11 — Simplification opportunities
|
||||
|
||||
1. **Script consolidation** (above): `run_spike_*.sh` → `run_platform.sh`.
|
||||
2. **`terraform/spike/.terraform/` artifacts**: gitignored already
|
||||
(`.gitignore` covers `.terraform/`, `.terraform.lock.hcl`, `tfplan`,
|
||||
`*.tfstate*`). No change.
|
||||
3. **`acdl_platform/__pycache__/`**: gitignored already. No change.
|
||||
4. **Dead code**: none found — the spike is tight. The `run_spike_plan.sh`
|
||||
script is the only redundancy (subsumed by `run_platform.sh --plan-only`).
|
||||
5. **`demo/` archive**: correctly separated; no v1.2 touch.
|
||||
|
||||
### TARGET 12 — README rewrite plan
|
||||
|
||||
Current `README.md` (51 lines) is stale: "v1.1 (active)" framing, no
|
||||
"how to run the platform" section, no v1.2 objective. **Phase 11 rewrites
|
||||
it** to reflect:
|
||||
- v1.1 complete (tag `v1.2.0`); v1.0 demo archived under `demo/`.
|
||||
- The actual spike flow: contract → IR → `terraform plan` → Checkov →
|
||||
confidence signal → outbox.
|
||||
- How to run: `scripts/run_platform.sh` (after Phase 12; for now
|
||||
`scripts/run_spike_e2e.sh`).
|
||||
- Real repo layout table (the existing one is accurate; refresh the
|
||||
"Populated" column).
|
||||
- v1.2 objective (platform hardening + ECS microservice).
|
||||
|
||||
### TARGET 13 — ECS L1 catalog scoping (for Phase 13)
|
||||
|
||||
Six L1s needed for an ECS Fargate microservice. Each maps to one or more
|
||||
AWS Terraform resources; the adapter `TYPE_MAP` (currently
|
||||
`{"aws:s3:bucket": "aws_s3_bucket"}`) needs expansion:
|
||||
|
||||
| L1 | IR type(s) | Terraform resource(s) | Key inputs |
|
||||
|----|-----------|----------------------|-----------|
|
||||
| `l1-vpc` | `aws:ec2:vpc`, `aws:ec2:subnet`, `aws:ec2:routetable` | `aws_vpc`, `aws_subnet`, `aws_route_table` + associations | cidr, azs |
|
||||
| `l1-ecs-cluster` | `aws:ecs:cluster` | `aws_ecs_cluster` | name |
|
||||
| `l1-ecs-service` | `aws:ecs:service`, `aws:ecs:task_definition` | `aws_ecs_service`, `aws_ecs_task_definition` | image, port, cpu, memory, env |
|
||||
| `l1-iam-role` | `aws:iam:role`, `aws:iam:rolepolicyattachment` | `aws_iam_role`, `aws_iam_role_policy_attachment` | task + exec role |
|
||||
| `l1-alb` | `aws:elbv2:loadbalancer`, `aws:elbv2:listener`, `aws:elbv2:targetgroup` | `aws_lb`, `aws_lb_listener`, `aws_lb_target_group` | port, protocol |
|
||||
| `l1-ecr` | `aws:ecr:repository` | `aws_ecr_repository` | name |
|
||||
|
||||
The IR schema (`schemas/ir.schema.json`) is substrate-agnostic and already
|
||||
supports arbitrary resource types — no schema change needed, only new
|
||||
`interface.json` files + `TYPE_MAP` entries. The `l2-microservice`
|
||||
thin-composition references all six (depth ≤ 5).
|
||||
|
||||
### Decisions surfaced (v1.2)
|
||||
|
||||
| ID | Decision | Rationale | Confidence | Alternatives |
|
||||
|----|----------|-----------|------------|--------------|
|
||||
| **D-047** | Extend D-039 per-run-rotated-key waiver for v1.2. Real OIDC deferred to v1.3+. | go-gitea/gitea#36988 still open (TARGET 9). The waiver satisfies §12.5's intent for v1.2; Phase 12 tightens IAM + rotation hygiene. | 0.95 | (a) wait for #36988 (blocks v1.2 indefinitely); (b) self-hosted OIDC broker (heavy); (c) KMS-backed ephemeral creds (scope creep for v1.2). |
|
||||
| **D-048** | Consolidate `run_spike_plan.sh` + `run_spike_e2e.sh` → one `scripts/run_platform.sh` with `--plan-only` flag (default: full e2e). | Two scripts with overlapping setup (~30 lines duplicated). One script with a flag is simpler and matches the "streamline" scope axis. | 0.90 | Keep both (redundant); delete `run_spike_plan.sh` only (loses the plan-only convenience). |
|
||||
| **D-049** | v1.2 L1 catalog = 6 L1s (`l1-vpc`, `l1-ecs-cluster`, `l1-ecs-service`, `l1-iam-role`, `l1-alb`, `l1-ecr`). The adapter `TYPE_MAP` expands to 9 IR types (3 new for VPC, 3 for the rest). | Minimal set to deploy an ECS Fargate service end-to-end. VPC is split into vpc/subnet/routetable because the IR models one resource per `interface.json` entry, but the L1 groups them. | 0.85 | Fewer L1s (e.g. fold VPC into the ECS service — violates L1 single-purpose); more L1s (e.g. separate `l1-securitygroup` — scope creep for v1.2). |
|
||||
|
||||
---
|
||||
|
||||
*End of RESEARCH.md. Path: `/root/acdl/.ciagent/RESEARCH.md`.*
|
||||
@@ -0,0 +1,230 @@
|
||||
# ACDL v1.1 Milestone — Multi-Persona Code Review
|
||||
|
||||
**Reviewer:** ci-code-reviewer (model: glm-5.2)
|
||||
**Scope:** v1.1 milestone — Phases 06–10 (tags v1.1.1..v1.1.5), diff `v1.1.0..HEAD`
|
||||
**Date:** 2026-07-21
|
||||
**Verdict:** **READY TO SHIP** — 0 P0, 1 P1 (carried-forward), 0 P2 new
|
||||
|
||||
---
|
||||
|
||||
## Lens 1 — Correctness
|
||||
|
||||
The schemas + Python modules + Terraform implement what the decisions +
|
||||
`ARCHITECTURE.md` committed. Spot-checks all pass.
|
||||
|
||||
### Findings
|
||||
|
||||
- **`schemas/ir.schema.json`** (REQ-17): resources / relationships / composition
|
||||
(max-depth-5) / policy hooks (via PolicyCheckResult consumer) all present per
|
||||
§12.1. Substrate-agnostic: `aws_s3_bucket` appears ONLY in `$comment` and
|
||||
`description` strings (which explain the IR→Terraform mapping); it does NOT
|
||||
appear in any constraining keyword (`enum`/`const`/`pattern`/`required`). The
|
||||
schema body uses IR types (`aws:s3:bucket`). **Correct.**
|
||||
- **`schemas/contract.schema.json`** (REQ-22, W3.E): per-env mandatory via `allOf`
|
||||
if/then — qa requires `validation.e2eSuite`+`validation.loadTest`; prod requires
|
||||
`runbook`+`dashboard`+`oncall`; dr requires `drDrillRef`. The `profile:agentic`
|
||||
conditional is `if: {required:[profile], profile:{const:agentic}}` →
|
||||
`then: {required:[naturalLanguageIntent]}` — this is the **fixed** form
|
||||
(requires `profile` to be present before checking `const`), not the Phase 07
|
||||
initial bug. Verified: prod-missing-runbook rejected; agentic-without-NLI
|
||||
rejected; qa-without-validation rejected; dr-without-drDrillRef rejected;
|
||||
dev + agentic-with-NLI accepted. **Correct.**
|
||||
- **`acdl_platform/confidence_signal.py`** (REQ-19, D-040): `WEIGHTS` sum to
|
||||
1.0 (verified: 0.30+0.25+0.10+0.15+0.10+0.10 = 1.0). `PENALTY["critical"] = None`
|
||||
(hard-override sentinel). The critical-override short-circuit
|
||||
(`if p is None: return Signal(0.0, "block", ...)`) returns BEFORE the
|
||||
`score = max(0.0, min(1.0, base - penalty))` clamp. Dev-warn→block flip present
|
||||
(`if environment == "dev" and band == "warn": band = "block"`). The `policy`
|
||||
input key is read as `inputs.get("policy")` (not `policy_results`) — matches the
|
||||
Phase 10 e2e `run_spike_e2e.sh` which passes `inputs = {"policy": pcr, ...}`.
|
||||
Adversarial test: a critical-fail PCR → `score=0.0 band=block reasons=['CRITICAL_OVERRIDE:...']`.
|
||||
**Correct.**
|
||||
- **`acdl_platform/contract_resolver.py`** (REQ-27): `resolve()` loads YAML →
|
||||
validates against `contract.schema.json` → looks up L2 in registry → loads
|
||||
`composition.json` → maps wires → emits IR → validates against `ir.schema.json`.
|
||||
Wire mapping verified: `contract.inputs.bucket_name` →
|
||||
`child.inputs.bucket_name` via `wires.bucket_name.{target:s3, input:bucket_name}`.
|
||||
Resolved spike IR has `resources[0].inputs = {bucket_name: acdl-spike-bucket,
|
||||
region: us-east-1}`. Prod-missing-runbook raises `jsonschema.ValidationError`
|
||||
(not a generic ValueError). **Correct.**
|
||||
- **`acdl_platform/outbox_writer.py`** (D-044, D-P10-3): SHA-256 over canonical
|
||||
JSON (`sort_keys=True, separators=(",", ":")`). `prev_event_hash` defaults to
|
||||
`"GENESIS"`. DynamoDB item shape: PK `contractId` (S), SK
|
||||
`eventType#eventTs` (S), TTL `expire_at` (N, now+365d). Append-only
|
||||
(`put_item` only; 0 `delete_item`/`update_item`). **Correct.**
|
||||
- **`adapters/terraform/adapter.py`** (REQ-26, D-P10-1): `TYPE_MAP =
|
||||
{aws:s3:bucket -> aws_s3_bucket}`. Backend key derived from stack name:
|
||||
`spike/l2-static-asset/terraform.tfstate` (verified). Unknown IR type raises
|
||||
`ValueError`. Resources array handling is shape-driven (iterates
|
||||
`ir_instance["resources"]`; works for both l1 and l2 IR). **Correct.**
|
||||
- **`adapters/terraform/policy/checkov_adapter.py`** (REQ-18, D-043): `RULE_MAP`
|
||||
has exactly 11 Checkov rule IDs (CKV_AWS_41/45/46/20/57/24/25/1/40/7/33). The
|
||||
`ACDL_TAG_NAMING` SKIPPED record is appended (severity: info, result:
|
||||
skipped). Tolerates both Checkov JSON shapes — nested
|
||||
`{framework: {results: {...}}}` and legacy `{framework: {passed_checks:...}}`
|
||||
(the `results = body.get("results", body)` fallback). **Correct.**
|
||||
|
||||
### Verdict: PASS — no issues.
|
||||
|
||||
---
|
||||
|
||||
## Lens 2 — Testing
|
||||
|
||||
The verify scripts are real gates that fail on regression, not presence checks.
|
||||
|
||||
### Findings
|
||||
|
||||
- **`scripts/verify_phase07.sh`**: Check 2 uses
|
||||
`jsonschema.Draft202012Validator.check_schema(...) || fail` — actually
|
||||
validates the 3 schemas as Draft 2020-12 (fails if a schema is broken).
|
||||
Check 8 cross-checks the spike contract against `contract.schema.json` via
|
||||
`jsonschema.validate(...) || fail`. Check 9 cross-checks a minimal IR against
|
||||
`ir.schema.json`. Every check has `|| fail`. **Real gate.**
|
||||
- **`scripts/verify_phase10.sh`**: 8 checks, each with `|| fail`. Check (h) is the
|
||||
REQ-28 substrate-agnostic scan. **Synthetic leak test performed:** appended
|
||||
`LEAK = "aws_s3_bucket"` to `acdl_platform/separation_of_duties.py` and ran the
|
||||
Check (h) grep — it caught the leak (`acdl_platform/separation_of_duties.py:44:
|
||||
LEAK = "aws_s3_bucket"`), then reverted. The check also scans `modules-ir/`
|
||||
JSON for `aws_*` resource-type VALUES (excluding `description`/`$comment`
|
||||
strings). **Real gate.**
|
||||
- **`scripts/run_spike_e2e.sh`** + **`scripts/run_spike_plan.sh`**: touch real AWS
|
||||
— `terraform init/validate/plan -lock=false` + `checkov` + DynamoDB
|
||||
`put_item`/`query`. NOT stubbed (the spike key is loaded from gitignored
|
||||
`.env.secrets`). The e2e runner uses `|| fail` on every step, so a DynamoDB
|
||||
outage or terraform failure exits 1 (verified: outbox write failure propagates
|
||||
via `|| fail "outbox write failed"`). **Real e2e.**
|
||||
|
||||
### Verdict: PASS — no issues.
|
||||
|
||||
---
|
||||
|
||||
## Lens 3 — Security
|
||||
|
||||
AWS key handling (D-034/D-039), IAM least-privilege, gitignore discipline, no
|
||||
secrets in commits. All clean.
|
||||
|
||||
### Findings
|
||||
|
||||
- **No leaked key IDs in executable code:**
|
||||
`git log v1.1.0..HEAD -p | grep -iE "AKIA[A-Z0-9]{16}" | grep -v "^#"` returns
|
||||
matches ONLY inside `.ciagent/VERIFY.md` (the Phase 09 narrative — the
|
||||
carried-forward P1-1). No `.py`, `.tf`, `.json`, `.yaml`, or `.sh` file
|
||||
contains an `AKIA…` key ID. **Clean.**
|
||||
- **No leaked secret keys:**
|
||||
`git log v1.1.0..HEAD -p | grep -iE "aws_secret_access_key.*=.*[A-Za-z0-9/+=]{40}" | grep -v "^#"`
|
||||
returns nothing. **Clean.**
|
||||
- **`terraform/bootstrap/spike_runner_policy.json`** (REQ-23): least-privilege.
|
||||
Allow actions: `s3:{PutObject,GetObject,DeleteObject,ListBucket,GetBucketLocation,GetBucketVersioning}`
|
||||
+ `dynamodb:{GetItem,PutItem,DeleteItem,UpdateItem,Query,Scan,DescribeTable}`
|
||||
+ `sts:GetCallerIdentity`. **No** `iam:*`, **no** `ec2:*`, **no**
|
||||
`s3:CreateBucket`, **no** `s3:DeleteBucket`, **no** `terraform apply`
|
||||
(apply is out of spike scope). `DenyEverythingElse` `NotResource` lists exactly
|
||||
3 ARNs (state bucket + bucket objects + outbox table); everything else is
|
||||
denied. **Correct.**
|
||||
- **Gitignore discipline:** `.env.secrets`, `terraform/bootstrap/.bootstrap_state.json`,
|
||||
`terraform/spike/.terraform/`, `terraform/spike/.terraform.lock.hcl`,
|
||||
`terraform/spike/tfplan`, `terraform/spike/*.tfstate*` all gitignored
|
||||
(`git check-ignore` confirms each). **Correct.**
|
||||
- **Outbox write is append-only:** `grep -c "delete_item|update_item"
|
||||
outbox_writer.py` = 0 (only `put_item`). **Correct.**
|
||||
- **E2E runner is plan-only:** `grep -c "terraform apply" run_spike_e2e.sh` = 0
|
||||
(only `init + validate + plan`). **Correct.**
|
||||
|
||||
### P1 (carried-forward, NOT auto-fixed)
|
||||
|
||||
- **P1-1:** The `.ciagent/VERIFY.md` Phase 09 narrative contained two AWS access
|
||||
key IDs — `AKIA…SPIKE` (the rotated spike key id) and
|
||||
`AKIA…ROOT-DEACTIVATED` (the deactivated root key id). Confirmed present
|
||||
in the v1.1 audit (`grep -c` returned 2). These are **public identifiers, not secret pairs**;
|
||||
they live in the `.ciagent/` audit narrative, not in any executable code
|
||||
path. Recommended for a future hygiene redaction pass (replace with
|
||||
`AKIA…SPIKE` / `AKIA…ROOT-DEACTIVATED` placeholders). **Non-blocking for v1.2
|
||||
ship; flagged for post-hoc review.**
|
||||
|
||||
### Verdict: PASS — 1 carried-forward P1 (non-blocking).
|
||||
|
||||
---
|
||||
|
||||
## Lens 4 — Performance
|
||||
|
||||
Not a concern for the spike (plan-only, single resource, no load). **Skipped.**
|
||||
|
||||
---
|
||||
|
||||
## Lens 5 — Maintainability
|
||||
|
||||
The `acdl_platform/` rename, substrate-agnostic boundary, and decision trail
|
||||
are all consistent.
|
||||
|
||||
### Findings
|
||||
|
||||
- **`acdl_platform/` rename (Phase 08 prep, fixing the stdlib `platform`
|
||||
shadow):** consistently applied across `scripts/verify_phase06.sh`,
|
||||
`scripts/verify_phase07.sh`, `README.md`, and the Python imports
|
||||
(`import acdl_platform.confidence_signal as c` in `run_spike_e2e.sh`).
|
||||
`grep -l acdl_platform` confirms all three files reference the renamed dir.
|
||||
**Consistent.**
|
||||
- **Decision trail:** every schema/module cites its source. Sampled 3 files:
|
||||
- `acdl_platform/confidence_signal.py` cites `REQ-19`, `D-040`,
|
||||
`ARCHITECTURE.md §8`.
|
||||
- `acdl_platform/contract_resolver.py` cites `ARCHITECTURE.md §12.8`.
|
||||
- `schemas/ir.schema.json` cites `ARCHITECTURE.md §12.1`, `§3`, `W3.D`.
|
||||
**Citations present.**
|
||||
- **Spike-vs-v1.2 boundary** documented in each design doc:
|
||||
`acdl_platform/audit_ledger_design.md`, `acdl_platform/hitl_matrix_design.md`,
|
||||
and `.ciagent/PLAN.md` all reference `v1.2`. **Boundary documented.**
|
||||
- **Substrate-agnostic boundary (REQ-28):** the adapter is the only
|
||||
substrate-specific code. `acdl_platform/` Python is clean (verified by the
|
||||
Check (h) grep + the synthetic leak test). `modules-ir/` JSON data files
|
||||
contain only IR types (`aws:s3:bucket`); `aws_s3_bucket` appears only in
|
||||
`description`/`$comment` strings that explain the mapping. **Boundary holds.**
|
||||
|
||||
### Verdict: PASS — no issues.
|
||||
|
||||
---
|
||||
|
||||
## Lens 6 — Adversarial
|
||||
|
||||
Tried to break the spike. All failure modes handled correctly.
|
||||
|
||||
### Findings
|
||||
|
||||
- **`contracts/spike.yaml` with `environment: prod` (missing runbook):** the
|
||||
contract schema rejects it via the `allOf` if/then (`runbook` is a required
|
||||
property when `environment == "prod"`). `contract_resolver.py` raises
|
||||
`jsonschema.ValidationError` (not a generic ValueError). **Handled.**
|
||||
- **IR instance with a resource type not in `TYPE_MAP` (e.g.
|
||||
`aws:ec2:instance`):** the adapter raises
|
||||
`ValueError("unknown IR type 'aws:ec2:instance' (adapter spike handles
|
||||
aws:s3:bucket only)")`. **Handled.**
|
||||
- **Confidence signal gets a critical-fail `PolicyCheckResult`:** hard-overrides
|
||||
to `score=0.0`, `band=block`, `reasonCodes=['CRITICAL_OVERRIDE:...']`. The
|
||||
short-circuit returns BEFORE the score clamp. **Handled.**
|
||||
- **Outbox write fails (DynamoDB unreachable):** `outbox_writer.py` raises
|
||||
(boto3 `put_item` propagates the exception); `run_spike_e2e.sh` line 93 uses
|
||||
`|| fail "outbox write failed"` → exit 1. **Handled (no silent success).**
|
||||
- **Missing confidence input (e.g. `nfrs` absent):** `compute()` returns
|
||||
`Signal(0.0, "block", {}, ["INPUT_MISSING:nfrs"])`. **Handled.**
|
||||
|
||||
### Verdict: PASS — no issues.
|
||||
|
||||
---
|
||||
|
||||
## P0 / P1 / P2 Summary
|
||||
|
||||
| Severity | Count | Action |
|
||||
|-----------|-------|--------|
|
||||
| **P0** | 0 | none (no auto-fix needed) |
|
||||
| **P1** | 1 | P1-1 (carried-forward): two AWS access key IDs in `.ciagent/VERIFY.md` Phase 09 narrative — flagged for post-hoc hygiene redaction; non-blocking |
|
||||
| **P2** | 0 | none |
|
||||
|
||||
---
|
||||
|
||||
## Milestone verdict
|
||||
|
||||
**v1.1 milestone: READY TO SHIP**
|
||||
|
||||
- 0 P0 issues (no blocking fixes).
|
||||
- 1 P1 carried-forward (non-blocking; flagged for post-hoc review).
|
||||
- All 5 lenses pass. REQ-16..28 satisfied. The IR commitments hold (REQ-28).
|
||||
- Ready for the COMPLETE gate → ship `v1.2.0` → audit.
|
||||
+88
-7
@@ -3,7 +3,8 @@
|
||||
## Overview
|
||||
|
||||
- **v1.0 (demo):** complete — tag `v1.1.0`, 2026-07-21. All 5 phases shipped + audited PASS.
|
||||
- **v1.1 (active):** architecture finalization + v1 spike. 5 phases (06–10).
|
||||
- **v1.1 (complete):** architecture finalization + v1 spike. 5 phases (06–10). Tag `v1.2.0`, 2026-07-21. All 5 phases shipped + verified; review READY TO SHIP (0 P0); audit CLEAN. Gitea release id 202.
|
||||
- **v1.2 (active):** platform hardening + first real consumer deployment. 6 phases (11–16). Ship tag `v1.3.0`.
|
||||
- **v1.0 demo URL:** https://git.cloudinit.dev/continuous-intelligence/acdl-evidence/raw/branch/main/index.html
|
||||
|
||||
---
|
||||
@@ -71,12 +72,15 @@ phase produced a runnable increment and ended with a phase-completion commit
|
||||
|
||||
---
|
||||
|
||||
## v1.1 (Active — architecture finalization + v1 spike)
|
||||
## v1.1 (Complete — architecture finalization + v1 spike, 2026-07-21, tag `v1.2.0`)
|
||||
|
||||
Five-phase breakdown to finalize the architecture to v1.0 and prove the
|
||||
locked commitments with one end-to-end implementation spike. Milestone
|
||||
`v1.1-spike` covers the real platform's first materialization. Ship tag at
|
||||
milestone COMPLETE: `v1.2.0` (feature milestone, next minor per ship.md).
|
||||
`v1.1-spike` covered the real platform's first materialization. Ship tag
|
||||
at milestone COMPLETE: **`v1.2.0`** (feature milestone, next minor per
|
||||
ship.md). **Status: COMPLETE — all 5 phases shipped (v1.1.1..v1.1.5) +
|
||||
verified; review READY TO SHIP (0 P0); audit CLEAN; Gitea release id 202.
|
||||
D-034 closed (root key deactivated by user).**
|
||||
|
||||
### Phase 06 — archive-demo-and-reorient
|
||||
- **Description:** Move the v1.0 demo (`modules/`, `scripts/`, `evidence-ui/`, `contracts/`, demo `.gitea/workflows/`) to `demo/`. Establish the new repo layout (`platform/`, `schemas/`, `adapters/`, `terraform/`, `modules-ir/`). Rewrite README to reflect the real platform. Verify the demo still runs from `demo/` (regression check).
|
||||
@@ -112,7 +116,7 @@ milestone COMPLETE: `v1.2.0` (feature milestone, next minor per ship.md).
|
||||
|
||||
### Phase 09 — v1-spike-ir-and-l1-and-adapter
|
||||
- **Description:** Implement the Target Stack IR, one real L1 `l1-s3` (IR-typed interface, registered), and the Terraform adapter that compiles the IR → Terraform `variable`/`output` + root module and emits a real `terraform plan` against AWS (via the rotated-key secret per D-039; OIDC is v1.2). State in S3 + DynamoDB.
|
||||
- **Status:** pending
|
||||
- **Status:** complete (v1.1.4)
|
||||
- **Depends on:** [08]
|
||||
- **Requirements:** REQ-24, REQ-26
|
||||
- **Success Criteria:**
|
||||
@@ -122,7 +126,7 @@ milestone COMPLETE: `v1.2.0` (feature milestone, next minor per ship.md).
|
||||
|
||||
### Phase 10 — v1-spike-l2-and-contract-e2e
|
||||
- **Description:** Implement `l2-static-asset` (thin-composition referencing `l1-s3`), the contract schema + contract→IR resolution, and one end-to-end contract submission (`contracts/spike.yaml` for `l2-static-asset`) flowing through schema validation → IR resolution → `terraform plan` → Checkov `PolicyCheckResult` → confidence signal → evidence event to the DynamoDB outbox. Verify the IR commitments hold (no polyglot mess).
|
||||
- **Status:** pending
|
||||
- **Status:** complete (v1.1.5)
|
||||
- **Depends on:** [09]
|
||||
- **Requirements:** REQ-25, REQ-27, REQ-28
|
||||
- **Success Criteria:**
|
||||
@@ -131,4 +135,81 @@ milestone COMPLETE: `v1.2.0` (feature milestone, next minor per ship.md).
|
||||
- `scripts/verify_phase10.sh` proves the adapter is the only substrate-specific code.
|
||||
- Evidence event is written to the DynamoDB outbox.
|
||||
|
||||
After Phase 10: COMPLETE gate — review → ship `v1.2.0` → audit.
|
||||
After Phase 10: COMPLETE gate — review → ship `v1.2.0` → audit. **DONE.**
|
||||
|
||||
---
|
||||
|
||||
## v1.2 (Active — platform hardening + first real consumer deployment)
|
||||
|
||||
Six-phase breakdown to harden the v1.1 spike, simplify the setup, update
|
||||
the docs, and prove the platform delivers real value by deploying a basic
|
||||
microservice to AWS ECS Fargate end-to-end. Ship tag at milestone COMPLETE:
|
||||
**`v1.3.0`** (feature milestone, next minor per ship.md — v1.1 shipped
|
||||
`v1.2.0`). Phase patches `v1.2.1`..`v1.2.6`.
|
||||
|
||||
### Phase 11 — v1.2-research-and-readme
|
||||
- **Description:** Re-evaluate go-gitea/gitea#36988 (OIDC for Gitea Actions) — confirm still open (re-checked 2026-07-21: open, last updated 2026-05-27, not merged) and record the decision to extend D-039 as D-047. Audit the v1.1 spike for NFR gaps (least-privilege IAM, idempotency, error handling, rotation hygiene) and simplification opportunities (script consolidation, dead code, stale paths). Rewrite `README.md` to reflect v1.1 complete + the actual spike flow + how to run + the real repo layout + the v1.2 objective.
|
||||
- **Status:** complete (v1.2.1)
|
||||
- **Depends on:** —
|
||||
- **Requirements:** REQ-29
|
||||
- **Success Criteria:**
|
||||
- `RESEARCH.md` has a v1.2 addendum with the #36988 re-check + NFR audit + simplification findings.
|
||||
- `README.md` reflects v1.1 complete; documents the spike flow, `scripts/run_platform.sh`, the repo layout, and the v1.2 objective; no stale "v1.1 (active)" framing.
|
||||
- D-047 is recorded in `PROJECT.md`.
|
||||
|
||||
### Phase 12 — nfr-harden-and-simplify
|
||||
- **Description:** Apply Phase 11's findings. Tighten `terraform/bootstrap/spike_runner_policy.json` to least-privilege (add ECS + ECR + ELB + IAM plan-only permissions for v1.2; audit for wildcards). Make `create_state_backend.py` and `create_iam_user.py` idempotent. Consolidate `run_spike_plan.sh` + `run_spike_e2e.sh` into a single `scripts/run_platform.sh` with proper exit codes and error handling. Redact P1-1 (the two AWS access key IDs in `.ciagent/VERIFY.md` Phase 09 narrative). Fix any remaining stale `platform/` paths in `.ciagent/`. The v1.1 spike still runs e2e after the refactor.
|
||||
- **Status:** complete (v1.2.2)
|
||||
- **Depends on:** [11]
|
||||
- **Requirements:** REQ-30
|
||||
- **Success Criteria:**
|
||||
- `scripts/run_platform.sh` runs the full v1.1 spike e2e and exits 0.
|
||||
- `create_state_backend.py` / `create_iam_user.py` re-runs are idempotent (no duplicate resources; exit 0).
|
||||
- `spike_runner_policy.json` passes a least-privilege audit (no `*` actions beyond documented exceptions).
|
||||
- `.ciagent/VERIFY.md` Phase 09 narrative has no live AWS access key IDs.
|
||||
- No stale `platform/` paths remain in `.ciagent/`.
|
||||
|
||||
### Phase 13 — l1-catalog-for-ecs
|
||||
- **Description:** Author six IR-typed L1 modules for an ECS Fargate microservice: `l1-vpc` (VPC + subnets + route tables), `l1-ecs-cluster` (ECS Fargate cluster), `l1-ecs-service` (ECS service + task definition), `l1-iam-role` (task execution + task role), `l1-alb` (ALB + listener + target group), `l1-ecr` (ECR repository). Each has an `interface.json` valid against `schemas/ir.schema.json`. Register all six in `modules-ir/registry.json`. Expand the Terraform adapter `TYPE_MAP` to cover the new IR resource types. Each L1 produces a valid `terraform plan` fragment.
|
||||
- **Status:** complete (v1.2.3)
|
||||
- **Depends on:** [12]
|
||||
- **Requirements:** REQ-31
|
||||
- **Success Criteria:**
|
||||
- All six L1s exist under `modules-ir/l1/` with `interface.json` valid against `schemas/ir.schema.json`.
|
||||
- `modules-ir/registry.json` lists all six.
|
||||
- The adapter `TYPE_MAP` covers all six IR resource types.
|
||||
- Each L1 produces a valid `terraform plan` fragment.
|
||||
|
||||
### Phase 14 — l2-microservice-and-contract-schema
|
||||
- **Description:** Author `l2-microservice` thin-composition under `modules-ir/l2/l2-microservice/` referencing the six ECS L1s (depth ≤ 5). Extend `schemas/contract.schema.json` with microservice inputs (`image: string`, `port: integer`, `env: map`, `healthcheck: object`). Verify contract→IR resolution (`acdl_platform/contract_resolver.py`) yields a complete target stack for `l2-microservice`.
|
||||
- **Status:** planned
|
||||
- **Depends on:** [13]
|
||||
- **Requirements:** REQ-32
|
||||
- **Success Criteria:**
|
||||
- `l2-microservice` references the six ECS L1s only (depth ≤ 5).
|
||||
- `schemas/contract.schema.json` validates a `contracts/microservice.yaml` with the new inputs.
|
||||
- Contract→IR resolution yields a complete target stack (all six L1 instances + relationships).
|
||||
|
||||
### Phase 15 — consumer-repo-and-terraform-apply
|
||||
- **Description:** Create a new Gitea repo `acdl-consumer-microservice` under the `continuous-intelligence` org containing a basic HTTP microservice (tiny Python/Go server returning 200), a `Dockerfile`, an ECR push step, and a `contracts/microservice.yaml` submission for `l2-microservice` (dev environment). Lift the platform from `plan` to **`apply`** for the `dev` environment (autonomous per §10, confidence ≥ 0.50, no HITL). Submit the contract → pipeline → IR → plan → apply → a real ECS Fargate service running.
|
||||
- **Status:** planned
|
||||
- **Depends on:** [14]
|
||||
- **Requirements:** REQ-33, REQ-34
|
||||
- **Success Criteria:**
|
||||
- `acdl-consumer-microservice` repo exists under `continuous-intelligence`.
|
||||
- The microservice builds into a Docker image and is pushed to ECR.
|
||||
- `terraform apply` (dev) creates real AWS resources (VPC, ECS cluster, ECR repo, ALB, ECS service).
|
||||
- The apply result is captured in the evidence stream.
|
||||
|
||||
### Phase 16 — v1.2-capstone-e2e
|
||||
- **Description:** End-to-end verification: a consumer commit to `acdl-consumer-microservice` triggers the pipeline → contract→IR resolution → `terraform plan` → `terraform apply` (dev) → a live ECS Fargate service serving HTTP 200 on its ALB → evidence event written to the DynamoDB outbox → the event renders on the `acdl-evidence` timeline. Verify the NFR improvements from Phase 12 hold, the setup is simpler (one `scripts/run_platform.sh`), and the README is accurate. `scripts/verify_phase16.sh` proves the full flow green.
|
||||
- **Status:** planned
|
||||
- **Depends on:** [15]
|
||||
- **Requirements:** REQ-35
|
||||
- **Success Criteria:**
|
||||
- One consumer commit produces a live ECS service serving HTTP 200.
|
||||
- An evidence event for the apply is in the DynamoDB outbox and renders on the timeline.
|
||||
- `scripts/verify_phase16.sh` exits 0.
|
||||
- README accurately documents the v1.2 platform flow.
|
||||
|
||||
After Phase 16: COMPLETE gate — review → ship `v1.3.0` → audit.
|
||||
+72
-495
@@ -1,514 +1,91 @@
|
||||
# Phase 07 — architecture-v1-finalization (v1.1.2) Verification
|
||||
# Phase 14 — l2-microservice-and-contract-schema (v1.2) VERIFY
|
||||
|
||||
Verifying Phase 07 on `main` (HEAD `8723206`, tag `v1.1.2`). Phase branch
|
||||
`phase/07-architecture-v1-finalization` deleted after squash merge.
|
||||
**Verdict: Phase 14: VERIFIED**
|
||||
**Tag: v1.2.4**
|
||||
**Date: 2026-07-21**
|
||||
|
||||
Phase 07 was a **design-authoring phase**: it locked the ACDL architecture
|
||||
to v1.0 by authoring 9 deliverable files (6 REQ-mapped schema/design
|
||||
files + the Checkov adapter + the SoD module + the architecture-v1.0
|
||||
snapshot) that resolve all 11 open decisions in `docs/architecture.md`
|
||||
§13 (W1.A, W1.B, W2.A, W3.D, W3.E, BA.A, BA.B, BA.C, BA.D, BA.E, BA.F +
|
||||
the OpenTofu timing sub-decision Q1.3), recorded in `PROJECT.md` under
|
||||
decisions D-034..D-046.
|
||||
---
|
||||
|
||||
Verification layers: structural, behavioral, security, quality. All
|
||||
layers PASS. Final verdict: **Phase 07: VERIFIED**.
|
||||
## Scope
|
||||
|
||||
## Layer 1 — Structural: PASS
|
||||
Phase 14 authors the `l2-microservice` thin-composition (references 6 ECS
|
||||
L1s, depth 1), extends the contract schema for microservice inputs, extends
|
||||
the resolver for child→child wiring + multi-resource L1 expansion, extends
|
||||
the adapter for `ref:` interpolation translation, and verifies the full
|
||||
resolution path. Requirement covered: **REQ-32**.
|
||||
|
||||
### 1.1 All 9 deliverable files exist
|
||||
## Verification layers
|
||||
|
||||
### 1. Structural
|
||||
|
||||
- `modules-ir/l2/l2-microservice/composition.json` + `README.md` created (6 children, two wire kinds).
|
||||
- `modules-ir/registry.json` lists `l2-microservice@1.0.0`.
|
||||
- `schemas/contract.schema.json` extended: `inputs.additionalProperties` allows `object`; `healthcheck` field added.
|
||||
- `contracts/microservice.yaml` created (dev, l2-microservice, 9 inputs).
|
||||
- `acdl_platform/contract_resolver.py` extended: array-form wires, child→child `ref:` emission, multi-resource L1 expansion.
|
||||
- `adapters/terraform/adapter.py` extended: `ref:<ir_resource_id>.<output>` → `${<tf_type>.<id>.<attr>}` translation.
|
||||
- `scripts/verify_phase14.sh` exists (+x).
|
||||
- `.ciagent/PLAN.md` updated to Phase 14.
|
||||
- **PASS.**
|
||||
|
||||
### 2. Behavioral (`scripts/verify_phase14.sh`)
|
||||
|
||||
```
|
||||
$ ls -la docs/architecture-v1.0.md schemas/ir.schema.json \
|
||||
schemas/policy_check_result.schema.json schemas/contract.schema.json \
|
||||
adapters/terraform/policy/checkov_adapter.py platform/confidence_signal.py \
|
||||
platform/audit_ledger_design.md platform/hitl_matrix_design.md \
|
||||
platform/separation_of_duties.py scripts/verify_phase07.sh
|
||||
-rw-r--r-- 1 root root 30167 Jul 21 18:48 docs/architecture-v1.0.md
|
||||
-rw-r--r-- 1 root root 5538 Jul 21 18:48 schemas/ir.schema.json
|
||||
-rw-r--r-- 1 root root 2484 Jul 21 18:48 schemas/policy_check_result.schema.json
|
||||
-rw-r--r-- 1 root root 3924 Jul 21 18:48 schemas/contract.schema.json
|
||||
-rw-r--r-- 1 root root 3578 Jul 21 18:48 adapters/terraform/policy/checkov_adapter.py
|
||||
-rw-r--r-- 1 root root 5787 Jul 21 18:48 platform/confidence_signal.py
|
||||
-rw-r--r-- 1 root root 5036 Jul 21 18:48 platform/audit_ledger_design.md
|
||||
-rw-r--r-- 1 root root 6321 Jul 21 18:48 platform/hitl_matrix_design.md
|
||||
-rw-r--r-- 1 root root 1835 Jul 21 18:48 platform/separation_of_duties.py
|
||||
-rwxr-xr-x 1 root root 3831 Jul 21 18:48 scripts/verify_phase07.sh
|
||||
=== Phase 14 verification ===
|
||||
composition: OK (6 children)
|
||||
registry: l2-microservice@1.0.0 OK
|
||||
contract schema: OK (inputs allow objects + healthcheck field)
|
||||
microservice.yaml: OK (validates against contract schema)
|
||||
py_compile: OK
|
||||
v1.1 regression: OK (spike.yaml -> l1-s3 -> aws_s3_bucket)
|
||||
v1.2 IR: 11 resources
|
||||
types: ['aws:ec2:routetable', 'aws:ec2:subnet', 'aws:ec2:vpc', 'aws:ecr:repository',
|
||||
'aws:ecs:cluster', 'aws:ecs:service', 'aws:ecs:task_definition',
|
||||
'aws:elbv2:listener', 'aws:elbv2:loadbalancer', 'aws:elbv2:targetgroup',
|
||||
'aws:iam:role']
|
||||
child->child refs: present
|
||||
v1.2 adaptation: OK (11 resources + interpolations in main.tf)
|
||||
.ciagent/ consistency: OK
|
||||
|
||||
=== Phase 14: VERIFIED ===
|
||||
```
|
||||
|
||||
All 9 REQ-mapped files + the verify script are present (sizes non-zero).
|
||||
All assertions pass. The v1.2 resolution emits 11 IR resources (the 6 L1s
|
||||
expand to 11 due to multi-resource L1s: vpc→3, ecs-service→2, alb→3, +
|
||||
3 single-resource L1s). Child→child refs translate to Terraform
|
||||
interpolations (`${aws_ecs_cluster.cluster.arn}`, `${aws_subnet.vpc-subnet.id}`,
|
||||
`${aws_lb_target_group.alb-targetgroup.arn}`). The v1.1 spike regression
|
||||
is byte-identical.
|
||||
- **PASS.**
|
||||
|
||||
### 1.2 `docs/architecture-v1.0.md` status line is v1.0 (not v0.2)
|
||||
### 3. Security
|
||||
|
||||
```
|
||||
$ grep -n "Status:" docs/architecture-v1.0.md | head -3
|
||||
14: Status: **v1.0** (snapshot taken in ACDL Phase 07, milestone v1.1). All 11
|
||||
429: Status: **v1.0**. All 11 open items in §13 are resolved. ...
|
||||
```
|
||||
- No credentials introduced. The `contracts/microservice.yaml` references an ECR image by URL (no secrets).
|
||||
- The `assume_role_policy` in the contract is a standard ECS task execution trust policy (not a secret).
|
||||
- The resolver + adapter handle `ref:` strings as interpolation references — no secret leakage.
|
||||
- **PASS.**
|
||||
|
||||
Status line at L14 says `v1.0` (Phase 07 bump); the upstream `v0.2`
|
||||
status does not survive into the snapshot's status line.
|
||||
### 4. Quality
|
||||
|
||||
### 1.3 All 11 open-decision IDs + Q1.3 appear in the snapshot
|
||||
- The composition's two-wire-kind design (passthrough + child→child) cleanly separates contract-level parameters from infra-internal wiring.
|
||||
- The multi-resource L1 id scheme (`<child_id>-<type_suffix>`) keeps ids valid against the IR schema's `^[a-z][a-z0-9-]*$` pattern.
|
||||
- The `ref:<ir_resource_id>.<output>` form means the adapter needs no child→resource lookup table — just a `type_by_id` map built once.
|
||||
- The v1.1 regression (byte-identical S3 main.tf) confirms the extensions are backward-compatible.
|
||||
- **PASS.**
|
||||
|
||||
```
|
||||
$ grep -cE "W1\.A|W1\.B|W2\.A|W3\.D|W3\.E|BA\.A|BA\.B|BA\.C|BA\.D|BA\.E|BA\.F|Q1\.3" \
|
||||
docs/architecture-v1.0.md
|
||||
33
|
||||
```
|
||||
## P0 / P1
|
||||
|
||||
Every one of the 11 IDs + Q1.3 appears in both the resolution log table
|
||||
(L26–37) and the §13 "✅ RESOLVED (see PROJECT.md)" markers (L75–425).
|
||||
Each row carries the resolution text + a pointer to `PROJECT.md`.
|
||||
- **P0: none.**
|
||||
- **P1: none.**
|
||||
|
||||
### 1.4 `gitea-runner` rename (D-046) applied; `act_runner` only in "formerly" note
|
||||
## Requirements covered
|
||||
|
||||
```
|
||||
$ grep -n "act_runner\|gitea-runner" docs/architecture-v1.0.md
|
||||
9: > `act_runner` → `gitea-runner` rename (D-046, 2026-04 in gitea/runner#850)
|
||||
10: > is applied; `act_runner` appears only in a "formerly" note.
|
||||
352: > gitea-runner v2.1.0 (formerly `act_runner`, renamed 2026-04 in
|
||||
```
|
||||
- **REQ-32:** `l2-microservice` thin-composition exists under `modules-ir/l2/l2-microservice/` referencing the six ECS L1s (depth 1, within max-depth-5). `schemas/contract.schema.json` is extended with microservice inputs (`image: string`, `port: number`, `env: object`, `healthcheck: object`) and validates `contracts/microservice.yaml`. Contract→IR resolution yields a complete target stack (11 resources across all 6 L1s with child→child refs). **VERIFIED.**
|
||||
|
||||
`gitea-runner` is the body name; `act_runner` only appears in the
|
||||
header note + the "formerly" parenthetical at L352. D-046 satisfied.
|
||||
## Conclusion
|
||||
|
||||
### 1.5 §15 table lists all 6 REQ-mapped files
|
||||
|
||||
```
|
||||
$ sed -n '441,455p' docs/architecture-v1.0.md
|
||||
## 15. Phase 07 authored artifacts
|
||||
...
|
||||
| REQ | File | Owner persona |
|
||||
|-----|------|--------------|
|
||||
| REQ-17 | `schemas/ir.schema.json` | platform-engineer |
|
||||
| REQ-18 | `schemas/policy_check_result.schema.json` + `adapters/terraform/policy/checkov_adapter.py` | security-engineer |
|
||||
| REQ-19 | `platform/confidence_signal.py` | backend-engineer + security-engineer (co-authored) |
|
||||
| REQ-20 | `platform/audit_ledger_design.md` | security-engineer |
|
||||
| REQ-21 | `platform/hitl_matrix_design.md` + `platform/separation_of_duties.py` | security-engineer |
|
||||
| REQ-22 | `schemas/contract.schema.json` | backend-engineer |
|
||||
```
|
||||
|
||||
All 6 REQ rows + the 8 underlying files are listed. All §15 files
|
||||
exist on disk (cross-checked with `os.path.exists` for every entry).
|
||||
|
||||
### 1.6 The 3 JSON Schemas declare Draft 2020-12 + required fields
|
||||
|
||||
```
|
||||
$ grep -n '\$schema\|draft/2020-12' schemas/*.schema.json
|
||||
schemas/ir.schema.json:2: "$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||
schemas/policy_check_result.schema.json:2: "$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||
schemas/contract.schema.json:2: "$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||
```
|
||||
|
||||
Per-file required-fields check:
|
||||
|
||||
- `schemas/ir.schema.json`: `required: [version, stack, resources]`;
|
||||
`stack.depth` max 5; `stack.name` pattern `^l[12]-[a-z][a-z0-9-]*$`;
|
||||
`stack.kind` enum `[l1, l2]`; `resource.module` pattern
|
||||
`^l1-[a-z][a-z0-9-]*@\d+\.\d+\.\d+$` (W3.D name@semver); `relationship.kind`
|
||||
enum `[parent, depends_on, uses_output]`; `shared_keyword` reserved
|
||||
(present, unused). ✅
|
||||
- `schemas/policy_check_result.schema.json`: `required: [contractId,
|
||||
evaluatedAt, engine, ruleId, severity, result, message, resourceRef]`;
|
||||
`engine` enum `[checkov, kyverno, opa]`; `severity` enum `[critical,
|
||||
high, medium, low, info]`; `result` enum `[pass, fail, skipped, error]`;
|
||||
`evidence` optional with `additionalProperties: true`. ✅
|
||||
- `schemas/contract.schema.json`: top `required: [stack, environment]`;
|
||||
`stack` pattern `^l2-[a-z][a-z0-9-]*$`; `environment` enum `[dev, qa,
|
||||
prod, dr]` (no `staging`); `profile` enum `[developer, agentic]`
|
||||
default `developer`; `allOf` conditionals present: qa→`[validation]`,
|
||||
prod→`[runbook, dashboard, oncall]`, dr→`[drDrillRef]`,
|
||||
agentic→`[naturalLanguageIntent]`. ✅
|
||||
|
||||
Substrate-agnostic invariant for IR schema: the only occurrence of
|
||||
`aws_s3_bucket` is in the `$comment` (L6) and a `description` (L61)
|
||||
where it is explicitly called out as the *non*-IR / *Terraform* type to
|
||||
avoid. No Terraform-block keywords (`variable`/`output` as JSON keys,
|
||||
`tf_block`) appear in the schema body. Invariant satisfied.
|
||||
|
||||
### 1.7 The 3 .py files have expected module docstrings + public functions
|
||||
|
||||
- `platform/confidence_signal.py` (REQ-19, T-7.9): module docstring
|
||||
(L1–32) enumerates the 6 inputs + weights + severity→penalty +
|
||||
per-env thresholds. Public surface: `WEIGHTS`, `PENALTY`,
|
||||
`THRESHOLDS`, `Signal` dataclass, `_per_input_score`, `compute`,
|
||||
`__main__` CLI. ✅
|
||||
- `platform/separation_of_duties.py` (REQ-21, T-7.8): module docstring
|
||||
(L1–12) explains `qaApprover != prodApprover` + outbox read + spike
|
||||
dev-only note. Public surface: `check(outbox_client, contract_id,
|
||||
current_prod_approver)`, `route_halt_artifact(...)`. ✅
|
||||
- `adapters/terraform/policy/checkov_adapter.py` (REQ-18, T-7.5): module
|
||||
docstring (L1–11) "Translate Checkov JSON output to ACDL
|
||||
PolicyCheckResult records". Public surface: `RULE_MAP`,
|
||||
`_iso8601_now`, `_to_pcr`, `_emit_tag_naming_skipped`, `adapt`,
|
||||
`__main__` CLI. ✅
|
||||
|
||||
### 1.8 History preservation — `docs/architecture-v1.0.md` is a new file
|
||||
|
||||
```
|
||||
$ git log --follow --oneline docs/architecture-v1.0.md
|
||||
92d4535 phase: 7, status: plan-as-execute, persona: lead-developer, task: T-7.1
|
||||
```
|
||||
|
||||
Single creation commit (T-7.1, 92d4535). As expected for a new file —
|
||||
the upstream `docs/architecture.md` (52665b8 → b84a8a2) history is
|
||||
preserved on the upstream file itself; the snapshot is intentionally a
|
||||
new file, not a copy-with-rename.
|
||||
|
||||
### 1.9 Tags v1.1.0, v1.1.1, v1.1.2 all exist
|
||||
|
||||
```
|
||||
$ git tag --list 'v1.1*'
|
||||
v1.1.0
|
||||
v1.1.1
|
||||
v1.1.2
|
||||
```
|
||||
|
||||
## Layer 2 — Behavioral: PASS
|
||||
|
||||
### 2.1 `scripts/verify_phase07.sh` exits 0 with the expected final line
|
||||
|
||||
```
|
||||
$ bash scripts/verify_phase07.sh
|
||||
ok: all 9 deliverable files exist
|
||||
ok: 3 JSON Schemas validate as Draft 2020-12
|
||||
ok: 3 .py files py_compile
|
||||
ok: 3 .md design files non-empty
|
||||
ok: all 11 decision IDs + OpenTofu present in PROJECT.md
|
||||
ok: docs/architecture-v1.0.md status is v1.0
|
||||
ok: D-040..D-044 present in PROJECT.md
|
||||
ok: spike contract validates against contract schema
|
||||
ok: minimal IR validates against IR schema
|
||||
VERIFIED — Phase 07: architecture v1.0 finalized; 6 files authored + 11 decisions resolved
|
||||
|
||||
$ echo $?
|
||||
0
|
||||
```
|
||||
|
||||
All 9 assertions in the script pass; final line matches PLAN.md spec.
|
||||
|
||||
### 2.2 Typecheck gate
|
||||
|
||||
```
|
||||
$ bash -n scripts/verify_phase07.sh && \
|
||||
python3 -m py_compile platform/confidence_signal.py \
|
||||
platform/separation_of_duties.py \
|
||||
adapters/terraform/policy/checkov_adapter.py
|
||||
TYPECHECK_OK
|
||||
```
|
||||
|
||||
`bash -n` (syntax) + `py_compile` (byte-compile) all pass.
|
||||
|
||||
### 2.3 Schema cross-checks (PLAN.md self-verify test instances)
|
||||
|
||||
Run from `/tmp` to avoid the repo `platform/` package shadowing stdlib
|
||||
`platform` (see Layer 3 §3.3):
|
||||
|
||||
```
|
||||
OK: qa without validation fails
|
||||
OK: prod without runbook fails
|
||||
OK: dr without drDrillRef fails
|
||||
OK: agentic without NLI fails
|
||||
OK: agentic with NLI passes
|
||||
OK: staging rejected
|
||||
OK: valid PCR passes
|
||||
ALL_SCHEMA_CROSSCHECKS_OK
|
||||
```
|
||||
|
||||
`environment` enum confirmed `[dev, qa, prod, dr]` — no `staging`
|
||||
(Path A locked, ARCHITECTURE.md §5). Per-env mandatory conditionals all
|
||||
fire correctly.
|
||||
|
||||
### 2.4 Confidence signal behavioral spot-checks (REQ-19)
|
||||
|
||||
Run from `/tmp` with `sys.path.insert(0, '/root/acdl')`:
|
||||
|
||||
- **Missing input → block + INPUT_MISSING:** `compute('cid','dev', inputs)`
|
||||
with `nfrs` omitted returns `Signal(0.0, "block", {}, ["INPUT_MISSING:nfrs"])`. ✅
|
||||
- **Critical fail → 0.0 block + CRITICAL_OVERRIDE:** `compute('cid','dev', inputs)`
|
||||
with one `severity:"critical", result:"fail"` PolicyCheckResult returns
|
||||
`Signal(0.0, "block", per_input, ["CRITICAL_OVERRIDE:CKV_AWS_X"])`
|
||||
regardless of other inputs. ✅
|
||||
- **Cold-start dev → pass ≥ 0.50:** `compute('cid','dev', inputs)` with
|
||||
the ACDL_TAG_NAMING `skipped` PolicyCheckResult + all validation true
|
||||
+ neutral 0.5 for freshness/source/history/nfrs returns
|
||||
`Signal(0.950, "pass", ...)`. ✅ (0.95 ≥ 0.50 dev threshold).
|
||||
|
||||
Note: the `WEIGHTS` dict keys are `policy / validation / freshness /
|
||||
source / history / nfrs` (the canonical names), not the docstring's
|
||||
`policy_results` label — the docstring describes the input's *type*
|
||||
("list[PolicyCheckResult]"); the `compute()` loop iterates
|
||||
`WEIGHTS.items()` and reads `inputs.get("policy")` (the key). This is
|
||||
consistent with the Wave 4 self-verify ("`policy_results`" in the
|
||||
docstring is the descriptive label, `policy` is the dict key — verified
|
||||
at runtime).
|
||||
|
||||
### 2.5 Separation-of-duties behavioral spot-checks (REQ-21)
|
||||
|
||||
- `check(None, "cid", "anyone")` → `(True, "no outbox client (dev-only spike)")`. ✅
|
||||
- `check(stub_returning_None, "cid", "anyone")` → `(True, "no prior approver (first promotion)")`. ✅
|
||||
- `check(stub_with_approver_qa("alice"), "cid", "alice")` → `(False, "SEPARATION_OF_DUTIES_VIOLATION: qaApprover==prodApprover==alice")`. ✅
|
||||
- `check(stub_with_approver_qa("alice"), "cid", "bob")` → `(True, "distinct")`. ✅
|
||||
- `check(stub_with_empty_approver_qa, "cid", "alice")` → `(True, "no QA approver recorded (dev-only spike)")`. ✅
|
||||
|
||||
All SoD branches match PLAN.md T-7.8 spec.
|
||||
|
||||
### 2.6 Checkov adapter behavioral spot-check (REQ-18 adapter)
|
||||
|
||||
Synthetic Checkov JSON with one failed `CKV_AWS_24`:
|
||||
|
||||
```
|
||||
$ python3 adapters/terraform/policy/checkov_adapter.py fixture.json test-contract-id
|
||||
[
|
||||
{
|
||||
"contractId": "test-contract-id",
|
||||
"evaluatedAt": "2026-07-21T18:49:11Z",
|
||||
"engine": "checkov",
|
||||
"ruleId": "CKV_AWS_24",
|
||||
"severity": "medium", ← per RULE_MAP (public-ingress SG 0.0.0.0/0)
|
||||
"result": "fail",
|
||||
"message": "SG 0.0.0.0/0 on 22",
|
||||
"evidence": {"file_path": null, "resource": "aws_security_group.r1",
|
||||
"resource_address": "aws_security_group.r1", "code_block": null},
|
||||
"resourceRef": "aws_security_group.r1"
|
||||
},
|
||||
{
|
||||
"contractId": "test-contract-id",
|
||||
"ruleId": "ACDL_TAG_NAMING", ← D-043 appended SKIPPED record
|
||||
"severity": "info",
|
||||
"result": "skipped",
|
||||
"message": "tag/naming check deferred to v1.2 (D-043)",
|
||||
"evidence": {},
|
||||
"resourceRef": ""
|
||||
}
|
||||
]
|
||||
```
|
||||
|
||||
Severity correctly defaulted to `medium` for `CKV_AWS_24` from `RULE_MAP`;
|
||||
`ACDL_TAG_NAMING` SKIPPED record appended (D-043). Both records validate
|
||||
against `schemas/policy_check_result.schema.json`.
|
||||
|
||||
## Layer 3 — Security: PASS
|
||||
|
||||
### 3.1 No credentials/secrets introduced
|
||||
|
||||
Files touched by Phase 07 (v1.1.1..v1.1.2):
|
||||
|
||||
```
|
||||
$ git log v1.1.1..v1.1.2 --diff-filter=A --name-only --pretty=format: | sort -u
|
||||
.ciagent/PLAN.md
|
||||
.ciagent/REQUIREMENTS.md
|
||||
.ciagent/ROADMAP.md
|
||||
.ciagent/VERIFY.md
|
||||
adapters/terraform/policy/__init__.py
|
||||
adapters/terraform/policy/checkov_adapter.py
|
||||
docs/architecture-v1.0.md
|
||||
platform/__init__.py
|
||||
platform/audit_ledger_design.md
|
||||
platform/confidence_signal.py
|
||||
platform/hitl_matrix_design.md
|
||||
platform/separation_of_duties.py
|
||||
schemas/contract.schema.json
|
||||
schemas/ir.schema.json
|
||||
schemas/policy_check_result.schema.json
|
||||
scripts/verify_phase07.sh
|
||||
```
|
||||
|
||||
No `.env`, no `*.tfstate`, no `*_key*`, no `credentials*` files. Phase 07
|
||||
is design authoring + stdlib-only Python — no AWS/TF runtime calls, no
|
||||
boto3 imports (the spike passes a duck-typed `outbox_client`).
|
||||
|
||||
### 3.2 LSP diagnostic on `platform/confidence_signal.py:148` is a false positive
|
||||
|
||||
```
|
||||
$ python3 -m py_compile platform/confidence_signal.py
|
||||
$ python3 -c "import ast; ast.parse(open('platform/confidence_signal.py').read()); print('AST parse OK')"
|
||||
AST parse OK
|
||||
```
|
||||
|
||||
At L148, `p = PENALTY.get(sev, 0.0)` — `sev` comes from
|
||||
`pcr.get("severity")` where `pcr` is `Dict[str, Any]`. The LSP
|
||||
("No overloads for `get` match the provided arguments") is a known
|
||||
false-positive when `.get()` is called on a `Dict[str, Any]` value
|
||||
in some pyright configurations. `py_compile` passes; runtime behavior
|
||||
is verified correct in §2.4 (the critical-override branch returns the
|
||||
expected `CRITICAL_OVERRIDE:<ruleId>` and the `None` sentinel correctly
|
||||
short-circuits via `if p is None:` at L149). Not a real bug.
|
||||
|
||||
### 3.3 `platform/` package shadows stdlib `platform` — documented + worked around
|
||||
|
||||
The repo's `platform/` Python package (our code) shadows the stdlib
|
||||
`platform` module when the repo root is on `sys.path[0]` (which a
|
||||
`python3 -c` invocation from repo root triggers). `jsonschema` imports
|
||||
`uuid` → `uuid` imports `platform.system()` → fails with
|
||||
`AttributeError: module 'platform' has no attribute 'system'`.
|
||||
|
||||
`scripts/verify_phase07.sh` documents this and works around it by
|
||||
running all `jsonschema`-invoking python from `/tmp` with absolute
|
||||
paths to the schemas:
|
||||
|
||||
```
|
||||
$ grep -n "platform\|cd /tmp\|sys.path\|shadow" scripts/verify_phase07.sh
|
||||
24: # Run python from /tmp so the repo's `platform/` package does not shadow the
|
||||
25: # stdlib `platform` module (jsonschema imports uuid -> platform.system();
|
||||
26: # our platform/ shadows it when cwd is repo root and on sys.path[0]).
|
||||
28: ( cd /tmp && python3 -c "..." )
|
||||
70: ( cd /tmp && python3 -c "..." )
|
||||
78: ( cd /tmp && python3 -c "..." )
|
||||
```
|
||||
|
||||
The workaround is correct: `cwd=/tmp` puts `/tmp` at `sys.path[0]`, so
|
||||
`import platform` resolves to the stdlib, not our package; the schemas
|
||||
are passed by absolute path. The verify script passes (§2.1), and my
|
||||
inline behavioral spot-checks (§2.3–2.5) reproduced the workaround by
|
||||
running from `/tmp` + `sys.path.insert(0, '/root/acdl')` to import our
|
||||
modules explicitly.
|
||||
|
||||
**P1 — flag for post-hoc cleanup:** a v1.2 rename of `platform/` to
|
||||
`acdl_platform/` (or moving the package under a `src/` layout) would
|
||||
avoid the shadowing entirely, removing the need for the `/tmp` dance in
|
||||
every jsonschema-invoking test. This is out of Phase 07 scope (Phase 07
|
||||
must ship the `platform/` layout the README + PLAN.md committed to).
|
||||
Flagged for v1.2.
|
||||
|
||||
### 3.4 No `import boto3` in the Phase 07 .py files
|
||||
|
||||
```
|
||||
$ grep -nE "^import |^from " platform/confidence_signal.py \
|
||||
platform/separation_of_duties.py \
|
||||
adapters/terraform/policy/checkov_adapter.py
|
||||
platform/confidence_signal.py:34: from dataclasses import dataclass, asdict
|
||||
platform/confidence_signal.py:35: from typing import List, Literal, Optional, Dict, Any
|
||||
platform/confidence_signal.py:36: import json
|
||||
platform/confidence_signal.py:37: import sys
|
||||
platform/separation_of_duties.py:14: from typing import Optional, Tuple
|
||||
adapters/terraform/policy/checkov_adapter.py:13: import datetime
|
||||
adapters/terraform/policy/checkov_adapter.py:14: import json
|
||||
adapters/terraform/policy/checkov_adapter.py:15: import sys
|
||||
```
|
||||
|
||||
Stdlib only across all 3 modules. The SoD `check()` signature receives
|
||||
a duck-typed `outbox_client` (has `.get(pk)`); the pipeline step owns the
|
||||
boto3 client. PLAN.md T-7.8 spec satisfied.
|
||||
|
||||
## Layer 4 — Quality: PASS
|
||||
|
||||
### 4.1 README layout table still matches reality
|
||||
|
||||
```
|
||||
$ grep -n "platform/\|schemas/\|adapters/" README.md
|
||||
31: | `platform/` | Platform code: confidence signal, contract resolver, outbox, HITL/ledger designs | Phase 07+ |
|
||||
32: | `schemas/` | JSON Schemas: IR, PolicyCheckResult, contract | Phase 07 |
|
||||
33: | `adapters/` | Substrate adapters (Terraform adapter in v1; the only substrate-specific code per §12) | Phase 09 |
|
||||
```
|
||||
|
||||
README's "Phase 07+" and "Phase 07" annotations are now accurate —
|
||||
`platform/` and `schemas/` are populated with the 9 deliverable files
|
||||
(no longer just `.gitkeep`'d). `adapters/` is annotated "Phase 09"
|
||||
which is also accurate: only the `policy/` subdirectory is populated in
|
||||
Phase 07 (the Checkov adapter, REQ-18), and the rest of the adapter
|
||||
surface (the IR→Terraform module compiler) is Phase 09.
|
||||
|
||||
### 4.2 Phase 07 commit messages all carry `---ci---` blocks
|
||||
|
||||
Phase 07 commits on main (v1.1.1..v1.1.2):
|
||||
|
||||
```
|
||||
8723206 ship: phase-07 architecture-v1-finalization (v1.1.2)
|
||||
412e1ef phase: 7, status: plan-as-execute, persona: lead-developer, task: T-7.10
|
||||
68d90c0 phase: 7, status: plan-as-execute, persona: backend-engineer+security-engineer, task: T-7.9
|
||||
6ed93f0 phase: 7, status: plan-as-execute, persona: security-engineer, task: T-7.4..T-7.8
|
||||
f8e99ed phase: 7, status: plan-as-execute, persona: platform-engineer+backend-engineer, task: T-7.2+T-7.3
|
||||
92d4535 phase: 7, status: plan-as-execute, persona: lead-developer, task: T-7.1
|
||||
b40aadd docs(P07): create Phase 07 plan (architecture-v1-finalization)
|
||||
```
|
||||
|
||||
Each execute commit + the ship commit carries a `---ci---` block with
|
||||
`project / phase / milestone / status / persona / task` (execute commits)
|
||||
or `release.tag` (ship commit). Verified by inspecting commit bodies
|
||||
(`git log v1.1.1..v1.1.2 --pretty=format:'%H %s%n---%n%b%n---'`):
|
||||
T-7.1, T-7.2+7.3, T-7.4..7.8, T-7.9, T-7.10, and the merge all include
|
||||
well-formed `---ci---` blocks. ✅
|
||||
|
||||
### 4.3 `ROADMAP.md` Phase 07 status = "complete (v1.1.2)"
|
||||
|
||||
```
|
||||
$ grep -n "Phase 07\|complete.*v1.1.2\|status" .ciagent/ROADMAP.md | head -5
|
||||
91: ### Phase 07 — architecture-v1-finalization
|
||||
93: - **Status:** complete (v1.1.2)
|
||||
```
|
||||
|
||||
### 4.4 `REQUIREMENTS.md` traceability — REQ-16..22 complete (v1.1.2)
|
||||
|
||||
```
|
||||
$ grep -n "REQ-1[6-9]\|REQ-2[0-2]" .ciagent/REQUIREMENTS.md | tail -7
|
||||
117: | REQ-16 | 07 | complete (v1.1.2) |
|
||||
118: | REQ-17 | 07 | complete (v1.1.2) |
|
||||
119: | REQ-18 | 07 | complete (v1.1.2) |
|
||||
120: | REQ-19 | 07 | complete (v1.1.2) |
|
||||
121: | REQ-20 | 07 | complete (v1.1.2) |
|
||||
122: | REQ-21 | 07 | complete (v1.1.2) |
|
||||
123: | REQ-22 | 07 | complete (v1.1.2) |
|
||||
```
|
||||
|
||||
All 7 Phase 07 requirements marked complete at v1.1.2.
|
||||
|
||||
### 4.5 `docs/architecture-v1.0.md` internal consistency
|
||||
|
||||
- The §15 table's 6 files (8 underlying paths) all exist on disk
|
||||
(verified via `os.path.exists` for every entry). ✅
|
||||
- The 11 resolutions in the §13 markers (L75–425) match the
|
||||
`PROJECT.md` "Open-decision resolutions" table (L178–189) verbatim
|
||||
(W1.A, W1.B, W2.A, W3.D, W3.E, BA.A, BA.B, BA.C, BA.D, BA.E, BA.F) +
|
||||
the Q1.3-OpenTofu sub-decision. ✅
|
||||
- Decisions D-034..D-046 all present in `PROJECT.md` (the decision
|
||||
table at L160–172). ✅
|
||||
|
||||
## Issues found
|
||||
|
||||
### P0 (blocking) — none
|
||||
|
||||
No P0 issues. All must-haves from PLAN.md are satisfied; the phase gate
|
||||
`scripts/verify_phase07.sh` is green; behavioral spot-checks all pass.
|
||||
|
||||
### P1 (post-hoc cleanup, out of Phase 07 scope)
|
||||
|
||||
- **P1-1: `platform/` package shadows stdlib `platform`.** The repo's
|
||||
`platform/` directory is a Python package that shadows the stdlib
|
||||
`platform` module when the repo root is on `sys.path` (any `python3 -c`
|
||||
from repo root). This breaks `jsonschema` (which imports `uuid` →
|
||||
`platform.system()`). `scripts/verify_phase07.sh` works around it by
|
||||
running jsonschema-invoking python from `/tmp`, but the workaround is
|
||||
brittle — every future test script that imports `jsonschema` (or any
|
||||
stdlib module that transitively imports `platform`) from repo root
|
||||
will hit the same shadow. Recommended v1.2 fix: rename `platform/` →
|
||||
`acdl_platform/` (or adopt a `src/` layout) so the package no longer
|
||||
collides with the stdlib name. Out of Phase 07 scope (the layout is
|
||||
locked by Phase 06 + README + PLAN.md).
|
||||
|
||||
- **P1-2: LSP false positive on `platform/confidence_signal.py:148`.**
|
||||
The "No overloads for `get` match the provided arguments" diagnostic
|
||||
is a pyright false positive triggered by `Dict[str, Any]` typing on
|
||||
`pcr`. `py_compile` passes; runtime behavior is correct (verified in
|
||||
§2.4). No fix needed in Phase 07; if a v1.2 type tightening pass
|
||||
happens, replacing `Dict[str, Any]` with a `TypedDict` for
|
||||
`PolicyCheckResult` would silence the LSP and improve type safety.
|
||||
|
||||
## Requirement coverage summary
|
||||
|
||||
| REQ | File(s) | Status |
|
||||
|-----|---------|--------|
|
||||
| REQ-16 | `docs/architecture-v1.0.md` | covered (v1.1.2) |
|
||||
| REQ-17 | `schemas/ir.schema.json` | covered (v1.1.2) |
|
||||
| REQ-18 | `schemas/policy_check_result.schema.json` + `adapters/terraform/policy/checkov_adapter.py` | covered (v1.1.2) |
|
||||
| REQ-19 | `platform/confidence_signal.py` | covered (v1.1.2) |
|
||||
| REQ-20 | `platform/audit_ledger_design.md` | covered (v1.1.2) |
|
||||
| REQ-21 | `platform/hitl_matrix_design.md` + `platform/separation_of_duties.py` | covered (v1.1.2) |
|
||||
| REQ-22 | `schemas/contract.schema.json` | covered (v1.1.2) |
|
||||
|
||||
All 7 Phase 07 requirements covered. No partials.
|
||||
|
||||
## Final verdict
|
||||
|
||||
Phase 07: VERIFIED
|
||||
Phase 14 is VERIFIED. The `l2-microservice` composition + extended
|
||||
resolver + extended adapter are ready for Phase 15's `terraform apply`
|
||||
against real AWS. The resolution path is complete: contract → IR (11
|
||||
resources) → Terraform (11 resource blocks + interpolations). The v1.1
|
||||
spike regression passes.
|
||||
@@ -4,7 +4,7 @@
|
||||
{
|
||||
"slug": "acdl",
|
||||
"name": "Agentic Cloud Delivery Platform",
|
||||
"milestone": "v1.1",
|
||||
"milestone": "v1.2",
|
||||
"status": "specify"
|
||||
}
|
||||
],
|
||||
|
||||
+5
-1
@@ -9,4 +9,8 @@ audit.json
|
||||
.DS_Store
|
||||
runner-data/
|
||||
.env.secrets
|
||||
terraform/bootstrap/.bootstrap_state.json
|
||||
terraform/bootstrap/.bootstrap_state.json
|
||||
terraform/spike/.terraform/
|
||||
terraform/spike/.terraform.lock.hcl
|
||||
terraform/spike/tfplan
|
||||
terraform/spike/*.tfstate*
|
||||
@@ -8,45 +8,159 @@ a production deployment by declaring intent, without authoring a workflow,
|
||||
a configuration file, or a Terraform module.
|
||||
|
||||
- **Vision** (the why): [`docs/vision.md`](docs/vision.md)
|
||||
- **Architecture** (the how): [`docs/architecture.md`](docs/architecture.md)
|
||||
- **Architecture** (the how): [`docs/architecture.md`](docs/architecture.md) + [`.ciagent/ARCHITECTURE.md`](.ciagent/ARCHITECTURE.md)
|
||||
- **Decisions**: [`.ciagent/PROJECT.md`](.ciagent/PROJECT.md)
|
||||
- **Target architecture**: [`.ciagent/ARCHITECTURE.md`](.ciagent/ARCHITECTURE.md)
|
||||
- **Phase plan**: [`.ciagent/ROADMAP.md`](.ciagent/ROADMAP.md)
|
||||
|
||||
## Status
|
||||
|
||||
- **v1.1 (active):** architecture finalization + v1 spike. Finalize the
|
||||
architecture to v1.0 (resolve the 11 open design decisions) and prove the
|
||||
locked commitments with one end-to-end implementation spike
|
||||
- **v1.2 (active):** platform hardening + first real consumer deployment.
|
||||
Harden the v1.1 spike's NFRs, simplify the setup, rewrite the docs, and
|
||||
prove the platform delivers real value by deploying a basic microservice
|
||||
to AWS ECS Fargate end-to-end (`terraform apply`, dev autonomous). Ship
|
||||
tag `v1.3.0`.
|
||||
- **v1.1 (complete, tag `v1.2.0`):** architecture finalization + v1 spike.
|
||||
Finalized the architecture to v1.0 (resolved all 11 open design
|
||||
decisions) and proved the IR commitments hold with one end-to-end spike
|
||||
(`l1-s3` + `l2-static-asset` + Terraform adapter → real `terraform plan`
|
||||
against AWS).
|
||||
- **v1.0 demo (complete, archived):** tag `v1.1.0`. The 30-minute
|
||||
stub-driven executive demo is preserved under `demo/` as the intent
|
||||
reference; it is not the platform.
|
||||
against AWS). Gitea release id 202.
|
||||
- **v1.0 demo (complete, archived under `demo/`, tag `v1.1.0`):** the
|
||||
30-minute stub-driven executive demo. Preserved as the intent reference;
|
||||
it is not the platform.
|
||||
|
||||
## Repository layout
|
||||
## How the platform works
|
||||
|
||||
| Path | Purpose | Populated |
|
||||
|------|---------|-----------|
|
||||
| `acdl_platform/` | Platform code: confidence signal, contract resolver, outbox, HITL/ledger designs (renamed from `platform/` in Phase 08 to avoid shadowing the stdlib `platform` module) | Phase 07+ |
|
||||
| `schemas/` | JSON Schemas: IR, PolicyCheckResult, contract | Phase 07 |
|
||||
| `adapters/` | Substrate adapters (Terraform adapter in v1; the only substrate-specific code per §12) | Phase 09 |
|
||||
| `terraform/` | State backend + provider config (S3 state + DynamoDB lock) | Phase 08+ |
|
||||
| `modules-ir/` | IR-typed L1/L2 modules (`l1-s3`, `l2-static-asset`) | Phase 09–10 |
|
||||
| `scripts/` | v1.1 verify scripts (`verify_phaseNN.sh`) | Phase 06+ |
|
||||
| `demo/` | Archived v1.0 executive demo (tag `v1.1.0`); runs locally via `demo/scripts/run_demo.sh --no-upload` | complete |
|
||||
| `.ciagent/` | CIAgent metadata (plans, decisions, personas, roadmap, research) | active |
|
||||
| `docs/` | Upstream vision + architecture sources | active |
|
||||
The platform is **four layers + six cross-cutting concerns**, bound by the
|
||||
vision's "Two Consumer Surfaces, One Platform" tenet: technical developers
|
||||
(L3A) and non-technical consumers (L3B) converge on the same contract
|
||||
schema, the same policy envelope, and the same evidence stream.
|
||||
|
||||
## Running the archived demo
|
||||
### The v1.1 spike flow (end-to-end)
|
||||
|
||||
The v1.0 demo is an archived artifact. To re-run it locally:
|
||||
```
|
||||
contracts/spike.yaml
|
||||
│ (contract schema validation)
|
||||
▼
|
||||
acdl_platform/contract_resolver.py ──▶ Target Stack IR (JSON)
|
||||
│ (IR schema validation)
|
||||
▼
|
||||
adapters/terraform/adapter.py ──▶ terraform/spike/{main,terraform,providers}.tf
|
||||
│ (the only substrate-specific code)
|
||||
▼
|
||||
terraform plan (real AWS, via the rotated spike key — D-039/D-047)
|
||||
│
|
||||
▼
|
||||
adapters/terraform/policy/checkov_adapter.py ──▶ PolicyCheckResult (JSON list)
|
||||
│ (normalized, engine-agnostic)
|
||||
▼
|
||||
acdl_platform/confidence_signal.py ──▶ { score, band, perInput, reasonCodes }
|
||||
│ (6 inputs: policy, validation, freshness, source, history, nfrs)
|
||||
▼
|
||||
acdl_platform/outbox_writer.py ──▶ DynamoDB outbox (acdl-outbox)
|
||||
│ (hash-chained evidence event)
|
||||
▼
|
||||
acdl-evidence timeline (acdl-evidence repo, raw-file served)
|
||||
```
|
||||
|
||||
The spike validates the architecture's claim that the **IR-shaped
|
||||
commitments do not require a polyglot mess**: the adapter is the only
|
||||
substrate-specific code. `modules-ir/`, `schemas/`, `contracts/`,
|
||||
`acdl_platform/confidence_signal.py`, `acdl_platform/contract_resolver.py`,
|
||||
and `acdl_platform/outbox_writer.py` are all substrate-agnostic (no
|
||||
`aws_s3_bucket` / `aws_` Terraform terms).
|
||||
|
||||
### What's different in v1.2
|
||||
|
||||
v1.2 extends the spike to a real, simpler, better-documented platform that
|
||||
**deploys a microservice to ECS Fargate**:
|
||||
|
||||
- Six new IR-typed L1s: `l1-vpc`, `l1-ecs-cluster`, `l1-ecs-service`,
|
||||
`l1-iam-role`, `l1-alb`, `l1-ecr`.
|
||||
- One new L2 thin-composition: `l2-microservice` (references the six L1s).
|
||||
- `terraform apply` (dev, autonomous per §10, confidence ≥ 0.50) — real
|
||||
provisioning, not just `plan`.
|
||||
- A new consumer repo `acdl-consumer-microservice` with a basic HTTP
|
||||
container + Dockerfile + ECR push + contract submission.
|
||||
- One `scripts/run_platform.sh` (consolidated from the v1.1 spike scripts).
|
||||
- NFR hardening: least-privilege IAM (expanded for ECS), idempotent
|
||||
bootstrap, proper error handling, P1-1 redaction.
|
||||
|
||||
## How to run
|
||||
|
||||
### Prerequisites
|
||||
|
||||
- AWS account + the rotated spike key in `.env.secrets` (see
|
||||
`scripts/rotate_spike_key.sh`; the bootstrap root key was deactivated
|
||||
per D-034 closure).
|
||||
- `terraform` (pin `1.9.*`), `checkov` (pin `>=3.2,<4`), `python3` + `boto3`
|
||||
+ `jsonschema`.
|
||||
|
||||
### Run the platform pipeline end-to-end
|
||||
|
||||
```bash
|
||||
# 1. Bootstrap the AWS state backend + spike IAM user (one-time, idempotent)
|
||||
# (requires the bootstrap root key in env — now deactivated; skip if
|
||||
# the state bucket + acdl-spike-runner already exist)
|
||||
ACDL_BOOTSTRAP_AWS_ACCESS_KEY_ID=... ACDL_BOOTSTRAP_AWS_SECRET_ACCESS_KEY=... \
|
||||
python3 terraform/bootstrap/create_state_backend.py
|
||||
ACDL_BOOTSTRAP_AWS_ACCESS_KEY_ID=... ACDL_BOOTSTRAP_AWS_SECRET_ACCESS_KEY=... \
|
||||
python3 terraform/bootstrap/create_iam_user.py # prints the initial key
|
||||
|
||||
# 2. Rotate the spike key (writes .env.secrets, gitignored)
|
||||
ACDL_BOOTSTRAP_AWS_ACCESS_KEY_ID=... ACDL_BOOTSTRAP_AWS_SECRET_ACCESS_KEY=... \
|
||||
bash scripts/rotate_spike_key.sh
|
||||
|
||||
# 3. Run the full platform pipeline (contract -> IR -> plan -> Checkov ->
|
||||
# confidence -> outbox)
|
||||
bash scripts/run_platform.sh
|
||||
# Expected: "=== PLATFORM E2E OK ==="
|
||||
|
||||
# Or plan-only (contract -> IR -> terraform plan; no Checkov/outbox):
|
||||
bash scripts/run_platform.sh --plan-only
|
||||
```
|
||||
|
||||
### Re-run the archived v1.0 demo (stubs only, no AWS)
|
||||
|
||||
```bash
|
||||
bash demo/scripts/run_demo.sh --no-upload
|
||||
```
|
||||
|
||||
The demo deck is at [`demo/ACDL_DEMO.md`](demo/ACDL_DEMO.md). The demo runs
|
||||
The demo deck is at [`demo/ACDL_DEMO.md`](demo/ACDL_DEMO.md). It runs
|
||||
entirely on local stubs — no AWS, no AI — and shows intent and safety
|
||||
behavior rather than provisioning real cloud resources. It is the reference
|
||||
of intent for the real platform; it is not the platform itself.
|
||||
behavior rather than provisioning real cloud resources.
|
||||
|
||||
## Repository layout
|
||||
|
||||
| Path | Purpose | Status |
|
||||
|------|---------|--------|
|
||||
| `acdl_platform/` | Platform code: confidence signal, contract resolver, outbox writer, HITL/ledger/SoD designs (renamed from `platform/` in Phase 08 to avoid shadowing the stdlib `platform` module) | v1.1 complete; v1.2 extends |
|
||||
| `schemas/` | JSON Schemas: IR, PolicyCheckResult, contract (draft 2020-12) | v1.1 complete; v1.2 extends contract schema |
|
||||
| `adapters/` | Substrate adapters — Terraform adapter (the only substrate-specific code per §12) + Checkov policy adapter | v1.1 complete; v1.2 expands `TYPE_MAP` |
|
||||
| `terraform/` | State backend (S3 + DynamoDB) + spike TF (`terraform/spike/`) + bootstrap scripts (`terraform/bootstrap/`) | v1.1 complete; v1.2 adds ECS apply |
|
||||
| `modules-ir/` | IR-typed L1/L2 modules + `registry.json`. v1.1: `l1-s3`, `l2-static-asset`. v1.2: + 6 ECS L1s, `l2-microservice` | v1.1 complete; v1.2 expands |
|
||||
| `contracts/` | Sample contracts (`spike.yaml` for `l2-static-asset`) | v1.1 complete; v1.2 adds `microservice.yaml` |
|
||||
| `scripts/` | Verify scripts (`verify_phaseNN.sh`), platform run script (`run_platform.sh`; `--plan-only` for plan subset), key rotation | v1.1 complete; v1.2 consolidates |
|
||||
| `demo/` | Archived v1.0 executive demo (tag `v1.1.0`); runs locally via `demo/scripts/run_demo.sh --no-upload` | complete (archived) |
|
||||
| `.ciagent/` | CIAgent metadata (config, project, architecture, requirements, roadmap, personas, plans, research, verify, review, audit) | active |
|
||||
| `docs/` | Upstream vision + architecture sources (`vision.md`, `architecture.md`) | active |
|
||||
|
||||
## Environments
|
||||
|
||||
| Environment | Autonomy | Gate | Status |
|
||||
|---|---|---|---|
|
||||
| dev | Full autonomy (no HITL) | Confidence ≥ 0.50 | v1.1 spike (`plan`); v1.2 (`apply`) |
|
||||
| qa | Held for attestation | QA HITL + confidence ≥ 0.75 | v1.3+ |
|
||||
| prod | Held for attestation | SRE HITL + confidence ≥ 0.90 | v1.3+ |
|
||||
| dr | Held for attestation | SRE HITL + confidence ≥ 0.95 + dr-drill | v1.3+ |
|
||||
|
||||
**Staging does not exist** (Path A locked).
|
||||
|
||||
## Credentials
|
||||
|
||||
**Long-lived AWS credentials are forbidden** (§12.5). The v1.1 spike uses a
|
||||
temporary long-lived key **once** to bootstrap (waiver D-034, now closed —
|
||||
the root key was deactivated by the user), then rotates the spike key
|
||||
per-run via `scripts/rotate_spike_key.sh` (waiver D-039, extended for v1.2
|
||||
as D-047). Real OIDC federation is deferred to v1.3+, blocked on
|
||||
[go-gitea/gitea#36988](https://github.com/go-gitea/gitea/pull/36988) (still
|
||||
open as of 2026-07-21).
|
||||
@@ -0,0 +1,245 @@
|
||||
"""ACDL Contract Resolver — resolve a contract to a Target Stack IR instance.
|
||||
|
||||
ARCHITECTURE.md §12.8: the contract declares intent in IR-typed terms;
|
||||
the resolver resolves the contract to a target stack (list of L1
|
||||
instances + inputs + relationships); the adapter compiles the target
|
||||
stack to a plan.
|
||||
|
||||
Steps:
|
||||
1. Load the contract (YAML -> dict).
|
||||
2. Validate the contract against schemas/contract.schema.json.
|
||||
3. Look up the L2 in modules-ir/registry.json.
|
||||
4. Load the L2's composition.json (the thin-composition tree).
|
||||
5. Map the contract's inputs through the composition's wires to the
|
||||
child L1s' inputs. Two wire kinds:
|
||||
- passthrough: {target, input} (or an array of the same) -> the
|
||||
concrete contract value.
|
||||
- child->child: {target, input, source:"child:<id>.<output>"} ->
|
||||
a "ref:<ir_resource_id>.<output>" string (value known at apply
|
||||
time only).
|
||||
A wire value may be a single object or an array of objects (for
|
||||
contract inputs that fan out to multiple children); both forms are
|
||||
iterated.
|
||||
6. Emit an IR instance {version, stack:{name, kind:l2, depth},
|
||||
resources:[<L1 instances with concrete inputs>], relationships:[...]}.
|
||||
Multi-resource L1s (interface.json has a `resources` array) expand
|
||||
into one IR resource per entry, id `<child_id>-<type_suffix>` where
|
||||
type_suffix is the last IR-type segment with underscores stripped;
|
||||
single-resource L1s keep the child id verbatim.
|
||||
7. Validate the IR instance against schemas/ir.schema.json.
|
||||
|
||||
CLI: contract_resolver.py <contract.yaml> <out_ir.json>
|
||||
"""
|
||||
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
|
||||
import yaml
|
||||
import jsonschema
|
||||
|
||||
|
||||
REPO_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
|
||||
|
||||
def _load_json(path):
|
||||
with open(path, "r") as fh:
|
||||
return json.load(fh)
|
||||
|
||||
|
||||
def _iter_wire_targets(wire_value):
|
||||
"""Yield each target-spec from a wire value (single object or array)."""
|
||||
if isinstance(wire_value, list):
|
||||
for spec in wire_value:
|
||||
yield spec
|
||||
elif isinstance(wire_value, dict):
|
||||
yield wire_value
|
||||
|
||||
|
||||
def _type_suffix(ir_type):
|
||||
"""Last segment of an IR type, underscores stripped (e.g. aws:ec2:vpc -> vpc,
|
||||
aws:elbv2:targetgroup -> targetgroup, aws:ecs:task_definition -> taskdefinition)."""
|
||||
return ir_type.rsplit(":", 1)[-1].replace("_", "")
|
||||
|
||||
|
||||
def _resolve_child_ref(source, child_id, l1_iface, child_ir_ids):
|
||||
"""Resolve a "child:<id>.<output>" source to "ref:<ir_resource_id>.<output>".
|
||||
|
||||
The ir_resource_id is the producing child's sub-resource that
|
||||
declares the output. For single-resource L1s that is the child id;
|
||||
for multi-resource L1s the L1's `resources` array is scanned for
|
||||
which sub-resource declares the output (exact match, then a
|
||||
singular->plural fallback so e.g. `subnet_ids` matches a per-resource
|
||||
`subnet_id`). The ref's output name is the per-resource output name
|
||||
when matched that way, else the source output name verbatim.
|
||||
"""
|
||||
prefix = "child:"
|
||||
if not source.startswith(prefix):
|
||||
raise ValueError(f"unsupported wire source {source!r}")
|
||||
body = source[len(prefix):]
|
||||
src_child_id, src_output = body.split(".", 1)
|
||||
if src_child_id != child_id:
|
||||
# Cross-child reference: look up the producing child's first IR
|
||||
# resource id (the child->child wiring table is keyed by child id
|
||||
# by the caller; this branch is unused for v1.2's wires but kept
|
||||
# for completeness).
|
||||
ir_resource_id = child_ir_ids.get(src_child_id, src_child_id)
|
||||
return f"ref:{ir_resource_id}.{src_output}"
|
||||
# Same-child reference: find the producing sub-resource.
|
||||
resources = l1_iface.get("resources")
|
||||
if not resources:
|
||||
return f"ref:{child_id}.{src_output}"
|
||||
for idx, sub in enumerate(resources):
|
||||
sub_outputs = sub.get("outputs", [])
|
||||
if src_output in sub_outputs:
|
||||
ir_id = child_ir_ids[child_id][idx]
|
||||
return f"ref:{ir_id}.{src_output}"
|
||||
# Singular->plural fallback (subnet_ids -> subnet_id).
|
||||
singular = src_output[:-1] if src_output.endswith("s") else src_output
|
||||
for idx, sub in enumerate(resources):
|
||||
sub_outputs = sub.get("outputs", [])
|
||||
if singular in sub_outputs:
|
||||
ir_id = child_ir_ids[child_id][idx]
|
||||
return f"ref:{ir_id}.{singular}"
|
||||
# No per-resource match: point at the first sub-resource, keep the
|
||||
# source output name verbatim.
|
||||
ir_id = child_ir_ids[child_id][0]
|
||||
return f"ref:{ir_id}.{src_output}"
|
||||
|
||||
|
||||
def resolve(contract_path, repo_root=None):
|
||||
"""Resolve a contract YAML to an IR instance dict."""
|
||||
rr = repo_root or REPO_ROOT
|
||||
|
||||
# 1. Load the contract YAML.
|
||||
with open(contract_path, "r") as fh:
|
||||
contract = yaml.safe_load(fh)
|
||||
|
||||
# 2. Validate the contract against the contract schema.
|
||||
contract_schema = _load_json(os.path.join(rr, "schemas/contract.schema.json"))
|
||||
jsonschema.validate(contract, contract_schema)
|
||||
|
||||
# 3. Look up the L2 in the registry.
|
||||
stack_name = contract["stack"]
|
||||
registry = _load_json(os.path.join(rr, "modules-ir/registry.json"))
|
||||
if stack_name not in registry:
|
||||
raise ValueError(f"stack {stack_name!r} not in registry")
|
||||
versions = registry[stack_name]
|
||||
# Pick the highest 1.x.x (spike: just take the first non-deprecated).
|
||||
entry = next(v for v in versions.values() if not v.get("deprecated", False))
|
||||
|
||||
# 4. Load the L2's composition.json.
|
||||
composition_key = entry.get("composition") or entry.get("interface")
|
||||
composition = _load_json(os.path.join(rr, composition_key))
|
||||
|
||||
# 5. Map the contract's inputs through the wires to the child L1s' inputs.
|
||||
wires = composition.get("wires", {})
|
||||
contract_inputs = contract.get("inputs", {})
|
||||
children = composition.get("children", [])
|
||||
|
||||
# Pre-load every child's L1 interface + compute IR resource ids.
|
||||
child_ifaces = {}
|
||||
child_ir_ids = {}
|
||||
for child in children:
|
||||
child_id = child["id"]
|
||||
child_module = child["module"]
|
||||
l1_name, l1_version = child_module.split("@", 1)
|
||||
l1_entry = registry.get(l1_name, {}).get(l1_version)
|
||||
if not l1_entry:
|
||||
raise ValueError(f"L1 {child_module!r} not in registry")
|
||||
l1_iface = _load_json(os.path.join(rr, l1_entry["interface"]))
|
||||
child_ifaces[child_id] = l1_iface
|
||||
sub_resources = l1_iface.get("resources")
|
||||
if sub_resources:
|
||||
child_ir_ids[child_id] = [
|
||||
f"{child_id}-{_type_suffix(sub['type'])}" for sub in sub_resources
|
||||
]
|
||||
else:
|
||||
child_ir_ids[child_id] = [child_id]
|
||||
|
||||
# Build each child's mapped inputs (concrete values + ref strings).
|
||||
child_inputs_map = {child["id"]: {} for child in children}
|
||||
for wire_name, wire_value in wires.items():
|
||||
for spec in _iter_wire_targets(wire_value):
|
||||
target = spec.get("target")
|
||||
if target not in child_inputs_map:
|
||||
continue
|
||||
input_name = spec["input"]
|
||||
source = spec.get("source")
|
||||
if source:
|
||||
# Child->child reference: emit a ref string.
|
||||
src_child_id = source[len("child:"):].split(".", 1)[0]
|
||||
child_inputs_map[target][input_name] = _resolve_child_ref(
|
||||
source, src_child_id, child_ifaces[src_child_id], child_ir_ids
|
||||
)
|
||||
else:
|
||||
# Contract->child passthrough.
|
||||
if wire_name in contract_inputs:
|
||||
child_inputs_map[target][input_name] = contract_inputs[wire_name]
|
||||
|
||||
# 6. Emit the IR instance.
|
||||
resources = []
|
||||
relationships = []
|
||||
for child in children:
|
||||
child_id = child["id"]
|
||||
child_module = child["module"]
|
||||
l1_iface = child_ifaces[child_id]
|
||||
l1_outputs = l1_iface.get("outputs", {})
|
||||
child_inputs = child_inputs_map[child_id]
|
||||
sub_resources = l1_iface.get("resources")
|
||||
ir_ids = child_ir_ids[child_id]
|
||||
if sub_resources:
|
||||
for idx, sub in enumerate(sub_resources):
|
||||
ir_id = ir_ids[idx]
|
||||
sub_in_names = sub.get("inputs", [])
|
||||
sub_out_names = sub.get("outputs", [])
|
||||
sub_inputs = {
|
||||
n: child_inputs[n] for n in sub_in_names if n in child_inputs
|
||||
}
|
||||
sub_outputs = {
|
||||
n: l1_outputs[n] for n in sub_out_names if n in l1_outputs
|
||||
}
|
||||
resources.append({
|
||||
"id": ir_id,
|
||||
"type": sub["type"],
|
||||
"module": child_module,
|
||||
"inputs": sub_inputs,
|
||||
"outputs": sub_outputs,
|
||||
})
|
||||
relationships.append({"from": "root", "to": ir_id, "kind": "parent"})
|
||||
else:
|
||||
resources.append({
|
||||
"id": child_id,
|
||||
"type": l1_iface["type"],
|
||||
"module": child_module,
|
||||
"inputs": child_inputs,
|
||||
"outputs": l1_outputs,
|
||||
})
|
||||
relationships.append({"from": "root", "to": child_id, "kind": "parent"})
|
||||
|
||||
ir_instance = {
|
||||
"version": "1.0.0",
|
||||
"stack": {
|
||||
"name": composition["name"],
|
||||
"kind": composition["kind"],
|
||||
"depth": composition["depth"],
|
||||
},
|
||||
"resources": resources,
|
||||
"relationships": relationships,
|
||||
}
|
||||
|
||||
# 7. Validate the IR instance against the IR schema.
|
||||
ir_schema = _load_json(os.path.join(rr, "schemas/ir.schema.json"))
|
||||
jsonschema.validate(ir_instance, ir_schema)
|
||||
|
||||
return ir_instance
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
if len(sys.argv) != 3:
|
||||
print("usage: contract_resolver.py <contract.yaml> <out_ir.json>", file=sys.stderr)
|
||||
sys.exit(2)
|
||||
ir = resolve(sys.argv[1])
|
||||
with open(sys.argv[2], "w") as fh:
|
||||
json.dump(ir, fh, indent=2)
|
||||
print(f"resolver: emitted IR to {sys.argv[2]}", file=sys.stderr)
|
||||
@@ -0,0 +1,71 @@
|
||||
"""ACDL Outbox Writer — write an evidence event to the DynamoDB outbox.
|
||||
|
||||
ARCHITECTURE.md §9: DynamoDB outbox, RPO=0 (synchronous write before
|
||||
ack). The event is hash-chained (SHA-256 over canonical JSON); the first
|
||||
event has prev_event_hash="GENESIS". D-P10-3: the spike writes ONE
|
||||
CONFIDENCE_COMPUTED event.
|
||||
|
||||
The outbox table (Phase 08): acdl-outbox, PAY_PER_REQUEST, PK contractId,
|
||||
SK eventType#eventTs, TTL expire_at = now + 365d (D-044).
|
||||
|
||||
CLI: outbox_writer.py <event.json> (uses AWS creds from env)
|
||||
"""
|
||||
|
||||
import datetime
|
||||
import hashlib
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
|
||||
import boto3
|
||||
|
||||
|
||||
OUTBOX_TABLE = "acdl-outbox"
|
||||
REGION = os.environ.get("AWS_DEFAULT_REGION", "us-east-1")
|
||||
|
||||
|
||||
def _canonical_hash(event):
|
||||
"""SHA-256 over canonical JSON (sort_keys, compact separators)."""
|
||||
canonical = json.dumps(event, sort_keys=True, separators=(",", ":"))
|
||||
return hashlib.sha256(canonical.encode("utf-8")).hexdigest()
|
||||
|
||||
|
||||
def write_event(event, outbox_table=OUTBOX_TABLE, region=REGION):
|
||||
"""Write an evidence event to the DynamoDB outbox. Returns the item dict."""
|
||||
contract_id = event["contractId"]
|
||||
event_type = event.get("eventType", "CONFIDENCE_COMPUTED")
|
||||
event_ts = event.get("ts") or datetime.datetime.now(datetime.timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
|
||||
sk = f"{event_type}#{event_ts}"
|
||||
|
||||
# Chain: first event = GENESIS (D-P10-3 spike writes one event).
|
||||
prev_hash = event.get("prev_event_hash", "GENESIS")
|
||||
event_hash = _canonical_hash(event)
|
||||
|
||||
item = {
|
||||
"contractId": {"S": contract_id},
|
||||
"eventType#eventTs": {"S": sk},
|
||||
"payload": {"S": json.dumps(event, sort_keys=True)},
|
||||
"prev_event_hash": {"S": prev_hash},
|
||||
"hash": {"S": event_hash},
|
||||
"environment": {"S": str(event.get("environment", ""))},
|
||||
"stack": {"S": str(event.get("stack", ""))},
|
||||
"score": {"N": str(event.get("score", 0))},
|
||||
"band": {"S": str(event.get("band", ""))},
|
||||
"expire_at": {"N": str(int((datetime.datetime.now(datetime.timezone.utc) +
|
||||
datetime.timedelta(days=365)).timestamp()))},
|
||||
}
|
||||
|
||||
session = boto3.Session(region_name=region)
|
||||
dyn = session.client("dynamodb")
|
||||
dyn.put_item(TableName=outbox_table, Item=item)
|
||||
return item
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
if len(sys.argv) != 2:
|
||||
print("usage: outbox_writer.py <event.json>", file=sys.stderr)
|
||||
sys.exit(2)
|
||||
with open(sys.argv[1], "r") as fh:
|
||||
event = json.load(fh)
|
||||
item = write_event(event)
|
||||
print(json.dumps({k: list(v.values())[0] for k, v in item.items()}, indent=2))
|
||||
@@ -0,0 +1,287 @@
|
||||
"""ACDL Terraform adapter — compile a Target Stack IR instance to Terraform.
|
||||
|
||||
ARCHITECTURE.md §12.2: the adapter translates the IR-typed L1 interface
|
||||
to a Terraform variable/output block, the L2 thin-composition tree to a
|
||||
root module that calls the L1 modules, the IR-typed relationships to
|
||||
Terraform module references, and emits a Terraform plan from the IR.
|
||||
|
||||
The adapter is a THIN LAYER; it does not own L1/L2 content — it only
|
||||
translates. Substrate-agnostic in, Terraform out.
|
||||
|
||||
Phase 09 spike: handled one L1 (l1-s3, IR type aws:s3:bucket).
|
||||
Phase 13: generalized the resource/output emission via TYPE_MAP +
|
||||
INPUT_MAP + OUTPUT_MAP tables; added ECS Fargate IR types. S3 behavior
|
||||
is preserved (regression baseline: modules-ir/l1/l1-s3/spike_instance.json).
|
||||
|
||||
CLI: adapter.py <ir_instance.json> <out_dir>
|
||||
"""
|
||||
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
|
||||
|
||||
# IR type -> Terraform resource type. The only substrate-specific table.
|
||||
# As more L1s land, this grows; the L1 content + IR do not change.
|
||||
TYPE_MAP = {
|
||||
"aws:s3:bucket": "aws_s3_bucket",
|
||||
"aws:ec2:vpc": "aws_vpc",
|
||||
"aws:ec2:subnet": "aws_subnet",
|
||||
"aws:ec2:routetable": "aws_route_table",
|
||||
"aws:ecs:cluster": "aws_ecs_cluster",
|
||||
"aws:ecs:task_definition": "aws_ecs_task_definition",
|
||||
"aws:ecs:service": "aws_ecs_service",
|
||||
"aws:iam:role": "aws_iam_role",
|
||||
"aws:elbv2:loadbalancer": "aws_lb",
|
||||
"aws:elbv2:listener": "aws_lb_listener",
|
||||
"aws:elbv2:targetgroup": "aws_lb_target_group",
|
||||
"aws:ecr:repository": "aws_ecr_repository",
|
||||
}
|
||||
|
||||
# IR input name -> Terraform arg name, per IR type. Only non-identity
|
||||
# mappings are listed; any input not present here uses the IR name as
|
||||
# the Terraform arg name (identity).
|
||||
INPUT_MAP = {
|
||||
"aws:s3:bucket": {"bucket_name": "bucket"},
|
||||
"aws:ec2:vpc": {"cidr": "cidr_block"},
|
||||
"aws:ec2:subnet": {"cidr": "cidr_block", "az": "availability_zone"},
|
||||
"aws:ec2:routetable": {"vpc_id": "vpc_id"},
|
||||
"aws:ecs:cluster": {},
|
||||
"aws:ecs:task_definition": {},
|
||||
"aws:ecs:service": {},
|
||||
"aws:iam:role": {"role_name": "name", "assume_role_policy": "assume_role_policy"},
|
||||
"aws:elbv2:loadbalancer": {"subnets": "subnets", "security_group": "security_groups"},
|
||||
"aws:elbv2:listener": {},
|
||||
"aws:elbv2:targetgroup": {"port": "port", "protocol": "protocol"},
|
||||
"aws:ecr:repository": {},
|
||||
}
|
||||
|
||||
# IR output name -> Terraform attribute name, per IR type. Only
|
||||
# non-identity mappings are listed; any output not present here uses the
|
||||
# IR name as the Terraform attribute name (identity).
|
||||
OUTPUT_MAP = {
|
||||
"aws:s3:bucket": {"bucket_arn": "arn", "bucket_name": "id"},
|
||||
"aws:ec2:vpc": {"vpc_id": "id"},
|
||||
"aws:ec2:subnet": {"subnet_id": "id"},
|
||||
"aws:ec2:routetable": {},
|
||||
"aws:ecs:cluster": {"cluster_arn": "arn", "cluster_id": "id"},
|
||||
"aws:ecs:task_definition": {"task_def_arn": "arn"},
|
||||
"aws:ecs:service": {"service_arn": "id"},
|
||||
"aws:iam:role": {"role_arn": "arn", "role_id": "id"},
|
||||
"aws:elbv2:loadbalancer": {"lb_arn": "id"},
|
||||
"aws:elbv2:listener": {"listener_arn": "id"},
|
||||
"aws:elbv2:targetgroup": {"target_group_arn": "arn"},
|
||||
"aws:ecr:repository": {"repository_arn": "arn"},
|
||||
}
|
||||
|
||||
|
||||
def _tf_value(value):
|
||||
"""Render a Python value as a Terraform expression fragment."""
|
||||
if isinstance(value, bool):
|
||||
return "true" if value else "false"
|
||||
if isinstance(value, (int, float)) and not isinstance(value, bool):
|
||||
return str(value)
|
||||
if isinstance(value, str):
|
||||
if value.startswith("ref:"):
|
||||
raise ValueError("ref: values must be resolved via _ref_expr, not _tf_value")
|
||||
return f'"{value}"'
|
||||
if isinstance(value, (dict, list)):
|
||||
return f"jsonencode({json.dumps(value, sort_keys=True)})"
|
||||
raise ValueError(f"unsupported input value type {type(value).__name__}")
|
||||
|
||||
|
||||
def _ref_expr(ref_value, type_by_id):
|
||||
"""Translate a "ref:<ir_resource_id>.<output>" string to a Terraform
|
||||
interpolation "${<tf_type>.<id>.<attr>}".
|
||||
|
||||
<ir_resource_id> is the IR resource id of the producing resource;
|
||||
<output> is the per-resource output name (e.g. `subnet_id`,
|
||||
`cluster_arn`); the attribute is mapped through OUTPUT_MAP for the
|
||||
referenced resource's IR type. The resolver emits the ref using the
|
||||
IR resource id directly (not the child id), so no child->resource
|
||||
lookup table is needed here.
|
||||
"""
|
||||
body = ref_value[len("ref:"):]
|
||||
rid, out_name = body.split(".", 1)
|
||||
rtype = type_by_id.get(rid)
|
||||
if not rtype:
|
||||
raise ValueError(f"ref to unknown IR resource id {rid!r}")
|
||||
tf_type = TYPE_MAP.get(rtype)
|
||||
if not tf_type:
|
||||
raise ValueError(f"ref target {rid!r} has unknown IR type {rtype!r}")
|
||||
out_map = OUTPUT_MAP.get(rtype, {})
|
||||
tf_attr = out_map.get(out_name, out_name)
|
||||
return f"${{{tf_type}.{rid}.{tf_attr}}}"
|
||||
|
||||
|
||||
def _value_expr(value, type_by_id=None):
|
||||
"""Render a value as a Terraform expression fragment. A "ref:<id>.<output>"
|
||||
string becomes a Terraform interpolation; other values use _tf_value."""
|
||||
if isinstance(value, str) and value.startswith("ref:"):
|
||||
if type_by_id is None:
|
||||
raise ValueError("ref: value encountered without a type_by_id table")
|
||||
return _ref_expr(value, type_by_id)
|
||||
return _tf_value(value)
|
||||
|
||||
|
||||
def _emit_resource(resource, type_by_id=None):
|
||||
rtype = resource["type"]
|
||||
rid = resource["id"]
|
||||
tf_type = TYPE_MAP.get(rtype)
|
||||
if not tf_type:
|
||||
raise ValueError(f"unknown IR type {rtype!r} (adapter TYPE_MAP has no entry)")
|
||||
in_map = INPUT_MAP.get(rtype, {})
|
||||
body = []
|
||||
inputs = resource.get("inputs", {})
|
||||
for in_name, value in inputs.items():
|
||||
if in_name == "region":
|
||||
continue
|
||||
arg = in_map.get(in_name, in_name)
|
||||
if rtype == "aws:ecs:task_definition" and in_name in ("image", "port", "env"):
|
||||
continue
|
||||
if rtype == "aws:iam:role" and in_name == "managed_policies":
|
||||
continue
|
||||
if rtype == "aws:elbv2:loadbalancer" and in_name == "subnets":
|
||||
if isinstance(value, str) and value.startswith("ref:"):
|
||||
body.append(f"subnets = [{_ref_expr(value, type_by_id)}]")
|
||||
else:
|
||||
body.append(f"subnets = [{value}]" if isinstance(value, str) else f"subnets = {_tf_value(value)}")
|
||||
continue
|
||||
if rtype == "aws:elbv2:loadbalancer" and in_name == "security_group":
|
||||
if isinstance(value, str) and value.startswith("ref:"):
|
||||
body.append(f"security_groups = [{_ref_expr(value, type_by_id)}]")
|
||||
else:
|
||||
body.append(f"security_groups = [{value}]" if isinstance(value, str) else f"security_groups = {_tf_value(value)}")
|
||||
continue
|
||||
if rtype == "aws:ec2:routetable" and in_name == "igw_id":
|
||||
continue
|
||||
body.append(f"{arg} = {_value_expr(value, type_by_id)}")
|
||||
nfrs = resource.get("nfrs", {})
|
||||
if isinstance(nfrs, dict) and "versioning" in nfrs and rtype == "aws:s3:bucket":
|
||||
versioning = nfrs.get("versioning", True)
|
||||
body.append("versioning {")
|
||||
body.append(f' enabled = {"true" if versioning else "false"}')
|
||||
body.append("}")
|
||||
elif rtype == "aws:s3:bucket":
|
||||
body.append("versioning {")
|
||||
body.append(" enabled = true")
|
||||
body.append("}")
|
||||
if rtype == "aws:ecs:task_definition":
|
||||
body.append(_container_definitions(inputs))
|
||||
if rtype == "aws:iam:role" and "managed_policies" in inputs:
|
||||
arns = [a.strip() for a in str(inputs["managed_policies"]).split(",") if a.strip()]
|
||||
body.append("managed_policy_arns = " + _tf_value(arns))
|
||||
return _resource_block(rid, tf_type, body)
|
||||
|
||||
|
||||
def _container_definitions(inputs):
|
||||
image = inputs.get("image", "")
|
||||
port = inputs.get("port", 80)
|
||||
env_raw = inputs.get("env")
|
||||
environment = []
|
||||
if isinstance(env_raw, dict):
|
||||
for k, v in env_raw.items():
|
||||
environment.append({"name": k, "value": str(v)})
|
||||
elif isinstance(env_raw, str) and env_raw:
|
||||
try:
|
||||
parsed = json.loads(env_raw)
|
||||
if isinstance(parsed, dict):
|
||||
for k, v in parsed.items():
|
||||
environment.append({"name": k, "value": str(v)})
|
||||
except json.JSONDecodeError:
|
||||
pass
|
||||
container = {
|
||||
"name": "app",
|
||||
"image": image,
|
||||
"essential": True,
|
||||
"portMappings": [{"containerPort": port}],
|
||||
}
|
||||
if environment:
|
||||
container["environment"] = environment
|
||||
return "container_definitions = " + _tf_value([container])
|
||||
|
||||
|
||||
def _resource_block(rid, tf_type, body):
|
||||
"""Emit a top-level resource block."""
|
||||
head = f'resource "{tf_type}" "{rid}" {{'
|
||||
body_str = "\n".join(f" {l}" for l in body)
|
||||
return f"{head}\n{body_str}\n}}\n"
|
||||
|
||||
|
||||
def _emit_output(output_name, value_expr):
|
||||
return f'output "{output_name}" {{\n value = {value_expr}\n}}\n'
|
||||
|
||||
|
||||
def adapt(ir_instance, out_dir):
|
||||
"""Emit main.tf + terraform.tf + providers.tf to out_dir for the IR instance."""
|
||||
os.makedirs(out_dir, exist_ok=True)
|
||||
stack = ir_instance["stack"]
|
||||
resources = ir_instance["resources"]
|
||||
|
||||
# --- providers.tf: aws provider, region from the first resource's inputs.region ---
|
||||
region = "us-east-1"
|
||||
for r in resources:
|
||||
if "region" in r.get("inputs", {}):
|
||||
region = r["inputs"]["region"]
|
||||
break
|
||||
providers_tf = (
|
||||
f'provider "aws" {{\n'
|
||||
f' region = "{region}"\n'
|
||||
f'}}\n'
|
||||
)
|
||||
|
||||
# --- terraform.tf: required_version + required_providers + S3 backend (no DynamoDB lock per D-P09-1) ---
|
||||
# The backend key is derived from the stack name so l1 vs l2 spikes use separate state keys (D-P10-1).
|
||||
stack_name = stack.get("name", "spike")
|
||||
terraform_tf = (
|
||||
'terraform {\n'
|
||||
' required_version = ">= 1.9, < 1.10"\n'
|
||||
' required_providers {\n'
|
||||
' aws = {\n'
|
||||
' source = "hashicorp/aws"\n'
|
||||
' version = "~> 5.0"\n'
|
||||
' }\n'
|
||||
' }\n'
|
||||
' backend "s3" {\n'
|
||||
' bucket = "acdl-tfstate-581513795199-us-east-1"\n'
|
||||
f' key = "spike/{stack_name}/terraform.tfstate"\n'
|
||||
' region = "us-east-1"\n'
|
||||
' }\n'
|
||||
'}\n'
|
||||
)
|
||||
|
||||
# --- main.tf: resources + outputs ---
|
||||
# Build an IR-resource-id -> IR-type table so `ref:` input values can
|
||||
# be resolved to Terraform interpolations without a child->resource
|
||||
# lookup (the resolver emits refs with the IR resource id directly).
|
||||
type_by_id = {r["id"]: r["type"] for r in resources}
|
||||
main_tf_parts = []
|
||||
for r in resources:
|
||||
main_tf_parts.append(_emit_resource(r, type_by_id))
|
||||
rid = r["id"]
|
||||
rtype = r["type"]
|
||||
tf_type = TYPE_MAP.get(rtype)
|
||||
out_map = OUTPUT_MAP.get(rtype, {})
|
||||
outputs = r.get("outputs", {})
|
||||
for out_name in outputs:
|
||||
tf_attr = out_map.get(out_name, out_name)
|
||||
main_tf_parts.append(_emit_output(out_name, f"{tf_type}.{rid}.{tf_attr}"))
|
||||
main_tf = "\n".join(main_tf_parts)
|
||||
|
||||
with open(os.path.join(out_dir, "main.tf"), "w") as fh:
|
||||
fh.write(main_tf)
|
||||
with open(os.path.join(out_dir, "terraform.tf"), "w") as fh:
|
||||
fh.write(terraform_tf)
|
||||
with open(os.path.join(out_dir, "providers.tf"), "w") as fh:
|
||||
fh.write(providers_tf)
|
||||
return out_dir
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
if len(sys.argv) != 3:
|
||||
print("usage: adapter.py <ir_instance.json> <out_dir>", file=sys.stderr)
|
||||
sys.exit(2)
|
||||
with open(sys.argv[1], "r") as fh:
|
||||
ir = json.load(fh)
|
||||
adapt(ir, sys.argv[2])
|
||||
print(f"adapter: emitted terraform to {sys.argv[2]}", file=sys.stderr)
|
||||
@@ -0,0 +1,13 @@
|
||||
stack: l2-microservice
|
||||
environment: dev
|
||||
inputs:
|
||||
name: acdl-microservice
|
||||
cidr: "10.0.0.0/16"
|
||||
azs: "us-east-1a,us-east-1b"
|
||||
image: "581513795199.dkr.ecr.us-east-1.amazonaws.com/acdl-microservice:latest"
|
||||
port: 8080
|
||||
cpu: 256
|
||||
memory: 512
|
||||
role_name: acdl-microservice-exec
|
||||
assume_role_policy: '{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":"ecs-tasks.amazonaws.com"},"Action":"sts:AssumeRole"}]}'
|
||||
managed_policies: "arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy"
|
||||
@@ -0,0 +1,5 @@
|
||||
stack: l2-static-asset
|
||||
environment: dev
|
||||
inputs:
|
||||
bucket_name: acdl-spike-bucket
|
||||
region: us-east-1
|
||||
@@ -0,0 +1,56 @@
|
||||
# l1-alb — Application Load Balancer primitive (multi-resource L1)
|
||||
|
||||
An L1 module for an Application Load Balancer (load balancer + target
|
||||
group + listener). Substrate-agnostic (the IR types are
|
||||
`aws:elbv2:loadbalancer`, `aws:elbv2:listener`, `aws:elbv2:targetgroup`,
|
||||
not Terraform resource types). This is a multi-resource L1: the
|
||||
interface declares the group's inputs/outputs plus a `resources` array
|
||||
listing the IR types it emits. The IR instance (Phase 14/15) will have
|
||||
multiple `resources` entries all with `module: "l1-alb@1.0.0"`.
|
||||
|
||||
## Interface (the IR-typed contract)
|
||||
|
||||
See `interface.json`: inputs `name` (string), `subnets` (string,
|
||||
comma-separated, ref to l1-vpc), `security_group` (string), `port`
|
||||
(number, default 80), `protocol` (string, default "HTTP"), `region`
|
||||
(string); outputs `lb_arn` (arn) + `listener_arn` (arn) +
|
||||
`target_group_arn` (arn); no NFRs.
|
||||
|
||||
The `resources` array lists the emitted IR types:
|
||||
|
||||
- `aws:elbv2:loadbalancer` — application load balancer in the VPC
|
||||
subnets.
|
||||
- `aws:elbv2:targetgroup` — target group for the ECS service tasks.
|
||||
- `aws:elbv2:listener` — listener forwarding the LB port to the target
|
||||
group.
|
||||
|
||||
## IR → Terraform mapping (performed by the adapter)
|
||||
|
||||
The Terraform adapter (`adapters/terraform/adapter.py`) translates each
|
||||
emitted IR resource to Terraform:
|
||||
|
||||
| IR | Terraform |
|
||||
|----|-----------|
|
||||
| `resource.type = aws:elbv2:loadbalancer` | `resource "aws_lb" "<id>" { ... }` |
|
||||
| `resource.inputs.name` | `name = <value>` arg |
|
||||
| `resource.inputs.subnets` | `subnets = [<value>]` arg (comma-split) |
|
||||
| `resource.inputs.security_group` | `security_groups = [<value>]` arg (comma-split) |
|
||||
| `resource.outputs.lb_arn` | `output "lb_arn" { value = aws_lb.<id>.id }` |
|
||||
| `resource.type = aws:elbv2:targetgroup` | `resource "aws_lb_target_group" "<id>" { ... }` |
|
||||
| `resource.inputs.port` | `port = <value>` arg |
|
||||
| `resource.inputs.protocol` | `protocol = <value>` arg |
|
||||
| `resource.outputs.target_group_arn` | `output "target_group_arn" { value = aws_lb_target_group.<id>.arn }` |
|
||||
| `resource.type = aws:elbv2:listener` | `resource "aws_lb_listener" "<id>" { ... }` |
|
||||
| `resource.inputs.lb_arn` | `load_balancer_arn = <value>` arg (identity) |
|
||||
| `resource.inputs.port` | `port = <value>` arg |
|
||||
| `resource.inputs.protocol` | `protocol = <value>` arg |
|
||||
| `resource.outputs.listener_arn` | `output "listener_arn" { value = aws_lb_listener.<id>.id }` |
|
||||
|
||||
The adapter is a thin layer (ARCHITECTURE.md §12.2); it does not own L1
|
||||
content — it only translates.
|
||||
|
||||
## Versioning (W3.D)
|
||||
|
||||
`1.0.0` — interface MAJOR, behavior MINOR, lifecycle PATCH. MAJOR bumps
|
||||
require a new registry entry (immutable publication); old entries enter
|
||||
a 12-month deprecation window.
|
||||
@@ -0,0 +1,76 @@
|
||||
{
|
||||
"name": "l1-alb",
|
||||
"version": "1.0.0",
|
||||
"kind": "l1",
|
||||
"type": "aws:elbv2:loadbalancer",
|
||||
"description": "Application Load Balancer primitive (substrate-agnostic IR types aws:elbv2:loadbalancer + aws:elbv2:listener + aws:elbv2:targetgroup; the Terraform adapter translates to aws_lb/aws_lb_listener/aws_lb_target_group).",
|
||||
"inputs": {
|
||||
"name": {
|
||||
"type": "string",
|
||||
"description": "Name tag for the load balancer and child resources.",
|
||||
"required": true
|
||||
},
|
||||
"subnets": {
|
||||
"type": "string",
|
||||
"description": "Comma-separated subnet ids (ref to l1-vpc).",
|
||||
"required": true
|
||||
},
|
||||
"security_group": {
|
||||
"type": "string",
|
||||
"description": "Security group id for the load balancer.",
|
||||
"required": true
|
||||
},
|
||||
"port": {
|
||||
"type": "number",
|
||||
"description": "Listener port (default 80).",
|
||||
"required": false,
|
||||
"default": 80
|
||||
},
|
||||
"protocol": {
|
||||
"type": "string",
|
||||
"description": "Listener protocol (default HTTP).",
|
||||
"required": false,
|
||||
"default": "HTTP"
|
||||
},
|
||||
"region": {
|
||||
"type": "string",
|
||||
"description": "AWS region the load balancer is created in.",
|
||||
"required": true
|
||||
}
|
||||
},
|
||||
"outputs": {
|
||||
"lb_arn": {
|
||||
"type": "arn",
|
||||
"description": "The load balancer ARN."
|
||||
},
|
||||
"listener_arn": {
|
||||
"type": "arn",
|
||||
"description": "The listener ARN."
|
||||
},
|
||||
"target_group_arn": {
|
||||
"type": "arn",
|
||||
"description": "The target group ARN."
|
||||
}
|
||||
},
|
||||
"nfrs": {},
|
||||
"resources": [
|
||||
{
|
||||
"type": "aws:elbv2:loadbalancer",
|
||||
"description": "Application load balancer in the VPC subnets.",
|
||||
"inputs": ["name", "subnets", "security_group"],
|
||||
"outputs": ["lb_arn"]
|
||||
},
|
||||
{
|
||||
"type": "aws:elbv2:targetgroup",
|
||||
"description": "Target group for the ECS service tasks.",
|
||||
"inputs": ["name", "port", "protocol", "vpc_id"],
|
||||
"outputs": ["target_group_arn"]
|
||||
},
|
||||
{
|
||||
"type": "aws:elbv2:listener",
|
||||
"description": "Listener forwarding the LB port to the target group.",
|
||||
"inputs": ["lb_arn", "port", "protocol", "target_group_arn"],
|
||||
"outputs": ["listener_arn"]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
# l1-ecr — ECR repository primitive
|
||||
|
||||
An L1 module for an ECR repository that hosts the ECS task image.
|
||||
Single-purpose, substrate-agnostic (the IR type is
|
||||
`aws:ecr:repository`, not a Terraform resource type).
|
||||
|
||||
## Interface (the IR-typed contract)
|
||||
|
||||
See `interface.json`: inputs `name` + `region` (strings), outputs
|
||||
`repository_url` (string) + `repository_arn` (arn), no NFRs.
|
||||
|
||||
## IR → Terraform mapping (performed by the adapter)
|
||||
|
||||
The Terraform adapter (`adapters/terraform/adapter.py`) translates this
|
||||
L1's IR shape to Terraform:
|
||||
|
||||
| IR | Terraform |
|
||||
|----|-----------|
|
||||
| `resource.type = aws:ecr:repository` | `resource "aws_ecr_repository" "<id>" { ... }` |
|
||||
| `resource.inputs.name` | `name = <value>` arg |
|
||||
| `resource.inputs.region` | `provider "aws" { region = <value> }` |
|
||||
| `resource.outputs.repository_url` | `output "repository_url" { value = aws_ecr_repository.<id>.repository_url }` |
|
||||
| `resource.outputs.repository_arn` | `output "repository_arn" { value = aws_ecr_repository.<id>.arn }` |
|
||||
|
||||
The adapter is a thin layer (ARCHITECTURE.md §12.2); it does not own L1
|
||||
content — it only translates.
|
||||
|
||||
## Versioning (W3.D)
|
||||
|
||||
`1.0.0` — interface MAJOR, behavior MINOR, lifecycle PATCH. MAJOR bumps
|
||||
require a new registry entry (immutable publication); old entries enter
|
||||
a 12-month deprecation window.
|
||||
@@ -0,0 +1,30 @@
|
||||
{
|
||||
"name": "l1-ecr",
|
||||
"version": "1.0.0",
|
||||
"kind": "l1",
|
||||
"type": "aws:ecr:repository",
|
||||
"description": "ECR repository primitive (substrate-agnostic IR type aws:ecr:repository; the Terraform adapter translates to aws_ecr_repository).",
|
||||
"inputs": {
|
||||
"name": {
|
||||
"type": "string",
|
||||
"description": "The ECR repository name.",
|
||||
"required": true
|
||||
},
|
||||
"region": {
|
||||
"type": "string",
|
||||
"description": "AWS region the repository is created in.",
|
||||
"required": true
|
||||
}
|
||||
},
|
||||
"outputs": {
|
||||
"repository_url": {
|
||||
"type": "string",
|
||||
"description": "The ECR repository URL."
|
||||
},
|
||||
"repository_arn": {
|
||||
"type": "arn",
|
||||
"description": "The ECR repository ARN."
|
||||
}
|
||||
},
|
||||
"nfrs": {}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
# l1-ecs-cluster — ECS Fargate cluster primitive
|
||||
|
||||
An L1 module for an ECS Fargate cluster. Single-purpose,
|
||||
substrate-agnostic (the IR type is `aws:ecs:cluster`, not a Terraform
|
||||
resource type).
|
||||
|
||||
## Interface (the IR-typed contract)
|
||||
|
||||
See `interface.json`: inputs `name` + `region` (strings), outputs
|
||||
`cluster_arn` (arn) + `cluster_id` (string), no NFRs.
|
||||
|
||||
## IR → Terraform mapping (performed by the adapter)
|
||||
|
||||
The Terraform adapter (`adapters/terraform/adapter.py`) translates this
|
||||
L1's IR shape to Terraform:
|
||||
|
||||
| IR | Terraform |
|
||||
|----|-----------|
|
||||
| `resource.type = aws:ecs:cluster` | `resource "aws_ecs_cluster" "<id>" { ... }` |
|
||||
| `resource.inputs.name` | `name = <value>` arg |
|
||||
| `resource.inputs.region` | `provider "aws" { region = <value> }` |
|
||||
| `resource.outputs.cluster_arn` | `output "cluster_arn" { value = aws_ecs_cluster.<id>.arn }` |
|
||||
| `resource.outputs.cluster_id` | `output "cluster_id" { value = aws_ecs_cluster.<id>.id }` |
|
||||
|
||||
The adapter is a thin layer (ARCHITECTURE.md §12.2); it does not own L1
|
||||
content — it only translates.
|
||||
|
||||
## Versioning (W3.D)
|
||||
|
||||
`1.0.0` — interface MAJOR, behavior MINOR, lifecycle PATCH. MAJOR bumps
|
||||
require a new registry entry (immutable publication); old entries enter
|
||||
a 12-month deprecation window.
|
||||
@@ -0,0 +1,30 @@
|
||||
{
|
||||
"name": "l1-ecs-cluster",
|
||||
"version": "1.0.0",
|
||||
"kind": "l1",
|
||||
"type": "aws:ecs:cluster",
|
||||
"description": "ECS Fargate cluster primitive (substrate-agnostic IR type aws:ecs:cluster; the Terraform adapter translates to aws_ecs_cluster).",
|
||||
"inputs": {
|
||||
"name": {
|
||||
"type": "string",
|
||||
"description": "The ECS cluster name.",
|
||||
"required": true
|
||||
},
|
||||
"region": {
|
||||
"type": "string",
|
||||
"description": "AWS region the cluster is created in.",
|
||||
"required": true
|
||||
}
|
||||
},
|
||||
"outputs": {
|
||||
"cluster_arn": {
|
||||
"type": "arn",
|
||||
"description": "The ECS cluster ARN."
|
||||
},
|
||||
"cluster_id": {
|
||||
"type": "string",
|
||||
"description": "The ECS cluster id (name)."
|
||||
}
|
||||
},
|
||||
"nfrs": {}
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
# l1-ecs-service — ECS Fargate service primitive (multi-resource L1)
|
||||
|
||||
An L1 module for an ECS Fargate service (task definition + service).
|
||||
Substrate-agnostic (the IR types are `aws:ecs:task_definition` and
|
||||
`aws:ecs:service`, not Terraform resource types). This is a
|
||||
multi-resource L1: the interface declares the group's inputs/outputs
|
||||
plus a `resources` array listing the IR types it emits. The IR instance
|
||||
(Phase 14/15) will have multiple `resources` entries all with
|
||||
`module: "l1-ecs-service@1.0.0"`.
|
||||
|
||||
## Interface (the IR-typed contract)
|
||||
|
||||
See `interface.json`: inputs `image` (string, ECR image URL), `port`
|
||||
(number), `cpu` (number, default 256), `memory` (number, default 512),
|
||||
`env` (optional JSON map string), `cluster_arn` (arn, ref to
|
||||
l1-ecs-cluster), `subnets` (string, ref to l1-vpc), `security_group`
|
||||
(string), `lb_target_group_arn` (arn, optional, ref to l1-alb), `region`
|
||||
(string); outputs `service_arn` (arn) + `task_def_arn` (arn); no NFRs.
|
||||
|
||||
The `resources` array lists the emitted IR types:
|
||||
|
||||
- `aws:ecs:task_definition` — Fargate task definition. The adapter
|
||||
jsonencodes `image`/`port`/`env` into `container_definitions`.
|
||||
- `aws:ecs:service` — Fargate service running the task definition in the
|
||||
cluster + subnets (+ optional ALB target group wiring).
|
||||
|
||||
## IR → Terraform mapping (performed by the adapter)
|
||||
|
||||
The Terraform adapter (`adapters/terraform/adapter.py`) translates each
|
||||
emitted IR resource to Terraform:
|
||||
|
||||
| IR | Terraform |
|
||||
|----|-----------|
|
||||
| `resource.type = aws:ecs:task_definition` | `resource "aws_ecs_task_definition" "<id>" { ... }` |
|
||||
| `resource.inputs.image` + `port` + `env` | `container_definitions = jsonencode(...)` (adapter-built) |
|
||||
| `resource.inputs.cpu` | `cpu = <value>` arg |
|
||||
| `resource.inputs.memory` | `memory = <value>` arg |
|
||||
| `resource.outputs.task_def_arn` | `output "task_def_arn" { value = aws_ecs_task_definition.<id>.arn }` |
|
||||
| `resource.type = aws:ecs:service` | `resource "aws_ecs_service" "<id>" { ... }` |
|
||||
| `resource.inputs.cluster_arn` | `cluster = <value>` arg (identity) |
|
||||
| `resource.inputs.subnets` | `network_configuration { subnets = [...] }` (emit as-is) |
|
||||
| `resource.inputs.security_group` | `network_configuration { security_groups = [...] }` (emit as-is) |
|
||||
| `resource.inputs.lb_target_group_arn` | `load_balancer { target_group_arn = <value> }` (emit as-is) |
|
||||
| `resource.outputs.service_arn` | `output "service_arn" { value = aws_ecs_service.<id>.id }` |
|
||||
|
||||
The adapter is a thin layer (ARCHITECTURE.md §12.2); it does not own L1
|
||||
content — it only translates. The `container_definitions` JSON is built
|
||||
by the adapter from the IR `image`/`port`/`env` inputs (the one
|
||||
transformation the adapter owns for ECS task definitions).
|
||||
|
||||
## Versioning (W3.D)
|
||||
|
||||
`1.0.0` — interface MAJOR, behavior MINOR, lifecycle PATCH. MAJOR bumps
|
||||
require a new registry entry (immutable publication); old entries enter
|
||||
a 12-month deprecation window.
|
||||
@@ -0,0 +1,86 @@
|
||||
{
|
||||
"name": "l1-ecs-service",
|
||||
"version": "1.0.0",
|
||||
"kind": "l1",
|
||||
"type": "aws:ecs:task_definition",
|
||||
"description": "ECS Fargate service primitive (substrate-agnostic IR types aws:ecs:task_definition + aws:ecs:service; the Terraform adapter translates to aws_ecs_task_definition/aws_ecs_service).",
|
||||
"inputs": {
|
||||
"image": {
|
||||
"type": "string",
|
||||
"description": "ECR image URL for the task container.",
|
||||
"required": true
|
||||
},
|
||||
"port": {
|
||||
"type": "number",
|
||||
"description": "Container port the service listens on.",
|
||||
"required": true
|
||||
},
|
||||
"cpu": {
|
||||
"type": "number",
|
||||
"description": "Task CPU units (Fargate).",
|
||||
"required": false,
|
||||
"default": 256
|
||||
},
|
||||
"memory": {
|
||||
"type": "number",
|
||||
"description": "Task memory (MiB, Fargate).",
|
||||
"required": false,
|
||||
"default": 512
|
||||
},
|
||||
"env": {
|
||||
"type": "string",
|
||||
"description": "Environment variables as a JSON map string (optional).",
|
||||
"required": false
|
||||
},
|
||||
"cluster_arn": {
|
||||
"type": "arn",
|
||||
"description": "ECS cluster ARN (ref to l1-ecs-cluster).",
|
||||
"required": true
|
||||
},
|
||||
"subnets": {
|
||||
"type": "string",
|
||||
"description": "Comma-separated subnet ids (ref to l1-vpc).",
|
||||
"required": true
|
||||
},
|
||||
"security_group": {
|
||||
"type": "string",
|
||||
"description": "Security group id for the service ENIs.",
|
||||
"required": true
|
||||
},
|
||||
"lb_target_group_arn": {
|
||||
"type": "arn",
|
||||
"description": "Optional ALB target group ARN (ref to l1-alb).",
|
||||
"required": false
|
||||
},
|
||||
"region": {
|
||||
"type": "string",
|
||||
"description": "AWS region the service is created in.",
|
||||
"required": true
|
||||
}
|
||||
},
|
||||
"outputs": {
|
||||
"service_arn": {
|
||||
"type": "arn",
|
||||
"description": "The ECS service ARN."
|
||||
},
|
||||
"task_def_arn": {
|
||||
"type": "arn",
|
||||
"description": "The ECS task definition ARN."
|
||||
}
|
||||
},
|
||||
"nfrs": {},
|
||||
"resources": [
|
||||
{
|
||||
"type": "aws:ecs:task_definition",
|
||||
"description": "Fargate task definition; the adapter jsonencodes image/port/env into container_definitions.",
|
||||
"inputs": ["image", "port", "cpu", "memory", "env"],
|
||||
"outputs": ["task_def_arn"]
|
||||
},
|
||||
{
|
||||
"type": "aws:ecs:service",
|
||||
"description": "Fargate service running the task definition in the cluster + subnets.",
|
||||
"inputs": ["cluster_arn", "subnets", "security_group", "lb_target_group_arn", "port"],
|
||||
"outputs": ["service_arn"]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
# l1-iam-role — IAM role primitive
|
||||
|
||||
An L1 module for an IAM role (used as the ECS task execution role).
|
||||
Single-purpose, substrate-agnostic (the IR type is `aws:iam:role`, not a
|
||||
Terraform resource type).
|
||||
|
||||
## Interface (the IR-typed contract)
|
||||
|
||||
See `interface.json`: inputs `role_name` (string), `assume_role_policy`
|
||||
(JSON string), `managed_policies` (optional comma-separated ARNs),
|
||||
`region` (string); outputs `role_arn` (arn) + `role_id` (string), no
|
||||
NFRs.
|
||||
|
||||
## IR → Terraform mapping (performed by the adapter)
|
||||
|
||||
The Terraform adapter (`adapters/terraform/adapter.py`) translates this
|
||||
L1's IR shape to Terraform:
|
||||
|
||||
| IR | Terraform |
|
||||
|----|-----------|
|
||||
| `resource.type = aws:iam:role` | `resource "aws_iam_role" "<id>" { ... }` |
|
||||
| `resource.inputs.role_name` | `name = <value>` arg |
|
||||
| `resource.inputs.assume_role_policy` | `assume_role_policy = <value>` arg (JSON string) |
|
||||
| `resource.inputs.managed_policies` | `managed_policy_arns = [<arns>]` arg (comma-split) |
|
||||
| `resource.inputs.region` | `provider "aws" { region = <value> }` |
|
||||
| `resource.outputs.role_arn` | `output "role_arn" { value = aws_iam_role.<id>.arn }` |
|
||||
| `resource.outputs.role_id` | `output "role_id" { value = aws_iam_role.<id>.id }` |
|
||||
|
||||
The adapter is a thin layer (ARCHITECTURE.md §12.2); it does not own L1
|
||||
content — it only translates.
|
||||
|
||||
## Versioning (W3.D)
|
||||
|
||||
`1.0.0` — interface MAJOR, behavior MINOR, lifecycle PATCH. MAJOR bumps
|
||||
require a new registry entry (immutable publication); old entries enter
|
||||
a 12-month deprecation window.
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
"name": "l1-iam-role",
|
||||
"version": "1.0.0",
|
||||
"kind": "l1",
|
||||
"type": "aws:iam:role",
|
||||
"description": "IAM role primitive (substrate-agnostic IR type aws:iam:role; the Terraform adapter translates to aws_iam_role).",
|
||||
"inputs": {
|
||||
"role_name": {
|
||||
"type": "string",
|
||||
"description": "The IAM role name.",
|
||||
"required": true
|
||||
},
|
||||
"assume_role_policy": {
|
||||
"type": "string",
|
||||
"description": "Assume-role policy document (JSON string).",
|
||||
"required": true
|
||||
},
|
||||
"managed_policies": {
|
||||
"type": "string",
|
||||
"description": "Comma-separated list of managed policy ARNs to attach.",
|
||||
"required": false
|
||||
},
|
||||
"region": {
|
||||
"type": "string",
|
||||
"description": "AWS region the role is created in.",
|
||||
"required": true
|
||||
}
|
||||
},
|
||||
"outputs": {
|
||||
"role_arn": {
|
||||
"type": "arn",
|
||||
"description": "The IAM role ARN."
|
||||
},
|
||||
"role_id": {
|
||||
"type": "string",
|
||||
"description": "The IAM role id."
|
||||
}
|
||||
},
|
||||
"nfrs": {}
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
# l1-s3 — S3 bucket primitive
|
||||
|
||||
The first real L1 module for the v1.1 spike. Single-purpose,
|
||||
substrate-agnostic (the IR type is `aws:s3:bucket`, not a Terraform
|
||||
resource type).
|
||||
|
||||
## Interface (the IR-typed contract)
|
||||
|
||||
See `interface.json`: inputs `bucket_name` + `region` (strings), outputs
|
||||
`bucket_arn` (arn) + `bucket_name` (string), NFR `versioning` (bool,
|
||||
default true).
|
||||
|
||||
## IR → Terraform mapping (performed by the adapter)
|
||||
|
||||
The Terraform adapter (`adapters/terraform/adapter.py`) translates this
|
||||
L1's IR shape to Terraform:
|
||||
|
||||
| IR | Terraform |
|
||||
|----|-----------|
|
||||
| `resource.type = aws:s3:bucket` | `resource "aws_s3_bucket" "<id>" { ... }` |
|
||||
| `resource.inputs.bucket_name` | `bucket = <value>` arg |
|
||||
| `resource.inputs.region` | `provider "aws" { region = <value> }` |
|
||||
| `resource.outputs.bucket_arn` | `output "bucket_arn" { value = aws_s3_bucket.<id>.arn }` |
|
||||
| `resource.outputs.bucket_name` | `output "bucket_name" { value = aws_s3_bucket.<id>.id }` |
|
||||
|
||||
The adapter is a thin layer (ARCHITECTURE.md §12.2); it does not own L1
|
||||
content — it only translates.
|
||||
|
||||
## Spike instance
|
||||
|
||||
`spike_instance.json` is a concrete stack instance (with values
|
||||
`bucket_name=acdl-spike-bucket`, `region=us-east-1`) that validates
|
||||
against `schemas/ir.schema.json`. The adapter consumes this instance
|
||||
(not the interface contract) to emit Terraform.
|
||||
|
||||
## Versioning (W3.D)
|
||||
|
||||
`1.0.0` — interface MAJOR, behavior MINOR, lifecycle PATCH. MAJOR bumps
|
||||
require a new registry entry (immutable publication); old entries enter
|
||||
a 12-month deprecation window.
|
||||
@@ -0,0 +1,36 @@
|
||||
{
|
||||
"name": "l1-s3",
|
||||
"version": "1.0.0",
|
||||
"kind": "l1",
|
||||
"type": "aws:s3:bucket",
|
||||
"description": "S3 bucket primitive (substrate-agnostic IR type aws:s3:bucket; the Terraform adapter translates to aws_s3_bucket).",
|
||||
"inputs": {
|
||||
"bucket_name": {
|
||||
"type": "string",
|
||||
"description": "Globally-unique S3 bucket name.",
|
||||
"required": true
|
||||
},
|
||||
"region": {
|
||||
"type": "string",
|
||||
"description": "AWS region the bucket is created in.",
|
||||
"required": true
|
||||
}
|
||||
},
|
||||
"outputs": {
|
||||
"bucket_arn": {
|
||||
"type": "arn",
|
||||
"description": "The S3 bucket ARN."
|
||||
},
|
||||
"bucket_name": {
|
||||
"type": "string",
|
||||
"description": "The bucket name (echoes the input)."
|
||||
}
|
||||
},
|
||||
"nfrs": {
|
||||
"versioning": {
|
||||
"type": "boolean",
|
||||
"description": "Enable S3 versioning (default true).",
|
||||
"default": true
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
"version": "1.0.0",
|
||||
"stack": {
|
||||
"name": "l1-s3",
|
||||
"kind": "l1",
|
||||
"depth": 1
|
||||
},
|
||||
"resources": [
|
||||
{
|
||||
"id": "s3",
|
||||
"type": "aws:s3:bucket",
|
||||
"module": "l1-s3@1.0.0",
|
||||
"inputs": {
|
||||
"bucket_name": "acdl-spike-bucket",
|
||||
"region": "us-east-1"
|
||||
},
|
||||
"outputs": {
|
||||
"bucket_arn": {"type": "arn", "description": "The S3 bucket ARN."},
|
||||
"bucket_name": {"type": "string", "description": "The bucket name."}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
# l1-vpc — VPC primitive (multi-resource L1)
|
||||
|
||||
An L1 module for a VPC with subnets and a route table. Substrate-agnostic
|
||||
(the IR types are `aws:ec2:vpc`, `aws:ec2:subnet`, `aws:ec2:routetable`,
|
||||
not Terraform resource types). This is a multi-resource L1: the
|
||||
interface declares the group's inputs/outputs plus a `resources` array
|
||||
listing the IR types it emits. The IR instance (Phase 14/15) will have
|
||||
multiple `resources` entries all with `module: "l1-vpc@1.0.0"`.
|
||||
|
||||
## Interface (the IR-typed contract)
|
||||
|
||||
See `interface.json`: inputs `cidr` (string, e.g. "10.0.0.0/16"), `azs`
|
||||
(string, comma-separated, e.g. "us-east-1a,us-east-1b"), `name` (string,
|
||||
used for tagging), `region` (string); outputs `vpc_id` (string),
|
||||
`subnet_ids` (string, comma-separated), `igw_id` (string); no NFRs.
|
||||
|
||||
The `resources` array lists the emitted IR types:
|
||||
|
||||
- `aws:ec2:vpc` — the VPC itself (cidr → cidr_block, name → tag).
|
||||
- `aws:ec2:subnet` — one subnet per availability zone (`azs` split on
|
||||
comma); inputs include the parent VPC id.
|
||||
- `aws:ec2:routetable` — route table bound to the VPC with an internet
|
||||
gateway + default route (0.0.0.0/0 → igw).
|
||||
|
||||
## IR → Terraform mapping (performed by the adapter)
|
||||
|
||||
The Terraform adapter (`adapters/terraform/adapter.py`) translates each
|
||||
emitted IR resource to Terraform:
|
||||
|
||||
| IR | Terraform |
|
||||
|----|-----------|
|
||||
| `resource.type = aws:ec2:vpc` | `resource "aws_vpc" "<id>" { ... }` |
|
||||
| `resource.inputs.cidr` | `cidr_block = <value>` arg |
|
||||
| `resource.inputs.name` | `tags = { Name = <value> }` (emit as-is) |
|
||||
| `resource.outputs.vpc_id` | `output "vpc_id" { value = aws_vpc.<id>.id }` |
|
||||
| `resource.type = aws:ec2:subnet` | `resource "aws_subnet" "<id>" { ... }` |
|
||||
| `resource.inputs.cidr` | `cidr_block = <value>` arg |
|
||||
| `resource.inputs.az` | `availability_zone = <value>` arg |
|
||||
| `resource.outputs.subnet_id` | `output "subnet_id" { value = aws_subnet.<id>.id }` |
|
||||
| `resource.type = aws:ec2:routetable` | `resource "aws_route_table" "<id>" { ... }` |
|
||||
| `resource.inputs.vpc_id` | `vpc_id = <value>` arg |
|
||||
|
||||
The internet gateway + default route are emitted as part of the route
|
||||
table resource's IR (the `igw_id` output is wired via the route table's
|
||||
inputs). The adapter is a thin layer (ARCHITECTURE.md §12.2); it does
|
||||
not own L1 content — it only translates.
|
||||
|
||||
## Versioning (W3.D)
|
||||
|
||||
`1.0.0` — interface MAJOR, behavior MINOR, lifecycle PATCH. MAJOR bumps
|
||||
require a new registry entry (immutable publication); old entries enter
|
||||
a 12-month deprecation window.
|
||||
@@ -0,0 +1,64 @@
|
||||
{
|
||||
"name": "l1-vpc",
|
||||
"version": "1.0.0",
|
||||
"kind": "l1",
|
||||
"type": "aws:ec2:vpc",
|
||||
"description": "VPC primitive (substrate-agnostic IR types aws:ec2:vpc + aws:ec2:subnet + aws:ec2:routetable; the Terraform adapter translates to aws_vpc/aws_subnet/aws_route_table).",
|
||||
"inputs": {
|
||||
"cidr": {
|
||||
"type": "string",
|
||||
"description": "VPC CIDR block, e.g. 10.0.0.0/16.",
|
||||
"required": true
|
||||
},
|
||||
"azs": {
|
||||
"type": "string",
|
||||
"description": "Comma-separated availability zones, e.g. us-east-1a,us-east-1b.",
|
||||
"required": true
|
||||
},
|
||||
"name": {
|
||||
"type": "string",
|
||||
"description": "Name tag for the VPC and child resources.",
|
||||
"required": true
|
||||
},
|
||||
"region": {
|
||||
"type": "string",
|
||||
"description": "AWS region the VPC is created in.",
|
||||
"required": true
|
||||
}
|
||||
},
|
||||
"outputs": {
|
||||
"vpc_id": {
|
||||
"type": "string",
|
||||
"description": "The VPC id."
|
||||
},
|
||||
"subnet_ids": {
|
||||
"type": "string",
|
||||
"description": "Comma-separated subnet ids."
|
||||
},
|
||||
"igw_id": {
|
||||
"type": "string",
|
||||
"description": "The internet gateway id."
|
||||
}
|
||||
},
|
||||
"nfrs": {},
|
||||
"resources": [
|
||||
{
|
||||
"type": "aws:ec2:vpc",
|
||||
"description": "The VPC itself.",
|
||||
"inputs": ["cidr", "name"],
|
||||
"outputs": ["vpc_id"]
|
||||
},
|
||||
{
|
||||
"type": "aws:ec2:subnet",
|
||||
"description": "One subnet per availability zone (azs split on comma).",
|
||||
"inputs": ["cidr", "az", "vpc_id", "name"],
|
||||
"outputs": ["subnet_id"]
|
||||
},
|
||||
{
|
||||
"type": "aws:ec2:routetable",
|
||||
"description": "Route table bound to the VPC with an internet gateway + default route.",
|
||||
"inputs": ["vpc_id", "igw_id", "name"],
|
||||
"outputs": []
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
# l2-microservice — thin-composition (ECS Fargate microservice)
|
||||
|
||||
The v1.2 L2. A thin-composition that references 6 L1s (depth 1):
|
||||
`l1-vpc`, `l1-ecs-cluster`, `l1-ecr`, `l1-iam-role`, `l1-alb`,
|
||||
`l1-ecs-service`. The contract's inputs (`name`, `cidr`, `azs`,
|
||||
`image`, `port`, `cpu`, `memory`, `env`, `protocol`, `region`,
|
||||
`role_name`, `assume_role_policy`, `managed_policies`) map to the
|
||||
children's inputs through two wire kinds.
|
||||
|
||||
## Composition (the IR-typed thin-composition tree)
|
||||
|
||||
See `composition.json`: `kind=l2`, `depth=1`, six children.
|
||||
|
||||
### Children
|
||||
|
||||
| child id | L1 module | IR type(s) |
|
||||
|----------|-----------|------------|
|
||||
| `vpc` | `l1-vpc@1.0.0` | `aws:ec2:vpc`, `aws:ec2:subnet`, `aws:ec2:routetable` |
|
||||
| `cluster` | `l1-ecs-cluster@1.0.0` | `aws:ecs:cluster` |
|
||||
| `ecr` | `l1-ecr@1.0.0` | `aws:ecr:repository` |
|
||||
| `roles` | `l1-iam-role@1.0.0` | `aws:iam:role` |
|
||||
| `alb` | `l1-alb@1.0.0` | `aws:elbv2:loadbalancer`, `aws:elbv2:listener`, `aws:elbv2:targetgroup` |
|
||||
| `service` | `l1-ecs-service@1.0.0` | `aws:ecs:task_definition`, `aws:ecs:service` |
|
||||
|
||||
Multi-resource L1s (`vpc`, `alb`, `service`) declare a `resources`
|
||||
array in their `interface.json`; the resolver expands each child into
|
||||
one IR resource per `resources` entry (id scheme `<child_id>-<type_suffix>`
|
||||
where `type_suffix` is the last segment of the IR type with underscores
|
||||
stripped — e.g. `vpc-vpc`, `vpc-subnet`, `vpc-routetable`,
|
||||
`alb-loadbalancer`, `alb-targetgroup`, `alb-listener`,
|
||||
`service-taskdefinition`, `service-service`. The hyphen separator keeps
|
||||
the id valid against `schemas/ir.schema.json`'s
|
||||
`^[a-z][a-z0-9-]*$` resource id pattern). Single-resource L1s keep the
|
||||
child id verbatim (`cluster`, `ecr`, `roles`).
|
||||
|
||||
### Wire kinds
|
||||
|
||||
1. **Contract→child passthrough** — wire name = contract input name;
|
||||
target = child id, input = child's input name. For contract inputs
|
||||
that fan out to multiple children (`name`, `port`, `region`), the
|
||||
wire value is an array of `{target, input}` objects; otherwise a
|
||||
single object. Resolves to the concrete contract value.
|
||||
|
||||
2. **Child→child references** — wire with `source: "child:<id>.<output>"`.
|
||||
The value is only known at apply time, so the resolver emits the IR
|
||||
input as the string `ref:<ir_resource_id>.<output>` (the IR resource
|
||||
id of the *producing* child's first resource — for single-resource
|
||||
L1s that is the child id, for multi-resource L1s it is
|
||||
`<child_id>-<type_suffix>` of the first resource in the `resources`
|
||||
array that declares the output). The adapter translates `ref:` to a
|
||||
Terraform interpolation.
|
||||
|
||||
Wires used by this composition:
|
||||
|
||||
- Passthrough: `name` (→vpc/cluster/ecr/alb), `cidr` (→vpc), `azs`
|
||||
(→vpc), `image` (→service), `port` (→service/alb), `cpu` (→service),
|
||||
`memory` (→service), `env` (→service), `protocol` (→alb), `region`
|
||||
(→all 6), `role_name` (→roles), `assume_role_policy` (→roles),
|
||||
`managed_policies` (→roles).
|
||||
- Child→child: `cluster_arn` (cluster→service), `subnet_ids`
|
||||
(vpc→service/alb `subnets`), `target_group_arn` (alb→service
|
||||
`lb_target_group_arn`), `role_arn` (roles→service/alb
|
||||
`security_group`).
|
||||
|
||||
## IR → Terraform mapping (D-P10-1)
|
||||
|
||||
The Terraform adapter consumes the *resolved IR instance* (which has
|
||||
`kind=l2` + all 6 L1s expanded into one IR resource per entry in each
|
||||
L1's `resources` array, with `ref:` strings on the consumer inputs).
|
||||
For a depth-1 thin-composition, the L2 root module **IS** the union of
|
||||
the L1 resources — no separate `module "l1_x" { source = "..." }`
|
||||
blocks. The existing adapter `TYPE_MAP` + `INPUT_MAP` + `OUTPUT_MAP`
|
||||
tables handle every IR type. `ref:<id>.<output>` inputs are translated
|
||||
to `${<tf_type>.<id>.<attr>}` (attribute mapped through `OUTPUT_MAP`
|
||||
for the referenced resource's type). The `relationships` array records
|
||||
the parent composition tree; ordering is implicit in the resource list.
|
||||
|
||||
v1.3+ may emit real `module "l1_x" { source = "..." }` blocks once L1s
|
||||
are published Terraform modules rather than inline resources.
|
||||
|
||||
## Versioning (W3.D)
|
||||
|
||||
`1.0.0` — interface MAJOR, behavior MINOR, lifecycle PATCH. MAJOR bumps
|
||||
require a new registry entry (immutable publication); old entries enter
|
||||
a 12-month deprecation window.
|
||||
@@ -0,0 +1,55 @@
|
||||
{
|
||||
"name": "l2-microservice",
|
||||
"version": "1.0.0",
|
||||
"kind": "l2",
|
||||
"depth": 1,
|
||||
"description": "Thin-composition: an ECS Fargate microservice. References 6 L1s (vpc, cluster, ecr, roles, alb, service).",
|
||||
"children": [
|
||||
{"id": "vpc", "module": "l1-vpc@1.0.0"},
|
||||
{"id": "cluster", "module": "l1-ecs-cluster@1.0.0"},
|
||||
{"id": "ecr", "module": "l1-ecr@1.0.0"},
|
||||
{"id": "roles", "module": "l1-iam-role@1.0.0"},
|
||||
{"id": "alb", "module": "l1-alb@1.0.0"},
|
||||
{"id": "service", "module": "l1-ecs-service@1.0.0"}
|
||||
],
|
||||
"wires": {
|
||||
"name": [
|
||||
{"target": "vpc", "input": "name"},
|
||||
{"target": "cluster", "input": "name"},
|
||||
{"target": "ecr", "input": "name"},
|
||||
{"target": "alb", "input": "name"}
|
||||
],
|
||||
"cidr": {"target": "vpc", "input": "cidr"},
|
||||
"azs": {"target": "vpc", "input": "azs"},
|
||||
"image": {"target": "service", "input": "image"},
|
||||
"port": [
|
||||
{"target": "service", "input": "port"},
|
||||
{"target": "alb", "input": "port"}
|
||||
],
|
||||
"cpu": {"target": "service", "input": "cpu"},
|
||||
"memory": {"target": "service", "input": "memory"},
|
||||
"env": {"target": "service", "input": "env"},
|
||||
"protocol": {"target": "alb", "input": "protocol"},
|
||||
"region": [
|
||||
{"target": "vpc", "input": "region"},
|
||||
{"target": "cluster", "input": "region"},
|
||||
{"target": "ecr", "input": "region"},
|
||||
{"target": "roles", "input": "region"},
|
||||
{"target": "alb", "input": "region"},
|
||||
{"target": "service", "input": "region"}
|
||||
],
|
||||
"role_name": {"target": "roles", "input": "role_name"},
|
||||
"assume_role_policy": {"target": "roles", "input": "assume_role_policy"},
|
||||
"managed_policies": {"target": "roles", "input": "managed_policies"},
|
||||
"cluster_arn": {"target": "service", "input": "cluster_arn", "source": "child:cluster.cluster_arn"},
|
||||
"subnet_ids": [
|
||||
{"target": "service", "input": "subnets", "source": "child:vpc.subnet_ids"},
|
||||
{"target": "alb", "input": "subnets", "source": "child:vpc.subnet_ids"}
|
||||
],
|
||||
"target_group_arn": {"target": "service", "input": "lb_target_group_arn", "source": "child:alb.target_group_arn"},
|
||||
"role_arn": [
|
||||
{"target": "service", "input": "security_group", "source": "child:roles.role_arn"},
|
||||
{"target": "alb", "input": "security_group", "source": "child:roles.role_arn"}
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
# l2-static-asset — thin-composition (S3 static asset)
|
||||
|
||||
The v1.1 spike's L2. A thin-composition that references `l1-s3` only
|
||||
(depth 1). The contract's inputs (`bucket_name`, `region`) map 1:1
|
||||
through the wires to the L1's inputs.
|
||||
|
||||
## Composition (the IR-typed thin-composition tree)
|
||||
|
||||
See `composition.json`: `kind=l2`, `depth=1`, one child `l1-s3@1.0.0`,
|
||||
wires `{bucket_name → s3.inputs.bucket_name, region → s3.inputs.region}`
|
||||
(passthrough).
|
||||
|
||||
## IR → Terraform mapping (D-P10-1)
|
||||
|
||||
The Terraform adapter consumes the *resolved IR instance* (which has
|
||||
`kind=l2` + the L1 resource `s3` in its `resources` array). For a
|
||||
depth-1 thin-composition, the L2 root module **IS** the L1's resource —
|
||||
no separate `module "l1_s3" { source = "..." }` block. The existing
|
||||
adapter `TYPE_MAP` + resource emission handle both l1 and l2 instances
|
||||
(the resources array is the same shape). The `relationships` array is
|
||||
ignored at the Terraform level for the spike (composition ordering is
|
||||
implicit in the single resource).
|
||||
|
||||
v1.2 may emit a real `module "l1_s3" { source = "..." }` block when L1s
|
||||
become published Terraform modules rather than inline resources.
|
||||
|
||||
## Versioning (W3.D)
|
||||
|
||||
`1.0.0` — interface MAJOR, behavior MINOR, lifecycle PATCH. MAJOR bumps
|
||||
require a new registry entry (immutable publication); old entries enter
|
||||
a 12-month deprecation window.
|
||||
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"name": "l2-static-asset",
|
||||
"version": "1.0.0",
|
||||
"kind": "l2",
|
||||
"depth": 1,
|
||||
"description": "Thin-composition: a single S3 bucket for static asset hosting. References l1-s3 only (depth 1).",
|
||||
"children": [
|
||||
{
|
||||
"id": "s3",
|
||||
"module": "l1-s3@1.0.0"
|
||||
}
|
||||
],
|
||||
"wires": {
|
||||
"bucket_name": {"target": "s3", "input": "bucket_name"},
|
||||
"region": {"target": "s3", "input": "region"}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
{
|
||||
"l1-s3": {
|
||||
"1.0.0": {
|
||||
"interface": "modules-ir/l1/l1-s3/interface.json",
|
||||
"published_at": "2026-07-21T19:00:00Z",
|
||||
"deprecated": false
|
||||
}
|
||||
},
|
||||
"l1-vpc": {
|
||||
"1.0.0": {
|
||||
"interface": "modules-ir/l1/l1-vpc/interface.json",
|
||||
"published_at": "2026-07-21T21:30:00Z",
|
||||
"deprecated": false
|
||||
}
|
||||
},
|
||||
"l1-ecs-cluster": {
|
||||
"1.0.0": {
|
||||
"interface": "modules-ir/l1/l1-ecs-cluster/interface.json",
|
||||
"published_at": "2026-07-21T21:30:00Z",
|
||||
"deprecated": false
|
||||
}
|
||||
},
|
||||
"l1-ecs-service": {
|
||||
"1.0.0": {
|
||||
"interface": "modules-ir/l1/l1-ecs-service/interface.json",
|
||||
"published_at": "2026-07-21T21:30:00Z",
|
||||
"deprecated": false
|
||||
}
|
||||
},
|
||||
"l1-iam-role": {
|
||||
"1.0.0": {
|
||||
"interface": "modules-ir/l1/l1-iam-role/interface.json",
|
||||
"published_at": "2026-07-21T21:30:00Z",
|
||||
"deprecated": false
|
||||
}
|
||||
},
|
||||
"l1-alb": {
|
||||
"1.0.0": {
|
||||
"interface": "modules-ir/l1/l1-alb/interface.json",
|
||||
"published_at": "2026-07-21T21:30:00Z",
|
||||
"deprecated": false
|
||||
}
|
||||
},
|
||||
"l1-ecr": {
|
||||
"1.0.0": {
|
||||
"interface": "modules-ir/l1/l1-ecr/interface.json",
|
||||
"published_at": "2026-07-21T21:30:00Z",
|
||||
"deprecated": false
|
||||
}
|
||||
},
|
||||
"l2-static-asset": {
|
||||
"1.0.0": {
|
||||
"composition": "modules-ir/l2/l2-static-asset/composition.json",
|
||||
"published_at": "2026-07-21T19:30:00Z",
|
||||
"deprecated": false
|
||||
}
|
||||
},
|
||||
"l2-microservice": {
|
||||
"1.0.0": {
|
||||
"composition": "modules-ir/l2/l2-microservice/composition.json",
|
||||
"published_at": "2026-07-21T22:00:00Z",
|
||||
"deprecated": false
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -20,7 +20,17 @@
|
||||
"inputs": {
|
||||
"type": "object",
|
||||
"description": "L2-level parameter map. Free-form in v1, typed per-L1 in v1.2 (W3.E).",
|
||||
"additionalProperties": {"type": ["string", "number", "boolean"]}
|
||||
"additionalProperties": {"type": ["string", "number", "boolean", "object"]}
|
||||
},
|
||||
"healthcheck": {
|
||||
"type": "object",
|
||||
"description": "Healthcheck config for the service.",
|
||||
"properties": {
|
||||
"path": {"type": "string"},
|
||||
"interval": {"type": "number"},
|
||||
"timeout": {"type": "number"},
|
||||
"healthy_threshold": {"type": "number"}
|
||||
}
|
||||
},
|
||||
"validation": {
|
||||
"type": "object",
|
||||
|
||||
Executable
+116
@@ -0,0 +1,116 @@
|
||||
#!/usr/bin/env bash
|
||||
# scripts/run_platform.sh - the ACDL platform pipeline (consolidated from
|
||||
# the v1.1 spike scripts run_spike_e2e.sh + run_spike_plan.sh per D-048).
|
||||
#
|
||||
# Default: full end-to-end pipeline (contract resolution -> IR -> terraform
|
||||
# plan (real AWS) -> Checkov -> PolicyCheckResult -> confidence signal ->
|
||||
# evidence event to DynamoDB outbox).
|
||||
# --plan-only: contract resolution + adapter + terraform init/validate/plan
|
||||
# (steps 1-4), then exit.
|
||||
#
|
||||
# Uses the rotated spike key (D-039/D-047) from gitignored .env.secrets.
|
||||
# Plan-only (no apply); -lock=false per D-P09-1.
|
||||
set -euo pipefail
|
||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$ROOT"
|
||||
|
||||
PLAN_ONLY=0
|
||||
for arg in "$@"; do
|
||||
case "$arg" in
|
||||
--plan-only) PLAN_ONLY=1 ;;
|
||||
*) echo "FAIL: unknown argument: $arg" >&2; exit 1 ;;
|
||||
esac
|
||||
done
|
||||
|
||||
fail() { echo "FAIL: $*" >&2; exit 1; }
|
||||
|
||||
ENV_FILE="$ROOT/.env.secrets"
|
||||
[ -f "$ENV_FILE" ] || fail ".env.secrets missing (run scripts/rotate_spike_key.sh)"
|
||||
set -a
|
||||
. "$ENV_FILE"
|
||||
set +a
|
||||
export AWS_ACCESS_KEY_ID="$ACDL_AWS_ACCESS_KEY_ID"
|
||||
export AWS_SECRET_ACCESS_KEY="$ACDL_AWS_SECRET_ACCESS_KEY"
|
||||
export AWS_DEFAULT_REGION="$AWS_DEFAULT_REGION"
|
||||
|
||||
CONTRACT="contracts/spike.yaml"
|
||||
CONTRACT_ID="11111111-1111-1111-1111-111111111111" # spike fixed UUID
|
||||
WORK="/tmp/spike_e2e"
|
||||
rm -rf "$WORK"; mkdir -p "$WORK"
|
||||
|
||||
echo "=== Step 1+2: resolve contract -> IR (validates contract schema + IR schema) ==="
|
||||
python3 acdl_platform/contract_resolver.py "$CONTRACT" "$WORK/spike_ir.json" || fail "contract resolution failed"
|
||||
python3 -c "import json; d=json.load(open('$WORK/spike_ir.json')); print(f\"IR: {d['stack']['name']} {d['stack']['kind']} {len(d['resources'])} resource(s)\")"
|
||||
|
||||
echo "=== Step 3: adapter compiles IR -> terraform/spike/*.tf (regenerate) ==="
|
||||
python3 adapters/terraform/adapter.py "$WORK/spike_ir.json" terraform/spike || fail "adapter failed"
|
||||
echo "adapter: emitted terraform/spike/{main.tf,terraform.tf,providers.tf}"
|
||||
|
||||
echo "=== Step 4: terraform init + validate + plan -lock=false (real AWS) ==="
|
||||
cd terraform/spike
|
||||
terraform init -reconfigure -lock=false -input=false >> "$WORK/tf.log" 2>&1 || fail "terraform init failed"
|
||||
terraform validate >> "$WORK/tf.log" 2>&1 || fail "terraform validate failed"
|
||||
terraform plan -lock=false -input=false -out=tfplan >> "$WORK/tf.log" 2>&1 || fail "terraform plan failed"
|
||||
echo "terraform plan OK (1 to add, 0 to change, 0 to destroy expected)"
|
||||
cd "$ROOT"
|
||||
|
||||
if [ "$PLAN_ONLY" = "1" ]; then
|
||||
echo ""
|
||||
echo "=== PLATFORM PLAN OK ==="
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "=== Step 5: run Checkov on terraform/spike/main.tf ==="
|
||||
checkov -f terraform/spike/main.tf --framework terraform -o json --soft-fail > "$WORK/checkov.json" 2> "$WORK/checkov.err"
|
||||
[ -s "$WORK/checkov.json" ] || fail "checkov produced no output"
|
||||
echo "checkov: $(python3 -c "import json; d=json.load(open('$WORK/checkov.json')); print(len(d.get('results',{}).get('failed_checks',[])), 'failed,', len(d.get('results',{}).get('passed_checks',[])), 'passed')")"
|
||||
|
||||
echo "=== Step 6: Checkov adapter -> PolicyCheckResult list ==="
|
||||
python3 adapters/terraform/policy/checkov_adapter.py "$WORK/checkov.json" "$CONTRACT_ID" > "$WORK/pcr.json" || fail "checkov adapter failed"
|
||||
PCR_COUNT=$(python3 -c "import json; print(len(json.load(open('$WORK/pcr.json'))))")
|
||||
echo "PolicyCheckResult: $PCR_COUNT record(s)"
|
||||
|
||||
echo "=== Step 7: confidence signal compute ==="
|
||||
python3 <<PY > "$WORK/signal.json" || fail "confidence signal failed"
|
||||
import json
|
||||
import acdl_platform.confidence_signal as c
|
||||
pcr = json.load(open("$WORK/pcr.json"))
|
||||
inputs = {
|
||||
"policy": pcr,
|
||||
"validation": {"schema": True, "ir_resolved": True, "tf_validated": True, "tf_planned": True},
|
||||
"freshness": {"age_days": 0, "max_age_days": 7},
|
||||
"source": {"submitter": "spike", "commit_sha": "spike-sha", "signed": False},
|
||||
"history": {"prior_rollbacks": 0, "prior_policy_fails": 0},
|
||||
"nfrs": {"conformance": None},
|
||||
}
|
||||
sig = c.compute("$CONTRACT_ID", "dev", inputs)
|
||||
print(json.dumps({"score": sig.score, "band": sig.band, "perInput": sig.perInput, "reasonCodes": sig.reasonCodes}, indent=2))
|
||||
PY
|
||||
BAND=$(python3 -c "import json; print(json.load(open('$WORK/signal.json'))['band'])")
|
||||
SCORE=$(python3 -c "import json; print(round(json.load(open('$WORK/signal.json'))['score'],3))")
|
||||
echo "confidence: score=$SCORE band=$BAND"
|
||||
[ "$BAND" = "pass" ] || fail "confidence band is $BAND, expected pass for dev"
|
||||
|
||||
echo "=== Step 8: write evidence event to DynamoDB outbox ==="
|
||||
python3 <<PY > "$WORK/event.json" || fail "event build failed"
|
||||
import json, datetime
|
||||
sig = json.load(open("$WORK/signal.json"))
|
||||
event = {
|
||||
"contractId": "$CONTRACT_ID",
|
||||
"eventType": "CONFIDENCE_COMPUTED",
|
||||
"ts": datetime.datetime.now(datetime.timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ"),
|
||||
"environment": "dev",
|
||||
"stack": "l2-static-asset",
|
||||
"score": sig["score"],
|
||||
"band": sig["band"],
|
||||
"prev_event_hash": "GENESIS",
|
||||
}
|
||||
print(json.dumps(event, indent=2))
|
||||
PY
|
||||
python3 acdl_platform/outbox_writer.py "$WORK/event.json" > "$WORK/outbox_item.json" || fail "outbox write failed"
|
||||
echo "outbox: $(python3 -c "import json; d=json.load(open('$WORK/outbox_item.json')); print('contractId=', d['contractId'], 'hash=', d['hash'][:16]+'...')")"
|
||||
|
||||
echo ""
|
||||
echo "=== PLATFORM E2E OK ==="
|
||||
echo "contract=$CONTRACT -> IR -> terraform plan -> Checkov -> confidence ($BAND) -> outbox"
|
||||
exit 0
|
||||
Executable
+77
@@ -0,0 +1,77 @@
|
||||
#!/usr/bin/env bash
|
||||
# scripts/verify_phase09.sh - Phase 09 v1-spike-ir-and-l1-and-adapter gate.
|
||||
set -u
|
||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$ROOT"
|
||||
fail() { echo "FAIL: $*" >&2; exit 1; }
|
||||
ok() { echo "ok: $*"; }
|
||||
|
||||
# --- Check 1: L1 module files exist ---
|
||||
for f in modules-ir/l1/l1-s3/interface.json \
|
||||
modules-ir/l1/l1-s3/spike_instance.json \
|
||||
modules-ir/l1/l1-s3/README.md \
|
||||
modules-ir/registry.json \
|
||||
adapters/terraform/adapter.py \
|
||||
terraform/spike/main.tf \
|
||||
terraform/spike/terraform.tf \
|
||||
terraform/spike/providers.tf \
|
||||
scripts/run_spike_plan.sh; do
|
||||
[ -f "$f" ] || fail "missing $f"
|
||||
done
|
||||
ok "all 9 deliverable files exist"
|
||||
|
||||
# --- Check 2: spike_instance.json validates against ir.schema.json ---
|
||||
( cd /tmp && python3 -c "
|
||||
import json, jsonschema
|
||||
inst = json.load(open('$ROOT/modules-ir/l1/l1-s3/spike_instance.json'))
|
||||
schema = json.load(open('$ROOT/schemas/ir.schema.json'))
|
||||
jsonschema.validate(inst, schema)
|
||||
" ) || fail "spike_instance.json does not validate against ir.schema.json"
|
||||
ok "spike_instance.json validates against ir.schema.json"
|
||||
|
||||
# --- Check 3: registry has the l1-s3@1.0.0 entry ---
|
||||
python3 -c "
|
||||
import json
|
||||
r = json.load(open('modules-ir/registry.json'))
|
||||
assert 'l1-s3' in r and '1.0.0' in r['l1-s3'], 'l1-s3@1.0.0 missing'
|
||||
print('l1-s3@1.0.0 present')
|
||||
" || fail "registry missing l1-s3@1.0.0"
|
||||
ok "registry has l1-s3@1.0.0"
|
||||
|
||||
# --- Check 4: adapter py_compiles + generates terraform containing aws_s3_bucket ---
|
||||
python3 -m py_compile adapters/terraform/adapter.py || fail "adapter.py py_compile failed"
|
||||
TMP=$(mktemp -d)
|
||||
python3 adapters/terraform/adapter.py modules-ir/l1/l1-s3/spike_instance.json "$TMP" 2>/dev/null
|
||||
grep -q 'resource "aws_s3_bucket"' "$TMP/main.tf" || fail "adapter did not emit aws_s3_bucket resource"
|
||||
grep -q 'output "bucket_arn"' "$TMP/main.tf" || fail "adapter did not emit bucket_arn output"
|
||||
ok "adapter.py py_compiles + emits aws_s3_bucket + bucket_arn output"
|
||||
|
||||
# --- Check 5: generated terraform/spike/*.tf match a fresh adapter run (D-P09-4 reproducibility) ---
|
||||
diff "$TMP/main.tf" terraform/spike/main.tf || fail "terraform/spike/main.tf is stale (differs from a fresh adapter run)"
|
||||
diff "$TMP/terraform.tf" terraform/spike/terraform.tf || fail "terraform/spike/terraform.tf is stale"
|
||||
diff "$TMP/providers.tf" terraform/spike/providers.tf || fail "terraform/spike/providers.tf is stale"
|
||||
ok "terraform/spike/*.tf match a fresh adapter run (reproducible)"
|
||||
rm -rf "$TMP"
|
||||
|
||||
# --- Check 6: no long-lived credential (AKIA) in committed files ---
|
||||
# Skip .terraform/ (provider binaries contain AKIA bytes; gitignored anyway).
|
||||
if grep -rn --exclude-dir=.terraform "AKIA" terraform/spike/ adapters/ modules-ir/ 2>/dev/null; then
|
||||
fail "AKIA key id found in committed files (terraform/spike/ adapters/ modules-ir/)"
|
||||
fi
|
||||
ok "no AKIA in committed files (excluding .terraform/ provider binaries)"
|
||||
|
||||
# --- Check 7: .env.secrets + terraform working artifacts are gitignored ---
|
||||
git check-ignore -q .env.secrets || fail ".env.secrets not gitignored"
|
||||
git check-ignore -q terraform/spike/.terraform/ || fail "terraform/spike/.terraform/ not gitignored"
|
||||
git check-ignore -q terraform/spike/tfplan || fail "terraform/spike/tfplan not gitignored"
|
||||
ok "secrets + TF working artifacts gitignored"
|
||||
|
||||
# --- Check 8: real terraform plan against AWS succeeds (uses rotated spike key) ---
|
||||
bash scripts/run_spike_plan.sh > /tmp/verify_phase09_plan.log 2>&1 || {
|
||||
cat /tmp/verify_phase09_plan.log >&2
|
||||
fail "scripts/run_spike_plan.sh failed (see /tmp/verify_phase09_plan.log)"
|
||||
}
|
||||
grep -q "spike plan OK" /tmp/verify_phase09_plan.log || fail "run_spike_plan.sh did not print 'spike plan OK'"
|
||||
ok "real terraform plan against AWS succeeded (rotated spike key, plan-only, -lock=false)"
|
||||
|
||||
echo "VERIFIED — Phase 09: IR + l1-s3 + Terraform adapter; real terraform plan succeeds"
|
||||
Executable
+140
@@ -0,0 +1,140 @@
|
||||
#!/usr/bin/env bash
|
||||
# scripts/verify_phase10.sh - Phase 10 v1-spike-l2-and-contract-e2e gate (capstone).
|
||||
set -u
|
||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$ROOT"
|
||||
fail() { echo "FAIL: $*" >&2; exit 1; }
|
||||
ok() { echo "ok: $*"; }
|
||||
|
||||
ENV_FILE="$ROOT/.env.secrets"
|
||||
[ -f "$ENV_FILE" ] || fail ".env.secrets missing (run scripts/rotate_spike_key.sh first)"
|
||||
git check-ignore -q "$ENV_FILE" || fail ".env.secrets is not gitignored"
|
||||
set -a
|
||||
. "$ENV_FILE"
|
||||
set +a
|
||||
export AWS_ACCESS_KEY_ID="$ACDL_AWS_ACCESS_KEY_ID"
|
||||
export AWS_SECRET_ACCESS_KEY="$ACDL_AWS_SECRET_ACCESS_KEY"
|
||||
export AWS_DEFAULT_REGION="$AWS_DEFAULT_REGION"
|
||||
|
||||
# --- Check (a): composition.json exists + shape ---
|
||||
python3 <<'PY' || fail "composition.json shape wrong"
|
||||
import json
|
||||
c = json.load(open('modules-ir/l2/l2-static-asset/composition.json'))
|
||||
assert c['kind'] == 'l2' and c['depth'] == 1
|
||||
assert len(c['children']) == 1 and c['children'][0]['module'] == 'l1-s3@1.0.0'
|
||||
assert c['wires']['bucket_name']['target'] == 's3'
|
||||
assert c['wires']['region']['target'] == 's3'
|
||||
print('composition.json: kind=l2 depth=1 one child l1-s3@1.0.0 wires passthrough')
|
||||
PY
|
||||
ok "composition.json: l2-static-asset references l1-s3 only (depth 1)"
|
||||
|
||||
# --- Check (b): spike.yaml validates against contract schema ---
|
||||
python3 <<'PY' || fail "spike.yaml does not validate against contract schema"
|
||||
import yaml, json, jsonschema
|
||||
contract = yaml.safe_load(open('contracts/spike.yaml'))
|
||||
schema = json.load(open('schemas/contract.schema.json'))
|
||||
jsonschema.validate(contract, schema)
|
||||
print('spike.yaml validates against contract.schema.json')
|
||||
PY
|
||||
ok "contracts/spike.yaml validates against the contract schema"
|
||||
|
||||
# --- Check (c): resolver py_compiles + emits IR validating against ir.schema.json ---
|
||||
python3 -m py_compile acdl_platform/contract_resolver.py || fail "contract_resolver.py py_compile failed"
|
||||
TMP=$(mktemp -d)
|
||||
python3 acdl_platform/contract_resolver.py contracts/spike.yaml "$TMP/spike_ir.json" 2>/dev/null
|
||||
( cd /tmp && python3 -c "
|
||||
import json, jsonschema
|
||||
inst = json.load(open('$TMP/spike_ir.json'))
|
||||
schema = json.load(open('$ROOT/schemas/ir.schema.json'))
|
||||
jsonschema.validate(inst, schema)
|
||||
print('IR validates against ir.schema.json')
|
||||
" ) || fail "resolver IR does not validate against ir.schema.json"
|
||||
ok "contract_resolver.py resolves spike.yaml to an IR-schema-valid instance"
|
||||
|
||||
# --- Check (d): adapter py_compiles + emits main.tf with aws_s3_bucket ---
|
||||
python3 -m py_compile adapters/terraform/adapter.py || fail "adapter.py py_compile failed"
|
||||
python3 adapters/terraform/adapter.py "$TMP/spike_ir.json" "$TMP/tf" 2>/dev/null
|
||||
grep -q 'resource "aws_s3_bucket"' "$TMP/tf/main.tf" || fail "adapter did not emit aws_s3_bucket"
|
||||
ok "adapter.py compiles L2 IR to terraform with aws_s3_bucket"
|
||||
rm -rf "$TMP"
|
||||
|
||||
# --- Check (e): run_spike_e2e.sh exits 0 ---
|
||||
bash scripts/run_spike_e2e.sh > /tmp/verify_phase10_e2e.log 2>&1 || {
|
||||
cat /tmp/verify_phase10_e2e.log >&2
|
||||
fail "run_spike_e2e.sh failed"
|
||||
}
|
||||
grep -q "SPIKE E2E OK" /tmp/verify_phase10_e2e.log || fail "run_spike_e2e.sh did not print SPIKE E2E OK"
|
||||
ok "run_spike_e2e.sh completes the full pipeline end-to-end"
|
||||
|
||||
# --- Check (f): confidence band is pass for dev ---
|
||||
grep -q "band=pass" /tmp/verify_phase10_e2e.log || fail "confidence band is not pass for dev"
|
||||
ok "confidence band is pass for dev"
|
||||
|
||||
# --- Check (g): outbox item exists ---
|
||||
python3 <<'PY' || fail "outbox item not found in DynamoDB"
|
||||
import boto3
|
||||
s = boto3.Session(region_name='us-east-1')
|
||||
dyn = s.client('dynamodb')
|
||||
r = dyn.query(TableName='acdl-outbox',
|
||||
KeyConditionExpression='contractId = :cid',
|
||||
ExpressionAttributeValues={':cid': {'S': '11111111-1111-1111-1111-111111111111'}})
|
||||
assert r.get('Count', 0) >= 1, f'no outbox item for the spike contractId (Count={r.get("Count", 0)})'
|
||||
print(f'outbox item present (Count={r["Count"]})')
|
||||
PY
|
||||
ok "evidence event is written to the DynamoDB outbox"
|
||||
|
||||
# --- Check (h): REQ-28 - the adapter is the only substrate-specific code ---
|
||||
# The IR commitments hold: the adapter is the only place that knows Terraform
|
||||
# resource types (aws_s3_bucket). The L1/L2 interfaces, the IR schema, the
|
||||
# contract, the resolver, the confidence signal, and the outbox writer are
|
||||
# substrate-agnostic. Documentation (.md) + schema $comment/description strings
|
||||
# may mention aws_s3_bucket *to explain the mapping* — that's not a violation;
|
||||
# the check scans actual executable code (.py) + data files (.json/.yaml)
|
||||
# for resource-type declarations, excluding .md files + description/comment
|
||||
# string values.
|
||||
LEAK=$(grep -rn --include='*.py' -E 'aws_s3_bucket|aws_[a-z]+_[a-z]+' \
|
||||
acdl_platform/ 2>/dev/null)
|
||||
if [ -n "$LEAK" ]; then
|
||||
echo "$LEAK" >&2
|
||||
fail "REQ-28 violated: substrate-specific terms found in acdl_platform/ Python code (the platform must be substrate-agnostic)"
|
||||
fi
|
||||
# modules-ir/ data files: exclude .md (docs may reference the mapping); check
|
||||
# only .json for actual resource-type field declarations (not description strings).
|
||||
LEAK2=$(python3 <<'PY' 2>&1 || true
|
||||
import json, os, sys
|
||||
leaks = []
|
||||
for root, dirs, files in os.walk('modules-ir'):
|
||||
for f in files:
|
||||
if not f.endswith('.json'):
|
||||
continue
|
||||
path = os.path.join(root, f)
|
||||
with open(path) as fh:
|
||||
try:
|
||||
data = json.load(fh)
|
||||
except Exception:
|
||||
continue
|
||||
# Walk the JSON; flag 'aws_s3_bucket' (Terraform type) appearing as a
|
||||
# VALUE (not a key), excluding description/comment strings.
|
||||
def walk(obj, path_str=''):
|
||||
if isinstance(obj, dict):
|
||||
for k, v in obj.items():
|
||||
if k in ('description', '$comment') and isinstance(v, str):
|
||||
continue # docs/comment strings are allowed to mention it
|
||||
walk(v, path_str + '/' + k)
|
||||
elif isinstance(obj, str):
|
||||
if obj.startswith('aws_') and obj != 'aws:s3:bucket':
|
||||
leaks.append(f'{path}: {path_str} = {obj!r}')
|
||||
walk(data)
|
||||
if leaks:
|
||||
print('\n'.join(leaks))
|
||||
PY
|
||||
)
|
||||
if [ -n "$LEAK2" ]; then
|
||||
echo "$LEAK2" >&2
|
||||
fail "REQ-28 violated: substrate-specific resource-type values found in modules-ir/ JSON"
|
||||
fi
|
||||
ADAPT_HAS=$(grep -rn --include='*.py' -E 'aws_s3_bucket' adapters/terraform/ 2>/dev/null)
|
||||
[ -n "$ADAPT_HAS" ] || fail "REQ-28: adapter does not contain aws_s3_bucket (it should — it's the substrate-specific code)"
|
||||
ok "REQ-28: adapter is the only substrate-specific code; modules-ir/ + acdl_platform/ are substrate-agnostic (docs/comments excluded)"
|
||||
|
||||
echo "VERIFIED — Phase 10: L2 + contract-e2e; IR commitments hold (REQ-28)"
|
||||
Executable
+51
@@ -0,0 +1,51 @@
|
||||
#!/usr/bin/env bash
|
||||
# scripts/verify_phase11.sh - verify Phase 11 (v1.2 research + README rewrite).
|
||||
set -euo pipefail
|
||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$ROOT"
|
||||
|
||||
fail() { echo "FAIL: $*" >&2; exit 1; }
|
||||
|
||||
echo "=== Phase 11 verification ==="
|
||||
|
||||
# 1. README.md reflects v1.2 (not stale v1.1-active framing)
|
||||
grep -q "v1.2 (active)" README.md || fail "README.md: no 'v1.2 (active)' status"
|
||||
! grep -q "v1.1 (active)" README.md || fail "README.md: stale 'v1.1 (active)' framing"
|
||||
grep -q "v1.1 (complete, tag" README.md || fail "README.md: v1.1 not marked complete"
|
||||
grep -q "v1.3.0" README.md || fail "README.md: no v1.3.0 ship tag reference"
|
||||
grep -q "D-047" README.md || fail "README.md: no D-047 reference"
|
||||
grep -q "How the platform works" README.md || fail "README.md: no 'How the platform works' section"
|
||||
grep -q "terraform plan" README.md || fail "README.md: no terraform plan in the flow"
|
||||
grep -q "confidence signal" README.md || fail "README.md: no confidence signal in the flow"
|
||||
grep -q "DynamoDB outbox" README.md || fail "README.md: no DynamoDB outbox in the flow"
|
||||
grep -q "run_spike_e2e.sh" README.md || fail "README.md: no run_spike_e2e.sh in how-to-run"
|
||||
echo "README.md: OK (v1.2 framing, platform flow, how-to-run, credentials)"
|
||||
|
||||
# 2. RESEARCH.md has a v1.2 addendum with the 3 decisions
|
||||
grep -q "## v1.2 Research Addendum" .ciagent/RESEARCH.md || fail "RESEARCH.md: no v1.2 addendum"
|
||||
grep -q "TARGET 9" .ciagent/RESEARCH.md || fail "RESEARCH.md: no TARGET 9 (#36988 re-check)"
|
||||
grep -q "TARGET 10" .ciagent/RESEARCH.md || fail "RESEARCH.md: no TARGET 10 (NFR audit)"
|
||||
grep -q "TARGET 13" .ciagent/RESEARCH.md || fail "RESEARCH.md: no TARGET 13 (ECS L1 scoping)"
|
||||
grep -q "D-047" .ciagent/RESEARCH.md || fail "RESEARCH.md: no D-047"
|
||||
grep -q "D-048" .ciagent/RESEARCH.md || fail "RESEARCH.md: no D-048"
|
||||
grep -q "D-049" .ciagent/RESEARCH.md || fail "RESEARCH.md: no D-049"
|
||||
grep -qi "still open" .ciagent/RESEARCH.md || fail "RESEARCH.md: #36988 status not recorded"
|
||||
echo "RESEARCH.md: OK (v1.2 addendum, Targets 9-13, D-047/D-048/D-049)"
|
||||
|
||||
# 3. .ciagent/ files reflect v1.2 specify -> research progression
|
||||
grep -q '"milestone": "v1.2"' .ciagent/config.json || fail "config.json: milestone not v1.2"
|
||||
grep -q "Objective for Milestone v1.2" .ciagent/PROJECT.md || fail "PROJECT.md: no v1.2 objective"
|
||||
grep -q "REQ-29" .ciagent/REQUIREMENTS.md || fail "REQUIREMENTS.md: no REQ-29"
|
||||
grep -q "Phase 11" .ciagent/ROADMAP.md || fail "ROADMAP.md: no Phase 11"
|
||||
grep -q "v1.2 build-out scope" .ciagent/ARCHITECTURE.md || fail "ARCHITECTURE.md: no v1.2 scope"
|
||||
echo ".ciagent/ files: OK (v1.2 milestone consistent across all 5 files)"
|
||||
|
||||
# 4. #36988 re-check facts are accurate (cross-check the PR state we recorded)
|
||||
grep -q "2026-05-27" .ciagent/RESEARCH.md || fail "RESEARCH.md: #36988 last-updated date missing"
|
||||
grep -q "D-039" .ciagent/RESEARCH.md || fail "RESEARCH.md: D-039 waiver not referenced"
|
||||
echo "#36988 re-check: OK (date + D-039 extension recorded)"
|
||||
|
||||
echo ""
|
||||
echo "=== Phase 11: VERIFIED ==="
|
||||
echo "README.md rewritten; RESEARCH.md v1.2 addendum complete; D-047/D-048/D-049 surfaced."
|
||||
exit 0
|
||||
Executable
+63
@@ -0,0 +1,63 @@
|
||||
#!/usr/bin/env bash
|
||||
# scripts/verify_phase12.sh - verify Phase 12 (nfr-harden-and-simplify).
|
||||
set -euo pipefail
|
||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$ROOT"
|
||||
|
||||
fail() { echo "FAIL: $*" >&2; exit 1; }
|
||||
|
||||
echo "=== Phase 12 verification ==="
|
||||
|
||||
# 1. Script consolidation (D-048)
|
||||
[ -f scripts/run_platform.sh ] || fail "scripts/run_platform.sh missing"
|
||||
[ -x scripts/run_platform.sh ] || fail "scripts/run_platform.sh not executable"
|
||||
[ ! -f scripts/run_spike_e2e.sh ] || fail "scripts/run_spike_e2e.sh should be deleted"
|
||||
[ ! -f scripts/run_spike_plan.sh ] || fail "scripts/run_spike_plan.sh should be deleted"
|
||||
grep -q "set -euo pipefail" scripts/run_platform.sh || fail "run_platform.sh: no 'set -euo pipefail'"
|
||||
grep -q -- "--plan-only" scripts/run_platform.sh || fail "run_platform.sh: no --plan-only flag"
|
||||
grep -q "PLATFORM E2E OK" scripts/run_platform.sh || fail "run_platform.sh: no PLATFORM E2E OK banner"
|
||||
grep -q "PLATFORM PLAN OK" scripts/run_platform.sh || fail "run_platform.sh: no PLATFORM PLAN OK banner"
|
||||
grep -q "run_platform.sh" README.md || fail "README.md: no run_platform.sh reference"
|
||||
! grep -q "run_spike_e2e.sh" README.md || fail "README.md: stale run_spike_e2e.sh reference"
|
||||
! grep -q "run_spike_plan.sh" README.md || fail "README.md: stale run_spike_plan.sh reference"
|
||||
echo "Script consolidation (D-048): OK"
|
||||
|
||||
# 2. IAM policy expansion (ECS + ECR + ELB + IAM + EC2)
|
||||
python3 -c "import json; json.load(open('terraform/bootstrap/spike_runner_policy.json'))" || fail "spike_runner_policy.json: invalid JSON"
|
||||
grep -q "ecs:" terraform/bootstrap/spike_runner_policy.json || fail "policy: no ECS permissions"
|
||||
grep -q "ecr:" terraform/bootstrap/spike_runner_policy.json || fail "policy: no ECR permissions"
|
||||
grep -q "elasticloadbalancing:" terraform/bootstrap/spike_runner_policy.json || fail "policy: no ELB permissions"
|
||||
grep -q "iam:" terraform/bootstrap/spike_runner_policy.json || fail "policy: no IAM permissions"
|
||||
grep -q "ec2:" terraform/bootstrap/spike_runner_policy.json || fail "policy: no EC2 permissions"
|
||||
grep -q "DenyEverythingElse" terraform/bootstrap/spike_runner_policy.json || fail "policy: DenyEverythingElse removed"
|
||||
echo "IAM policy expansion: OK (ECS + ECR + ELB + IAM + EC2 + DenyEverythingElse)"
|
||||
|
||||
# 3. Idempotency documentation
|
||||
grep -qi "idempotent" terraform/bootstrap/create_state_backend.py || fail "create_state_backend.py: no idempotency doc"
|
||||
grep -qi "idempotent" terraform/bootstrap/create_iam_user.py || fail "create_iam_user.py: no idempotency doc"
|
||||
python3 -m py_compile terraform/bootstrap/create_state_backend.py terraform/bootstrap/create_iam_user.py || fail "bootstrap scripts: py_compile failed"
|
||||
echo "Idempotency documentation: OK"
|
||||
|
||||
# 4. P1-1 redaction (no live AWS key IDs in .ciagent/)
|
||||
if grep -rn "AKIAYOZHMKZ7RK26N66W\|AKIAYOZHMKZ772SINHFX" .ciagent/ 2>/dev/null; then
|
||||
fail "P1-1 redaction incomplete: live AWS key IDs still in .ciagent/"
|
||||
fi
|
||||
echo "P1-1 redaction: OK (no live AWS key IDs in .ciagent/)"
|
||||
|
||||
# 5. P1-B stale path fix
|
||||
! grep -q "platform/registry" .ciagent/PERSONAS.md || fail "PERSONAS.md: stale platform/registry path"
|
||||
grep -q "modules-ir/registry.json" .ciagent/PERSONAS.md || fail "PERSONAS.md: registry path not updated to modules-ir/registry.json"
|
||||
echo "P1-B stale path: OK (PERSONAS.md platform/registry -> modules-ir/registry.json)"
|
||||
|
||||
# 6. run_platform.sh syntax + plan-only smoke (may fail at AWS auth if no .env.secrets — that's OK)
|
||||
bash -n scripts/run_platform.sh || fail "run_platform.sh: syntax error"
|
||||
echo "run_platform.sh syntax: OK"
|
||||
|
||||
# 7. .ciagent/ consistency
|
||||
grep -q '"milestone": "v1.2"' .ciagent/config.json || fail "config.json: milestone not v1.2"
|
||||
echo ".ciagent/ consistency: OK"
|
||||
|
||||
echo ""
|
||||
echo "=== Phase 12: VERIFIED ==="
|
||||
echo "run_platform.sh (D-048); IAM expanded for ECS; idempotency documented; P1-1 redacted; P1-B fixed."
|
||||
exit 0
|
||||
Executable
+103
@@ -0,0 +1,103 @@
|
||||
#!/usr/bin/env bash
|
||||
# scripts/verify_phase13.sh - verify Phase 13 (l1-catalog-for-ecs).
|
||||
set -euo pipefail
|
||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$ROOT"
|
||||
|
||||
fail() { echo "FAIL: $*" >&2; exit 1; }
|
||||
|
||||
echo "=== Phase 13 verification ==="
|
||||
|
||||
# 1. All 6 new L1 directories exist with interface.json + README.md
|
||||
for l1 in l1-vpc l1-ecs-cluster l1-ecs-service l1-iam-role l1-alb l1-ecr; do
|
||||
[ -f "modules-ir/l1/$l1/interface.json" ] || fail "modules-ir/l1/$l1/interface.json missing"
|
||||
[ -f "modules-ir/l1/$l1/README.md" ] || fail "modules-ir/l1/$l1/README.md missing"
|
||||
done
|
||||
echo "L1 directories: OK (6 new + l1-s3)"
|
||||
|
||||
# 2. All 6 interface.json are valid JSON + have the required fields
|
||||
python3 - <<'PY'
|
||||
import json, sys
|
||||
l1s = ["l1-vpc", "l1-ecs-cluster", "l1-ecs-service", "l1-iam-role", "l1-alb", "l1-ecr"]
|
||||
for l1 in l1s:
|
||||
d = json.load(open(f"modules-ir/l1/{l1}/interface.json"))
|
||||
assert d["name"] == l1, f"{l1}: name mismatch"
|
||||
assert d["version"] == "1.0.0", f"{l1}: version not 1.0.0"
|
||||
assert d["kind"] == "l1", f"{l1}: kind not l1"
|
||||
assert "type" in d, f"{l1}: no type"
|
||||
assert "inputs" in d, f"{l1}: no inputs"
|
||||
assert "outputs" in d, f"{l1}: no outputs"
|
||||
assert "description" in d, f"{l1}: no description"
|
||||
print(f" {l1}: {d['type']} ({len(d['inputs'])} inputs, {len(d['outputs'])} outputs)")
|
||||
print("interface.json validation: OK")
|
||||
PY
|
||||
|
||||
# 3. Registry has all 7 L1s + l2-static-asset
|
||||
python3 - <<'PY'
|
||||
import json
|
||||
r = json.load(open("modules-ir/registry.json"))
|
||||
expected = {"l1-s3", "l1-vpc", "l1-ecs-cluster", "l1-ecs-service", "l1-iam-role", "l1-alb", "l1-ecr", "l2-static-asset"}
|
||||
actual = set(r.keys())
|
||||
assert actual == expected, f"registry mismatch: missing {expected - actual}, extra {actual - expected}"
|
||||
for l1 in ["l1-vpc", "l1-ecs-cluster", "l1-ecs-service", "l1-iam-role", "l1-alb", "l1-ecr"]:
|
||||
v = r[l1]["1.0.0"]
|
||||
assert v["deprecated"] is False, f"{l1}: not deprecated"
|
||||
assert v["interface"].endswith("interface.json"), f"{l1}: bad interface path"
|
||||
print("registry: OK (8 entries: 7 L1s + 1 L2)")
|
||||
PY
|
||||
|
||||
# 4. Adapter TYPE_MAP has all 12 IR types
|
||||
python3 - <<'PY'
|
||||
import sys
|
||||
sys.path.insert(0, ".")
|
||||
from adapters.terraform.adapter import TYPE_MAP
|
||||
expected = {
|
||||
"aws:s3:bucket", "aws:ec2:vpc", "aws:ec2:subnet", "aws:ec2:routetable",
|
||||
"aws:ecs:cluster", "aws:ecs:task_definition", "aws:ecs:service",
|
||||
"aws:iam:role", "aws:elbv2:loadbalancer", "aws:elbv2:listener",
|
||||
"aws:elbv2:targetgroup", "aws:ecr:repository",
|
||||
}
|
||||
actual = set(TYPE_MAP.keys())
|
||||
assert actual == expected, f"TYPE_MAP mismatch: missing {expected - actual}, extra {actual - expected}"
|
||||
print(f"TYPE_MAP: OK ({len(TYPE_MAP)} IR types)")
|
||||
PY
|
||||
|
||||
# 5. Adapter py_compiles
|
||||
python3 -m py_compile adapters/terraform/adapter.py || fail "adapter.py: py_compile failed"
|
||||
echo "adapter.py: py_compile OK"
|
||||
|
||||
# 6. S3 regression: the v1.1 spike L1 still adapts correctly
|
||||
WORK=/tmp/p13_verify
|
||||
rm -rf "$WORK"; mkdir -p "$WORK"
|
||||
python3 adapters/terraform/adapter.py modules-ir/l1/l1-s3/spike_instance.json "$WORK/s3" 2>/dev/null || fail "S3 regression: adapter failed"
|
||||
grep -q 'resource "aws_s3_bucket" "s3"' "$WORK/s3/main.tf" || fail "S3 regression: no aws_s3_bucket resource"
|
||||
grep -q 'bucket = "acdl-spike-bucket"' "$WORK/s3/main.tf" || fail "S3 regression: no bucket arg"
|
||||
grep -q "versioning" "$WORK/s3/main.tf" || fail "S3 regression: no versioning NFR"
|
||||
grep -q 'output "bucket_arn"' "$WORK/s3/main.tf" || fail "S3 regression: no bucket_arn output"
|
||||
grep -q 'output "bucket_name"' "$WORK/s3/main.tf" || fail "S3 regression: no bucket_name output"
|
||||
echo "S3 regression: OK (v1.1 spike l1-s3 adapts identically)"
|
||||
|
||||
# 7. Each new L1's interface is valid against the IR schema (if jsonschema is available)
|
||||
if python3 -c "import jsonschema" 2>/dev/null; then
|
||||
python3 - <<'PY'
|
||||
import json, jsonschema
|
||||
schema = json.load(open("schemas/ir.schema.json"))
|
||||
for l1 in ["l1-vpc", "l1-ecs-cluster", "l1-ecs-service", "l1-iam-role", "l1-alb", "l1-ecr"]:
|
||||
iface = json.load(open(f"modules-ir/l1/{l1}/interface.json"))
|
||||
# interface.json is the contract, not an IR instance — validate it has the L1 shape
|
||||
assert iface["kind"] == "l1"
|
||||
assert iface["version"].count(".") == 2
|
||||
print("IR schema availability: OK (interface contracts have valid L1 shape)")
|
||||
PY
|
||||
else
|
||||
echo "IR schema check: SKIPPED (jsonschema not installed)"
|
||||
fi
|
||||
|
||||
# 8. .ciagent/ consistency
|
||||
grep -q '"milestone": "v1.2"' .ciagent/config.json || fail "config.json: milestone not v1.2"
|
||||
echo ".ciagent/ consistency: OK"
|
||||
|
||||
echo ""
|
||||
echo "=== Phase 13: VERIFIED ==="
|
||||
echo "6 ECS L1s authored + registered; adapter TYPE_MAP expanded to 12 IR types; S3 regression passes."
|
||||
exit 0
|
||||
Executable
+100
@@ -0,0 +1,100 @@
|
||||
#!/usr/bin/env bash
|
||||
# scripts/verify_phase14.sh - verify Phase 14 (l2-microservice-and-contract-schema).
|
||||
set -euo pipefail
|
||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$ROOT"
|
||||
|
||||
fail() { echo "FAIL: $*" >&2; exit 1; }
|
||||
|
||||
echo "=== Phase 14 verification ==="
|
||||
|
||||
# 1. l2-microservice composition + README
|
||||
[ -f modules-ir/l2/l2-microservice/composition.json ] || fail "composition.json missing"
|
||||
[ -f modules-ir/l2/l2-microservice/README.md ] || fail "README.md missing"
|
||||
python3 -c "import json; d=json.load(open('modules-ir/l2/l2-microservice/composition.json')); assert d['name']=='l2-microservice'; assert d['kind']=='l2'; assert d['depth']==1; assert len(d['children'])==6, f'expected 6 children, got {len(d[\"children\"])}'; print('composition: OK (6 children)')"
|
||||
|
||||
# 2. Registry has l2-microservice
|
||||
python3 -c "import json; r=json.load(open('modules-ir/registry.json')); assert 'l2-microservice' in r; assert r['l2-microservice']['1.0.0']['deprecated']==False; print('registry: l2-microservice@1.0.0 OK')"
|
||||
|
||||
# 3. Contract schema extended (inputs allow objects + healthcheck field)
|
||||
python3 - <<'PY'
|
||||
import json
|
||||
s = json.load(open("schemas/contract.schema.json"))
|
||||
ap = s["properties"]["inputs"]["additionalProperties"]
|
||||
assert "object" in ap["type"], "inputs.additionalProperties doesn't allow object"
|
||||
assert "healthcheck" in s["properties"], "no healthcheck field"
|
||||
print("contract schema: OK (inputs allow objects + healthcheck field)")
|
||||
PY
|
||||
|
||||
# 4. contracts/microservice.yaml exists + validates
|
||||
[ -f contracts/microservice.yaml ] || fail "contracts/microservice.yaml missing"
|
||||
python3 - <<'PY'
|
||||
import yaml, json, jsonschema
|
||||
with open("contracts/microservice.yaml") as fh:
|
||||
c = yaml.safe_load(fh)
|
||||
assert c["stack"] == "l2-microservice", f"stack={c['stack']}"
|
||||
assert c["environment"] == "dev"
|
||||
assert "name" in c["inputs"]
|
||||
assert "image" in c["inputs"]
|
||||
assert "port" in c["inputs"]
|
||||
schema = json.load(open("schemas/contract.schema.json"))
|
||||
jsonschema.validate(c, schema)
|
||||
print("microservice.yaml: OK (validates against contract schema)")
|
||||
PY
|
||||
|
||||
# 5. Resolver + adapter py_compile
|
||||
python3 -m py_compile acdl_platform/contract_resolver.py adapters/terraform/adapter.py || fail "py_compile failed"
|
||||
echo "py_compile: OK"
|
||||
|
||||
# 6. v1.1 regression: spike.yaml still resolves + adapts
|
||||
WORK=/tmp/p14_verify
|
||||
rm -rf "$WORK"; mkdir -p "$WORK"
|
||||
python3 acdl_platform/contract_resolver.py contracts/spike.yaml "$WORK/spike_ir.json" 2>/dev/null || fail "v1.1 regression: resolver failed"
|
||||
python3 adapters/terraform/adapter.py "$WORK/spike_ir.json" "$WORK/spike_tf" 2>/dev/null || fail "v1.1 regression: adapter failed"
|
||||
grep -q 'resource "aws_s3_bucket" "s3"' "$WORK/spike_tf/main.tf" || fail "v1.1 regression: no aws_s3_bucket"
|
||||
grep -q 'bucket = "acdl-spike-bucket"' "$WORK/spike_tf/main.tf" || fail "v1.1 regression: no bucket arg"
|
||||
echo "v1.1 regression: OK (spike.yaml -> l1-s3 -> aws_s3_bucket)"
|
||||
|
||||
# 7. v1.2 resolution: microservice.yaml -> IR with all 6 L1s' resources
|
||||
python3 acdl_platform/contract_resolver.py contracts/microservice.yaml "$WORK/ms_ir.json" 2>/dev/null || fail "v1.2: resolver failed"
|
||||
python3 - <<'PY'
|
||||
import json
|
||||
ir = json.load(open("/tmp/p14_verify/ms_ir.json"))
|
||||
rsc = ir["resources"]
|
||||
print(f"v1.2 IR: {len(rsc)} resources")
|
||||
assert len(rsc) >= 6, f"expected >=6 resources, got {len(rsc)}"
|
||||
types = {r["type"] for r in rsc}
|
||||
expected_types = {"aws:ec2:vpc", "aws:ec2:subnet", "aws:ec2:routetable", "aws:ecs:cluster", "aws:ecr:repository", "aws:iam:role", "aws:elbv2:loadbalancer", "aws:elbv2:targetgroup", "aws:elbv2:listener", "aws:ecs:task_definition", "aws:ecs:service"}
|
||||
assert types == expected_types, f"missing types: {expected_types - types}, extra: {types - expected_types}"
|
||||
# Check child->child refs exist
|
||||
ref_found = False
|
||||
for r in rsc:
|
||||
for v in r.get("inputs", {}).values():
|
||||
if isinstance(v, str) and v.startswith("ref:"):
|
||||
ref_found = True
|
||||
break
|
||||
assert ref_found, "no child->child refs in IR"
|
||||
print(f" types: {sorted(types)}")
|
||||
print(" child->child refs: present")
|
||||
PY
|
||||
|
||||
# 8. v1.2 adaptation: IR -> TF
|
||||
python3 adapters/terraform/adapter.py "$WORK/ms_ir.json" "$WORK/ms_tf" 2>/dev/null || fail "v1.2: adapter failed"
|
||||
grep -q 'resource "aws_vpc"' "$WORK/ms_tf/main.tf" || fail "v1.2: no aws_vpc in TF"
|
||||
grep -q 'resource "aws_ecs_cluster"' "$WORK/ms_tf/main.tf" || fail "v1.2: no aws_ecs_cluster in TF"
|
||||
grep -q 'resource "aws_ecs_service"' "$WORK/ms_tf/main.tf" || fail "v1.2: no aws_ecs_service in TF"
|
||||
grep -q 'resource "aws_ecr_repository"' "$WORK/ms_tf/main.tf" || fail "v1.2: no aws_ecr_repository in TF"
|
||||
grep -q 'resource "aws_lb"' "$WORK/ms_tf/main.tf" || fail "v1.2: no aws_lb in TF"
|
||||
grep -q 'resource "aws_iam_role"' "$WORK/ms_tf/main.tf" || fail "v1.2: no aws_iam_role in TF"
|
||||
# Check ref translation (interpolations present)
|
||||
grep -q 'aws_ecs_cluster.cluster.arn' "$WORK/ms_tf/main.tf" || fail "v1.2: no cluster.arn interpolation"
|
||||
echo "v1.2 adaptation: OK (11 resources + interpolations in main.tf)"
|
||||
|
||||
# 9. .ciagent/ consistency
|
||||
grep -q '"milestone": "v1.2"' .ciagent/config.json || fail "config.json: milestone not v1.2"
|
||||
echo ".ciagent/ consistency: OK"
|
||||
|
||||
echo ""
|
||||
echo "=== Phase 14: VERIFIED ==="
|
||||
echo "l2-microservice composition (6 L1s); contract schema extended; resolver child->child wiring; 11 IR resources; TF valid."
|
||||
exit 0
|
||||
@@ -14,6 +14,14 @@ The inline policy is read from spike_runner_policy.json (next to this
|
||||
file). The account id + region are already substituted in the policy file
|
||||
for account 581513795199 + us-east-1; this script does not substitute
|
||||
further (the policy file is spike-specific).
|
||||
|
||||
Idempotent: re-running this script against an already-bootstrapped account
|
||||
exits 0 without duplicating resources. The IAM user is guarded by a
|
||||
get_user probe (skips creation if it exists), the inline policy is
|
||||
re-PUT on every run (PutUserPolicy overwrites in place), and the initial
|
||||
access key is created only when no active key exists (list_access_keys
|
||||
filters on Status=Active; if one is present the script returns without
|
||||
creating another, directing the operator to rotate_spike_key.sh).
|
||||
"""
|
||||
|
||||
import json
|
||||
|
||||
@@ -10,6 +10,15 @@ Run with the bootstrap root key in env:
|
||||
AWS_DEFAULT_REGION (defaults to us-east-1)
|
||||
|
||||
Writes terraform/bootstrap/.bootstrap_state.json (gitignored bookkeeping).
|
||||
|
||||
Idempotent: re-running this script against an already-bootstrapped account
|
||||
exits 0 without duplicating resources. The S3 state bucket is guarded by a
|
||||
head_bucket probe (skips creation if it exists), bucket versioning is
|
||||
re-PUT on every run (PutBucketVersioning is itself idempotent), and the
|
||||
DynamoDB outbox table is guarded by a describe_table probe (skips creation
|
||||
on ResourceNotFoundException). The bootstrap-state marker file is always
|
||||
overwritten with the current run's timestamp (it is bookkeeping, not a
|
||||
resource).
|
||||
"""
|
||||
|
||||
import datetime
|
||||
|
||||
@@ -37,6 +37,108 @@
|
||||
"Action": "sts:GetCallerIdentity",
|
||||
"Resource": "*"
|
||||
},
|
||||
{
|
||||
"Sid": "SpikeEcsReadWrite",
|
||||
"Effect": "Allow",
|
||||
"Action": [
|
||||
"ecs:CreateCluster",
|
||||
"ecs:DescribeCluster",
|
||||
"ecs:DeleteCluster",
|
||||
"ecs:CreateService",
|
||||
"ecs:DescribeService",
|
||||
"ecs:UpdateService",
|
||||
"ecs:DeleteService",
|
||||
"ecs:RegisterTaskDefinition",
|
||||
"ecs:DescribeTaskDefinition",
|
||||
"ecs:DeregisterTaskDefinition",
|
||||
"ecs:ListTasks",
|
||||
"ecs:DescribeTasks"
|
||||
],
|
||||
"Resource": "arn:aws:ecs:us-east-1:581513795199:*"
|
||||
},
|
||||
{
|
||||
"Sid": "SpikeEcrReadWrite",
|
||||
"Effect": "Allow",
|
||||
"Action": [
|
||||
"ecr:CreateRepository",
|
||||
"ecr:DescribeRepositories",
|
||||
"ecr:DeleteRepository",
|
||||
"ecr:GetAuthorizationToken",
|
||||
"ecr:BatchCheckLayerAvailability",
|
||||
"ecr:GetDownloadUrlForLayer",
|
||||
"ecr:BatchGetImage",
|
||||
"ecr:CompleteLayerUpload",
|
||||
"ecr:InitiateLayerUpload",
|
||||
"ecr:PutImage",
|
||||
"ecr:UploadLayerPart"
|
||||
],
|
||||
"Resource": "arn:aws:ecr:us-east-1:581513795199:*"
|
||||
},
|
||||
{
|
||||
"Sid": "SpikeElbReadWrite",
|
||||
"Effect": "Allow",
|
||||
"Action": [
|
||||
"elasticloadbalancing:CreateLoadBalancer",
|
||||
"elasticloadbalancing:DescribeLoadBalancers",
|
||||
"elasticloadbalancing:DeleteLoadBalancer",
|
||||
"elasticloadbalancing:CreateListener",
|
||||
"elasticloadbalancing:DescribeListeners",
|
||||
"elasticloadbalancing:DeleteListener",
|
||||
"elasticloadbalancing:CreateTargetGroup",
|
||||
"elasticloadbalancing:DescribeTargetGroups",
|
||||
"elasticloadbalancing:DeleteTargetGroup",
|
||||
"elasticloadbalancing:ModifyTargetGroupAttributes",
|
||||
"elasticloadbalancing:RegisterTargets",
|
||||
"elasticloadbalancing:DeregisterTargets"
|
||||
],
|
||||
"Resource": "arn:aws:elasticloadbalancing:us-east-1:581513795199:*"
|
||||
},
|
||||
{
|
||||
"Sid": "SpikeIamReadWrite",
|
||||
"Effect": "Allow",
|
||||
"Action": [
|
||||
"iam:CreateRole",
|
||||
"iam:GetRole",
|
||||
"iam:DeleteRole",
|
||||
"iam:PassRole",
|
||||
"iam:CreatePolicy",
|
||||
"iam:GetPolicy",
|
||||
"iam:DeletePolicy",
|
||||
"iam:AttachRolePolicy",
|
||||
"iam:DetachRolePolicy",
|
||||
"iam:ListRolePolicies",
|
||||
"iam:ListAttachedRolePolicies",
|
||||
"iam:PutRolePolicy"
|
||||
],
|
||||
"Resource": "arn:aws:iam::581513795199:*"
|
||||
},
|
||||
{
|
||||
"Sid": "SpikeEc2VpcReadWrite",
|
||||
"Effect": "Allow",
|
||||
"Action": [
|
||||
"ec2:CreateVpc",
|
||||
"ec2:DescribeVpcs",
|
||||
"ec2:DeleteVpc",
|
||||
"ec2:CreateSubnet",
|
||||
"ec2:DescribeSubnets",
|
||||
"ec2:DeleteSubnet",
|
||||
"ec2:CreateRouteTable",
|
||||
"ec2:DescribeRouteTables",
|
||||
"ec2:DeleteRouteTable",
|
||||
"ec2:AssociateRouteTable",
|
||||
"ec2:DisassociateRouteTable",
|
||||
"ec2:CreateInternetGateway",
|
||||
"ec2:DescribeInternetGateways",
|
||||
"ec2:DeleteInternetGateway",
|
||||
"ec2:AttachInternetGateway",
|
||||
"ec2:DetachInternetGateway",
|
||||
"ec2:CreateSecurityGroup",
|
||||
"ec2:DescribeSecurityGroups",
|
||||
"ec2:DeleteSecurityGroup",
|
||||
"ec2:AuthorizeSecurityGroupIngress"
|
||||
],
|
||||
"Resource": "arn:aws:ec2:us-east-1:581513795199:*"
|
||||
},
|
||||
{
|
||||
"Sid": "DenyEverythingElse",
|
||||
"Effect": "Deny",
|
||||
@@ -44,7 +146,12 @@
|
||||
"NotResource": [
|
||||
"arn:aws:s3:::acdl-tfstate-581513795199-us-east-1",
|
||||
"arn:aws:s3:::acdl-tfstate-581513795199-us-east-1/*",
|
||||
"arn:aws:dynamodb:us-east-1:581513795199:table/acdl-outbox"
|
||||
"arn:aws:dynamodb:us-east-1:581513795199:table/acdl-outbox",
|
||||
"arn:aws:ecs:us-east-1:581513795199:*",
|
||||
"arn:aws:ecr:us-east-1:581513795199:*",
|
||||
"arn:aws:elasticloadbalancing:us-east-1:581513795199:*",
|
||||
"arn:aws:iam::581513795199:*",
|
||||
"arn:aws:ec2:us-east-1:581513795199:*"
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
resource "aws_s3_bucket" "s3" {
|
||||
bucket = "acdl-spike-bucket"
|
||||
versioning {
|
||||
enabled = true
|
||||
}
|
||||
}
|
||||
|
||||
output "bucket_arn" {
|
||||
value = aws_s3_bucket.s3.arn
|
||||
}
|
||||
|
||||
output "bucket_name" {
|
||||
value = aws_s3_bucket.s3.id
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
provider "aws" {
|
||||
region = "us-east-1"
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
terraform {
|
||||
required_version = ">= 1.9, < 1.10"
|
||||
required_providers {
|
||||
aws = {
|
||||
source = "hashicorp/aws"
|
||||
version = "~> 5.0"
|
||||
}
|
||||
}
|
||||
backend "s3" {
|
||||
bucket = "acdl-tfstate-581513795199-us-east-1"
|
||||
key = "spike/l2-static-asset/terraform.tfstate"
|
||||
region = "us-east-1"
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user