Compare commits

...

15 Commits

Author SHA1 Message Date
Jon Chery 3d9dd06411 docs(P13): complete kyverno-kube-version-resolution phase (v1.13.16)
---ci---
project: acdl
phase: 13
milestone: v1.14
status: complete
requirements:
  covered: [REQ-147]
  partial: []
---/ci---
2026-07-29 21:07:10 +00:00
Jon Chery b257846981 docs(P12): complete gitignore-credential-hygiene phase (v1.13.15)
---ci---
project: acdl
phase: 12
milestone: v1.14
status: complete
requirements:
  covered: [REQ-146]
  partial: []
---/ci---
2026-07-29 21:00:34 +00:00
Jon Chery 986171a165 docs(P11): complete schema-input-validation-hardening phase (v1.13.14)
---ci---
project: acdl
phase: 11
milestone: v1.14
status: complete
requirements:
  covered: [REQ-145]
  partial: []
---/ci---
2026-07-29 20:57:56 +00:00
Jon Chery 099ed015ac docs(P10): complete contract-ingestor-identity-validation phase (v1.13.13)
---ci---
project: acdl
phase: 10
milestone: v1.14
status: complete
requirements:
  covered: [REQ-144]
  partial: []
---/ci---
2026-07-29 20:52:42 +00:00
Jon Chery cc97a9308d docs(P09): complete iam-policy-least-privilege phase (v1.13.12)
---ci---
project: acdl
phase: 9
milestone: v1.14
status: complete
requirements:
  covered: [REQ-143]
  partial: []
---/ci---
2026-07-29 20:49:36 +00:00
Jon Chery c2ca0e4631 docs(P08): complete account-id-externalization phase (v1.13.11)
---ci---
project: acdl
phase: 8
milestone: v1.14
status: complete
requirements:
  covered: [REQ-142]
  partial: []
---/ci---
2026-07-29 20:46:28 +00:00
Jon Chery 225de0f613 docs(P07): complete swallowed-error-hardening phase (v1.13.10)
---ci---
project: acdl
phase: 7
milestone: v1.14
status: complete
requirements:
  covered: [REQ-141]
  partial: []
---/ci---
2026-07-29 20:43:08 +00:00
Jon Chery 69d8496107 docs(P06): complete alb-name-prefix-fix phase (v1.13.9)
---ci---
project: acdl
phase: 6
milestone: v1.14
status: complete
requirements:
  covered: [REQ-140]
  partial: []
---/ci---
2026-07-29 20:38:14 +00:00
Jon Chery 1aa525f234 docs(P05): complete adapter-behavior-tests phase (v1.13.8)
---ci---
project: acdl
phase: 5
milestone: v1.14
status: complete
requirements:
  covered: [REQ-139]
  partial: []
---/ci---
2026-07-29 20:35:53 +00:00
Jon Chery 81f111d462 docs(P04): complete regression-gate-evidence-hardening phase (v1.13.7)
---ci---
project: acdl
phase: 4
milestone: v1.14
status: complete
requirements:
  covered: [REQ-138]
  partial: []
---/ci---
2026-07-29 20:32:59 +00:00
Jon Chery 79e7a4a304 docs(P03): complete lifecycle-script-arg-cleanup phase (v1.13.6)
---ci---
project: acdl
phase: 3
milestone: v1.14
status: complete
requirements:
  covered: [REQ-137]
  partial: []
---/ci---
2026-07-29 20:24:13 +00:00
Jon Chery 8ae307affc docs(P02): complete static-assets-wiring-fix phase (v1.13.5)
---ci---
project: acdl
phase: 2
milestone: v1.14
status: complete
requirements:
  covered: [REQ-136]
  partial: []
---/ci---
2026-07-29 20:21:12 +00:00
Jon Chery 6e1a1bd7db docs(P01): complete adapter-dedup-diagnostic phase (v1.13.4)
---ci---
project: acdl
phase: 1
milestone: v1.14
status: complete
requirements:
  covered: [REQ-135]
  partial: []
---/ci---
2026-07-29 20:17:55 +00:00
Jon Chery 040abc0fb7 docs(ship): v1.13.3 complete — v1.14 pre-execution phase shipped (Gitea release id 255)
---ci---
project: acdl
phase: 0
milestone: v1.14
status: complete
---/ci---
2026-07-29 20:14:30 +00:00
Jon Chery 71bd61ceb1 docs(P00): complete pre-execution phase — v1.14 NFR Refinement milestone established
Phase 0 (pre-execution) complete. All pre-execution stages shipped:
SPECIFY -> CLARIFY -> RESEARCH -> IDEATE -> PLAN -> GRILL.

Established v1.14 NFR Refinement milestone (20 execution phases + 1
final). NFR milestone — final patch IS the release. Tags on v1.13.x
line: v1.13.3 (this phase) -> v1.13.24 (P21 = milestone release).

6 grill binding decisions (G-101..G-106) applied to PLAN.md. 1
escalation (E-001) auto-resolved at full autonomy (D-101).

---ci---
project: acdl
phase: 0
milestone: v1.14
status: complete
---/ci---
2026-07-29 20:13:49 +00:00
34 changed files with 1647 additions and 130 deletions
+9 -6
View File
@@ -93,22 +93,25 @@ down to zero-cost steady state (P64, D-096).
- **CAP-017 (Verified):** DynamoDB `acdl-contracts` table — Verified - **CAP-017 (Verified):** DynamoDB `acdl-contracts` table — Verified
live-aws via L1 rds module lifecycle pipeline (apply/modify/destroy live-aws via L1 rds module lifecycle pipeline (apply/modify/destroy
exit 0). Evidence: regression registry CAP-017 (lifecycle-pipeline tier). exit 0). Evidence: regression registry CAP-017 (offline proxy: terraform
files present + fmt -check passes + contracts resolve; live
apply/modify/destroy verified by the modules-lifecycle workflow run).
- **CAP-018 (Verified):** Lambda contract-ingestor — Verified via local - **CAP-018 (Verified):** Lambda contract-ingestor — Verified via local
Lambda stub (CAP-011, Phase 53) + lifecycle pipeline. Evidence: Lambda stub (CAP-011, Phase 53) + lifecycle pipeline. Evidence:
regression registry CAP-018. regression registry CAP-018 (offline proxy).
- **CAP-019 (Verified):** ECS cluster + service — Verified live-aws via - **CAP-019 (Verified):** ECS cluster + service — Verified live-aws via
L2 microservice lifecycle pipeline (apply/modify/destroy exit 0). L2 microservice lifecycle pipeline (apply/modify/destroy exit 0).
Evidence: regression registry CAP-019. Evidence: regression registry CAP-019 (offline proxy).
- **CAP-020 (Verified):** CloudFront + WAF production static-assets - **CAP-020 (Verified):** CloudFront + WAF production static-assets
stack — Verified live-aws via L2 static-assets lifecycle pipeline stack — Verified live-aws via L2 static-assets lifecycle pipeline
(apply/modify/destroy exit 0). Evidence: regression registry CAP-020. (apply/modify/destroy exit 0). Evidence: regression registry CAP-020
(offline proxy).
- **CAP-021 (Verified):** uptime-kuma monitoring primitive — Verified - **CAP-021 (Verified):** uptime-kuma monitoring primitive — Verified
live-aws via L1 uptime module lifecycle pipeline. Evidence: regression live-aws via L1 uptime module lifecycle pipeline. Evidence: regression
registry CAP-021. registry CAP-021 (offline proxy).
- **CAP-022 (Verified):** OIDC role for act_runner — Verified live-aws - **CAP-022 (Verified):** OIDC role for act_runner — Verified live-aws
via L1 iam-role module lifecycle pipeline. Evidence: regression via L1 iam-role module lifecycle pipeline. Evidence: regression
registry CAP-022. registry CAP-022 (offline proxy).
All CAP-017..022 are now in the regression registry All CAP-017..022 are now in the regression registry
(`core/regression_verify.py`) with "lifecycle-pipeline" tier evidence (`core/regression_verify.py`) with "lifecycle-pipeline" tier evidence
+8
View File
@@ -0,0 +1,8 @@
{
"phase": 0,
"stage": "complete",
"milestone": "v1.14",
"phase_role": "pre_execution",
"attempts": 0,
"updated_at": "2026-07-29T20:30:00Z"
}
+53
View File
@@ -251,3 +251,56 @@ in weakened form; the adoption, architecture, and risks axes apply in full.
### Escalations ### Escalations
- **[G-005] risks** — 6 cloud capabilities (CAP-017..022: DynamoDB contracts table, Lambda contract-ingestor, ECS service live, CloudFront production stack, uptime-kuma, OIDC role) are deploy-unverified. The `acdl-spike-runner` IAM user cannot fix its own IAM (chicken-and-egg). Either re-bootstrap IAM with an admin principal to re-verify, or explicitly mark these 6 as "design-verified, deploy-unverified" in every leadership deck before the pitch. Resolves: project-killing risk (Axis 7 Q3). - **[G-005] risks** — 6 cloud capabilities (CAP-017..022: DynamoDB contracts table, Lambda contract-ingestor, ECS service live, CloudFront production stack, uptime-kuma, OIDC role) are deploy-unverified. The `acdl-spike-runner` IAM user cannot fix its own IAM (chicken-and-egg). Either re-bootstrap IAM with an admin principal to re-verify, or explicitly mark these 6 as "design-verified, deploy-unverified" in every leadership deck before the pitch. Resolves: project-killing risk (Axis 7 Q3).
- **[G-008] budget** — No cost documentation exists in `.ciagent/` despite live AWS resources (account 581513795199, CAP-013..016 verified). Either add a `COST.md` documenting monthly AWS spend, or explicitly document that ACDL runs at zero cloud cost (local emulators are the primary tier; live-AWS is a one-off spike per milestone). Resolves: financial-control gap (Axis 6 Q1-Q4). - **[G-008] budget** — No cost documentation exists in `.ciagent/` despite live AWS resources (account 581513795199, CAP-013..016 verified). Either add a `COST.md` documenting monthly AWS spend, or explicitly document that ACDL runs at zero cloud cost (local emulators are the primary tier; live-AWS is a one-off spike per milestone). Resolves: financial-control gap (Axis 6 Q1-Q4).
---
## Run: 2026-07-29 20:25 (mode: adversarial, focus: v1.14 NFR plan)
### Verdict: FEASIBLE WITH BINDING DECISIONS (confidence: 0.72)
The v1.14 milestone is a sound, well-evidenced NFR sweep with a genuine,
traceable backlog. Not fundamentally infeasible. Four binding decisions
close plan defects + unverified assumptions that would otherwise re-expose
the v1.11 4-VPC failure mode. One escalation (E-001) auto-resolved at full
autonomy with assumption logging.
### 9-Axis scores
| Axis | Confidence | Forcing question (short) |
|------|-----------|---------------------------|
| 1 Business | 0.80 | Real backlog (5 P1 + 4 P2 + 6 swallowed errors + 15+ hardcoded IDs); cancellation survivable but inherits decay risk |
| 2 Scope | 0.70 | User-directed + frozen; P13 has a hidden feature door (implement vs remove); P2 conditional-child edges past wiring |
| 3 Architecture | 0.62 | P8 grep unsatisfiable for backend blocks; P8 state-bucket continuity unguarded; P9 IAM naming unverified; P4/P8 file overlap |
| 4 People | 0.85 | Agentic single-operator; runtime availability is the key-person risk |
| 5 Timeline | 0.68 | No deadline; 20-phase unverified span is the longest since G-007; P8 is the latent multi-phase-rework risk |
| 6 Budget | 0.85 | NFR-only, no new AWS resources; P8 re-creation is a one-shot accident not structural cost |
| 7 Risks | 0.60 | A1 (acdl-* naming unverified), A2 (fallback constant unbound), A3 (P4 gate hardening); kill-risk = P8 orphans state |
| 8 Governance | 0.72 | Full autonomy; no mid-milestone stop trigger; per-phase "green" ≠ "capabilities Verified" |
| 9 Adoption | 0.70 | No external users; rollback is git-level for code, AWS-state rollback unaddressed if P8 misfires pre-detection |
### Binding Decisions
| ID | Axis | Decision | Confidence |
|----|------|----------|-----------|
| G-101 | architecture | P8 grep scope amended to exclude terraform `backend "s3"` blocks (bucket arg is static-config-only, evaluated pre-init; cannot reference `data.aws_caller_identity`). Resource ARNs in policy/code ARE externalized; backend blocks stay literal or move to `-backend-config` (separate change). | 0.80 |
| G-102 | risks | P8 must bind `ACDL_AWS_ACCOUNT_ID` fallback to the live account ID (not a placeholder) AND the lifecycle workflow (full-mode jobs) must set `ACDL_AWS_ACCOUNT_ID` from `aws sts get-caller-identity` before any lifecycle invocation. No full-mode run proceeds with the env unset. | 0.78 |
| G-103 | scope | P13 must take the removal+documentation path (remove `--kube-version` + document deferral to GitOps reconciler roadmap), NOT the implementation path. Implementing version-aware policy selection is a new feature, violating D-095. | 0.85 |
| G-104 | architecture | P9 must verify (grep/audit of `modules/l1/*/terraform/main.tf` + `modules/l2/*/composition.json`) that every IAM role + KMS key created by the lifecycle pipeline matches `acdl-*` prefix before merge. CloudFront + WAFv2 (CloudFront scope) remain `Resource: "*"` with a documented global-ARN constraint. | 0.70 |
| G-105 | governance | P4's regression-gate hardening must be validated by running the full regression gate immediately after P4 lands (not deferred to P21). Gate must pass clean post-P4 before W2 begins. | 0.70 |
| G-106 | governance | A mid-milestone regression-gate checkpoint is added after W2 (P12), before W3 begins. Gate runs offline (D-091); a non-Verified result halts W3 until fixed. Not a re-litigation of G-007 (per-phase stays deferred) — a single checkpoint at the natural seam after the security wave. | 0.65 |
### Escalations
- **[E-001] risks** — P8 state-bucket continuity re-exposes the v1.11 4-VPC
root cause. G-102 proposes a binding mitigation (bind fallback + wire env
into workflow), but the residual risk (a future full-mode lifecycle run
with a misconfigured env orphans live state and re-creates resources)
cannot be reduced below 0.20 by plan-level decisions alone. **Auto-
resolved at full autonomy (D-101):** accept the residual risk; G-102's
binding mitigation (fallback bound to live account ID + workflow env
wiring) is the control. The lifecycle pipeline defaults to plan-only
(REQ-134) — full-mode runs are workflow_dispatch only, reducing the
accident surface. If the user prefers zero residual risk, direct that
P8 exclude the state-bucket name from externalization entirely
(externalize only resource ARNs, leave the backend `bucket` literal).
Confidence 0.55; auto-resolved per `config.autonomy.level=full`.
+6 -2
View File
@@ -1,7 +1,7 @@
--- ---
project: acdl project: acdl
milestone: v1.11 milestone: v1.14
generated_at: 2026-07-28 generated_at: 2026-07-29
generator: lead-developer generator: lead-developer
verification_toolchain: verification_toolchain:
typecheck: "terraform validate && python3 -m py_compile core/**/*.py && python3 -m jsonschema schemas/*.schema.json" typecheck: "terraform validate && python3 -m py_compile core/**/*.py && python3 -m jsonschema schemas/*.schema.json"
@@ -18,6 +18,10 @@ verification_toolchain:
against live AWS. No per-module Python/pytest. This override is against live AWS. No per-module Python/pytest. This override is
documented here as the single source of truth; the ci-* agents read documented here as the single source of truth; the ci-* agents read
PERSONAS.md before running verification commands. PERSONAS.md before running verification commands.
v1.14 note: NFR-only milestone (bug fixes, security, tests, docs).
Roster carries forward from v1.11 unchanged. frontend-engineer stays
inactive (no frontend; decks are markdown = lead-developer
territory). No custom personas needed (no new domains).
--- ---
# ACDL — Persona Roster (project-level, v1.11 RESTART) # ACDL — Persona Roster (project-level, v1.11 RESTART)
+376 -38
View File
@@ -1,55 +1,393 @@
--- ---
phase: P65 phase: P0
name: rewrite-caps-decks name: pre-execution
milestone: v1.11 milestone: v1.14
requirements: [REQ-116, REQ-118] requirements: [REQ-135, REQ-136, REQ-137, REQ-138, REQ-139, REQ-140, REQ-141, REQ-142, REQ-143, REQ-144, REQ-145, REQ-146, REQ-147, REQ-148, REQ-149, REQ-150, REQ-151, REQ-152, REQ-153, REQ-154]
wave: 4 wave: 0
depends_on: [P64] depends_on: []
--- ---
# P65 — Rewrite Caps + Decks # v1.14 — NFR Refinement Plan (20 execution phases + 1 final)
**Phase:** P65 **Milestone:** v1.14 (NFR — bug fixes, security, stubs, tests, docs)
**Milestone:** v1.11 (RESTART) **Type:** NFR (all phases fix/test/docs/chore/refactor). Final patch IS
**Requirements:** REQ-116 (CAP-017..022 Verified), REQ-118 (decks rewritten) the release. Tags: `v1.13.3` (P0) → `v1.13.4..v1.13.23` (P1P20) →
**Wave:** 4 (final phase before COMPLETE) `v1.13.24` (P21 = milestone release).
**Branch:** `milestone/v1.11-restart` **Branch:** `milestone/v1.14-refinement``phase/NN-<slug>`
## Goal ## Wave ordering (D-098)
Rewrite CAPABILITY_INVENTORY.md, PROJECT.md §Capability Status, and both - **Wave 1 (P1P6):** bug fixes. P1→P2 sequential (composition depends
leadership decks: CAP-017..022 → "Verified live-aws via lifecycle pipeline; on dedup correctness); P3P6 independent. **G-105: full regression
torn down to zero-cost steady state." Remove the IAM-drift framing. Add gate run after P4** (validates the hardened gate before W2).
the cost appendix slide (P63) + pre-mortem reference (P64). `ci-doc-verifier` - **Wave 2 (P7P12):** security. P8→P9 sequential (IAM ARNs reference
confirms no stale "deploy-unverified" claims remain. externalized account ID); rest independent. **G-106: mid-milestone
regression-gate checkpoint after P12** (offline gate run; non-Verified
halts W3 until fixed).
- **Wave 3 (P13P17):** stub/test/CI/hygiene. P15 depends on P7
(hardened errors before script tests); P17 depends on P14 (both touch
config.json); P13 independent.
- **Wave 4 (P18P20):** standards/docs/VPC. P19 depends on P1P18
(reflects all prior phases); P18 + P20 independent.
## Tasks ## Execution approach
### Task 1 — Update CAPABILITY_INVENTORY.md Each phase: EXECUTE (persona-assigned task groups) → VERIFY (4 layers +
regression gate at milestone complete) → SHIP (patch tag). Phase
boundary checkpoint resets context. The execute workflow reads this
PLAN.md + ROADMAP.md §v1.14 + PERSONAS.md for task decomposition.
Mark CAP-017..022 as "Verified live-aws via lifecycle pipeline" (no longer ---
"not auto-verified"). Remove the IAM-drift framing. Reference the lifecycle
pipeline as the evidence source.
### Task 2 — Update PROJECT.md §Capability Status ## Wave 1 — Bug Fixes (P1P6)
Update the capability status section to reflect Verified status for ### P1 — adapter-dedup-diagnostic (REQ-135)
CAP-017..022. **Persona:** backend-engineer
**Territory:** `adapters/terraform/adapter.py`
**Tasks:**
1. In the dedup loop (`adapter.py:159-170`), when `tf_dir` is `None`,
raise `ValueError(f"no terraform_dir in registry for module
{module}")` instead of silently skipping.
2. Verify registered-module dedup behavior preserved (multi-resource L1s
still merge into one `module "x" { ... }` block).
3. Run `pytest tests/test_adapter.py` + `run_ci.sh`.
### Task 3 — Update decks (if present) ### P2 — static-assets-wiring-fix (REQ-136)
**Persona:** data-engineer
**Territory:** `modules/l2/static-assets/`
**Tasks:**
1. Wire `default_ttl`/`max_ttl`/`price_class`/`viewer_protocol_policy`
in `composition.json` to the cloudfront child's inputs.
2. Add a `waf_enabled` feature flag (default true) to the
static-assets composition; make the WAF child conditional on it.
3. Update `examples/complex.yml` to set `waf_enabled: true` + non-default
TTLs so it resolves to a different resource set than `simple.yml`.
4. Run `pytest` + `run_ci.sh`.
If leadership deck source files exist (PPTX/HTML/markdown), update them to ### P3 — lifecycle-script-arg-cleanup (REQ-137)
reflect verified-then-torn-down status. Add the cost appendix (P63) + **Persona:** backend-engineer
pre-mortem reference (P64). Remove stale "deploy-unverified" claims. **Territory:** `scripts/run_l2_lifecycle_*.sh`
**Tasks:**
1. Remove the `[ci-vpc-outputs.json]` token from the usage strings of
`run_l2_lifecycle_test.sh` + `run_l2_lifecycle_destroy.sh`, OR add a
comment documenting the L2-uses-remote-state design + parity reason.
2. Run `pytest` + `run_ci.sh`.
### Task 4 — ci-doc-verifier check ### P4 — regression-gate-evidence-hardening (REQ-138)
**Persona:** backend-engineer
**Territory:** `core/regression_verify.py`, `.ciagent/CAPABILITY_INVENTORY.md`
**Binding decisions:** G-105 (gate must pass clean post-P4 before W2)
**Tasks:**
1. Add a `terraform validate` step to
`_check_lifecycle_module_terraform` (or document why it's too slow +
fall back to a `terraform fmt -check` syntax probe).
2. Tighten CAPABILITY_INVENTORY + docstrings to "offline proxy; live
apply/modify/destroy verified by the modules-lifecycle workflow run,
not by this gate."
3. **Run the full regression gate immediately after P4 lands** (G-105).
Gate must pass clean before W2 begins.
4. Run `pytest` + `run_ci.sh`.
Run the doc-verifier to confirm no stale "deploy-unverified" claims remain ### P5 — adapter-behavior-tests (REQ-139)
in any .ciagent/ or deck files. **Persona:** backend-engineer
**Territory:** `tests/test_adapter.py`
**Tasks:**
1. Add `test_adapter_dedup_merges_same_module` — two resources with the
same `module` collapse to one `module "<first_id>" { ... }` block with
merged inputs.
2. Add `test_adapter_remote_state_key_override``ACDL_REMOTE_STATE_KEY`
overrides the default `platform/terraform.tfstate` key in the emitted
`data terraform_remote_state` block.
3. Run `pytest` + `run_ci.sh`.
## Success Criteria (phase gate) ### P6 — alb-name-prefix-fix (REQ-140)
**Persona:** data-engineer
**Territory:** `modules/l1/alb/terraform/main.tf`
**Tasks:**
1. Change `name_prefix = "tg-ci-"` to `name_prefix = "${var.name}-"` so
the consumer's name prefixes the target group.
2. Run `terraform validate` in the alb module dir standalone.
3. Run `pytest` + `run_ci.sh`.
1. CAPABILITY_INVENTORY + PROJECT reflect "Verified live-aws via lifecycle ---
pipeline; torn down to zero-cost."
2. `ci-doc-verifier` confirms no stale "deploy-unverified" claims. ## Wave 2 — Security (P7P12)
3. Full offline pytest suite green.
### P7 — swallowed-error-hardening (REQ-141)
**Persona:** backend-engineer
**Territory:** `core/local_emulators.py`, `core/lambda/contract_ingestor.py`,
`terraform/bootstrap/create_state_backend.py`, `core/output_publisher.py`,
`terraform/bootstrap/apply_iam_baseline.py`
**Tasks:**
1. `local_emulators.py:374` — narrow `except Exception: pass` to catch
`AttributeError`/`TypeError` (monkeypatch setup); log + re-raise if
patching fails (prevents network egress).
2. `contract_ingestor.py:157` — catch `urllib.error.URLError`/
`HTTPError` specifically; log the search failure; keep `existing = []`
only on `404`/network, re-raise on auth errors.
3. `create_state_backend.py:51` — catch `ClientError` with
`NoSuchBucket`/`404` error code; re-raise on permissions/network.
4. `output_publisher.py:100,168` — catch `ClientError`/`HTTPError`
specifically; log with context.
5. `apply_iam_baseline.py:78` — catch `NoSuchEntityException` on
old-version delete; re-raise on other errors.
6. Run `pytest` + `run_ci.sh`.
### P8 — account-id-externalization (REQ-142)
**Persona:** backend-engineer + data-engineer
**Territory:** `adapters/terraform/adapter.py`, `terraform/bootstrap/`,
`scripts/push_consumer_image.py`, terraform resource ARNs
**Binding decisions:** G-101 (grep excludes backend blocks), G-102
(fallback bound to live account ID + workflow env wiring)
**Tasks:**
1. `adapter.py:125,140` — read `ACDL_AWS_ACCOUNT_ID` env; build the
state-bucket name dynamically. **Fallback constant = `581513795199`**
(the live account ID, NOT a placeholder — G-102). Documented for
offline tests.
2. `apply_iam_baseline.py:33`, `create_state_backend.py:33,35` — read
from env (same fallback).
3. `push_consumer_image.py:32` — read from env.
4. Terraform: use `data.aws_caller_identity.current.account_id` for
**resource ARNs** in `spike_runner_policy.json` + resource names.
**Exclude terraform `backend "s3"` blocks** (`terraform/*/terraform.tf`,
`terraform/ci-vpc/main.tf`, `terraform/platform/main.tf`,
`terraform/microservice/terraform.tf`) — backend `bucket` args are
static-config-only, evaluated pre-init (G-101). Leave backend blocks
literal or move to `terraform init -backend-config` (separate change,
not in P8 scope).
5. **Lifecycle workflow env wiring (G-102):** the `modules-lifecycle.yml`
full-mode jobs must set `ACDL_AWS_ACCOUNT_ID` from
`aws sts get-caller-identity --query Account --output text` before
any `run_platform.sh`/lifecycle invocation. No full-mode run proceeds
with the env unset.
6. Run `pytest` + `run_ci.sh`; verify
`grep -rn "581513795199" adapters/ scripts/ terraform/bootstrap/ core/`
returns 0 hits (excluding tests + docs + terraform backend blocks).
### P9 — iam-policy-least-privilege (REQ-143)
**Persona:** data-engineer
**Territory:** `terraform/bootstrap/spike_runner_policy.json`,
`tests/test_iam_policy_baseline.py`, `modules/l1/*/terraform/main.tf`,
`modules/l2/*/composition.json`
**Binding decisions:** G-104 (verify acdl-* naming before merge)
**Tasks:**
1. Scope `iam:CreateRole` etc. (line 236) to
`arn:aws:iam::*:role/acdl-*`.
2. Scope KMS (line 218) to `arn:aws:kms::*:key/acdl-*` (or
`alias/acdl-*`).
3. CloudFront (line 117) + WAFv2 (line 129) remain `Resource: "*"` with
a documented global-ARN constraint (CloudFront ARNs are global;
cannot be account-scoped — G-104).
4. **Verify acdl-* naming (G-104):** grep/audit
`modules/l1/*/terraform/main.tf` + `modules/l2/*/composition.json`
for every IAM role + KMS key name created by the lifecycle pipeline.
If any non-`acdl-*` name is found, rename the resource or widen that
one statement (documented).
5. Add a regression test in `test_iam_policy_baseline.py` asserting no
new `Resource: "*"` on non-global actions.
6. Run `pytest` + `run_ci.sh`.
### P10 — contract-ingestor-identity-validation (REQ-144)
**Persona:** backend-engineer
**Territory:** `core/lambda/contract_ingestor.py`, `tests/test_contract_ingestor.py`
**Tasks:**
1. Add `contractId` format validation (regex, ≤64 chars).
2. Add `environment` enum validation (dev/qa/prod/dr).
3. Add `error` length cap (truncate `stackTrace` at a reasonable limit).
4. Document the ABAC reliance in the `_validate_caller_identity`
docstring + add a note to ARCHITECTURE.md (P19 will land it).
5. Add a spoofing-resistance test (caller submits a `consumerRepo` they
don't own → rejected if ABAC misconfigured; documented best-effort).
6. Run `pytest` + `run_ci.sh`.
### P11 — schema-input-validation-hardening (REQ-145)
**Persona:** backend-engineer
**Territory:** `schemas/contract.schema.json`, `schemas/environment.schema.json`,
`tests/test_environment_schema.py`, `tests/test_contract_schema.py`
**Tasks:**
1. Add `"additionalProperties": false` to both schemas' top-level
objects.
2. Add `maxItems`/`maxProperties` bounds to `infrastructure` map +
`monitored_endpoints` array.
3. Add `pattern` validation for `state_backend.bucket` (S3 naming
rules: lowercase, 3-63 chars, no underscores).
4. Add `pattern` validation for `runner_role_arn` (ARN format).
5. Add `pattern` validation for `vpc_cidr` (CIDR format).
6. Add tests asserting rejection of undocumented fields + malformed
values.
7. Run `pytest` + `run_ci.sh`.
### P12 — gitignore-credential-hygiene (REQ-146)
**Persona:** lead-developer
**Territory:** `.gitignore`, `tests/test_no_secrets_tracked.py`
**Tasks:**
1. Add credential-pattern catch-all to `.gitignore`:
`*.pem`, `*.key`, `*.p12`, `*.pfx`, `*.cer`, `*.crt`, `*.jks`.
2. Create `tests/test_no_secrets_tracked.py` — runs
`git ls-files | grep -E '\.(pem|key|p12|pfx|cer|crt|jks)$'` and
asserts 0 hits.
3. Run `pytest` + `run_ci.sh`.
---
## Wave 3 — Stub / Test / CI / Hygiene (P13P17)
### P13 — kyverno-kube-version-resolution (REQ-147)
**Persona:** backend-engineer
**Territory:** `adapters/kyverno/kyverno_adapter.py`, `tests/test_kyverno_adapter.py`
**Binding decisions:** G-103 (removal+documentation path, NOT implementation)
**Tasks:**
1. **Remove the `--kube-version` flag** from
`kyverno_adapter.py:11,115-116` (G-103 — implementing version-aware
policy selection would be a new feature, violating D-095).
2. Add a docstring documenting the deferral to the GitOps reconciler
roadmap (D-053): the Kyverno adapter is inactive for Terraform-only
stacks; `--kube-version` will be relevant when the GitOps reconciler
emits K8s manifests.
3. Update `test_kyverno_adapter.py` to remove the `--kube-version` test
cases + assert the flag is absent.
4. Run `pytest` + `run_ci.sh`.
### P14 — orphan-artifact-and-dead-config-cleanup (REQ-148)
**Persona:** lead-developer
**Territory:** `scripts/__pycache__/`, `pyproject.toml`, `.ciagent/config.json`
**Tasks:**
1. Delete the orphan
`scripts/__pycache__/verify_deploy_microservice.cpython-312.pyc`.
2. Fix `pyproject.toml` coverage source: `acdl_platform``core`.
3. Bump `pyproject.toml` version `1.3.0` → current (v1.14).
4. Remove dead JS allowlist entries from `config.json`
`bash_allowlist.allowed_commands` (npm/node/npx/pnpm/yarn/jest/eslint/
tsc/prettier — no package.json).
5. Run `pytest` + `run_ci.sh`.
### P15 — untested-scripts-coverage (REQ-149)
**Persona:** backend-engineer
**Territory:** `tests/` (new test files for 7 scripts)
**Tasks:**
1. `tests/test_seed_uptime_monitors.py` — mock the uptime-kuma API;
assert monitor creation from a JSON file.
2. `tests/test_push_consumer_image.py` — mock `subprocess.run` (docker
login/build/push) + boto3 ECR; assert the flow.
3. `tests/test_sync_to_gl.sh` (shell test) — dry-run mode; assert the
copy + push commands are constructed correctly.
4. `tests/test_post_stage_comment.sh` (shell test) — no-op when not in
a PR context; assert the `gh api` call structure when in PR.
5. `tests/test_rotate_spike_key.sh` (shell test) — mock `aws iam`;
assert deactivate/create/update-secret flow.
6. `tests/test_create_state_backend.py` — mock boto3 S3/DynamoDB;
assert idempotent creation.
7. `tests/test_create_iam_user.py` — mock boto3 IAM; assert idempotent
user/policy/key creation.
8. Run `pytest` + `run_ci.sh`.
### P16 — workflow-parity-and-script-flags (REQ-150)
**Persona:** backend-engineer
**Territory:** `.gitea/workflows/`, `scripts/rotate_spike_key.sh`,
`scripts/sync_to_gl.sh`
**Tasks:**
1. Either mirror the 4 GitHub-only workflows (patterns-plan,
platform-test, primitives-plan, release) to `.gitea/workflows/`, or
add a README documenting the Gitea limitation (Gitea runners don't
use release/primitives-plan/patterns-plan; release is GitHub-only by
design).
2. Add `set -euo pipefail` to `rotate_spike_key.sh` (currently only
`set -u`).
3. Add `set -euo pipefail` to `sync_to_gl.sh` (currently no `set`
flags).
4. Run `pytest` + `run_ci.sh`.
### P17 — config-and-persona-hygiene (REQ-151)
**Persona:** lead-developer
**Territory:** `.ciagent/config.json`, `.ciagent/PERSONAS.md`
**Tasks:**
1. Mark `frontend-engineer` persona `active: false` in `config.json`
`personas.personas[]` (PERSONAS.md:80 already says inactive).
2. Fix `branching_strategy: "phase"` — either change to `"flat"` or
document that the field is advisory + the project uses flat workflow
(committed directly to main per established convention).
3. Configure `ollama-cloud` backend: set `base_url` to the actual
endpoint OR add a comment documenting why it's intentionally unset
(the runtime uses the `glm-5.2` model via the opencode backend, not
the `llm_backends` config).
4. Run `pytest` + `run_ci.sh`.
---
## Wave 4 — Standards / Docs / VPC (P18P20)
### P18 — module-standards-consistency (REQ-152)
**Persona:** data-engineer
**Territory:** `modules/STANDARDS.md`, `modules/l1/{ecr,ecs-cluster,rds}/terraform/`
**Tasks:**
1. Either add `locals.tf` to `ecr`, `ecs-cluster`, `rds` (extract
inlined locals from `main.tf`), OR reconcile STANDARDS §9.4 to
explicitly allow inlining for trivial single-resource modules.
2. Remove the stale `TYPE_MAP` reference in STANDARDS §8 (deleted in
the v1.11 stateless rewrite).
3. Run `pytest` + `run_ci.sh`.
### P19 — documentation-sync-v1.14 (REQ-153)
**Persona:** lead-developer
**Territory:** `.ciagent/ARCHITECTURE.md`, `docs/`, `README.md`,
`.ciagent/COST.md`, `.ciagent/GRILL.md`, `.ciagent/IAM_POLICY.md`,
`docs/presentations/`
**Tasks:**
1. ARCHITECTURE.md: add v1.11 addendum (stateless adapter, platform VPC,
ACDL_LIFECYCLE_MODE), v1.12 addendum (CAP-013 fix, plan-only
default), v1.13 addendum (config.json schema migration, badge
cleanup, platform-architecture diagram), v1.14 addendum (all 20
phases). Record D-083 deferral explicitly.
2. Bump stale `@v1.6``@v1.9``@v1.13` across `README.md:225`,
`docs/consumer-guide.md` (12 sites), `docs/architecture.md:233`,
`docs/pipeline/versioning.md:29`, `docs/pipeline/index.md:42`.
3. Sync decks to v1.13.2 reality (version refs, capability claims).
4. Update COST.md window to v1.11v1.14 (lifecycle pipeline live-runs +
teardown).
5. Resolve G-005/G-008 in GRILL.md (CAP-017..022 now Verified via
lifecycle pipeline; COST.md now exists + covers v1.11+).
6. Update IAM_POLICY.md for v1.12/v1.13/v1.14 (plan-only default,
config.json schema, v1.14 IAM scoping from P9).
7. Run `pytest` + `run_ci.sh`; verify
`grep -rn "@v1\.[6-9]" docs/ README.md` returns 0 hits.
### P20 — platform-vpc-parameterization (REQ-154)
**Persona:** data-engineer
**Territory:** `terraform/platform/main.tf`
**Tasks:**
1. Add a `vpc_cidr` variable (default `10.0.0.0/16`); replace the
hardcoded `cidr_block`.
2. Replace `count = 2` subnets with
`count = length(data.aws_availability_zones.available.names)`.
3. Add a `data "aws_availability_zones" "available" {}` block.
4. Document the `0.0.0.0/0` ingress on port 80 (ALB-fronted, acceptable
for a public-facing service; add a comment).
5. Run `terraform validate` + `pytest` + `run_ci.sh`.
---
## Final Phase — P21 (review + audit + ship)
**Persona:** lead-developer (review coordination) + ci-code-reviewer +
ci-debugger (audit)
**Tasks:**
1. Multi-persona code review across all v1.14 phases (P1P20). Auto-apply
P0 fixes; flag P1+ for post-hoc review. If P1+ found, fix in-phase.
2. Audit: reconstruction test (git log vs `.ciagent/` files), file
discipline, branch hygiene, commit discipline. Fix critical issues
in-phase.
3. Complete: update REQUIREMENTS.md (REQ-135..154 → complete),
ROADMAP.md (v1.14 complete), PROJECT.md.
4. Tag `v1.13.24` (IS the milestone release). Merge
`milestone/v1.14-refinement``main`. Create Gitea release with full
milestone summary.
## Success Criteria (milestone gate)
1. All 20 REQ-135..REQ-154 marked complete in REQUIREMENTS.md.
2. Review: 0 new P0; all P1-1..P1-5 + P2-1..P2-4 resolved.
3. Audit: clean; reconstruction test passes.
4. Regression gate (D-091) clean against the v1.14 state.
5. `pytest` passes; `run_ci.sh` exits 0; `run_platform.sh --check-only`
exits 0.
6. Tag `v1.13.24` created; milestone merged to main.
+73
View File
@@ -839,3 +839,76 @@ sign-off (autonomy = full; all within locked constraints).
- **`actions/configure-aws-credentials` action on act_runner** — if - **`actions/configure-aws-credentials` action on act_runner** — if
unavailable, fall back to `aws sts assume-role-with-web-identity` from a unavailable, fall back to `aws sts assume-role-with-web-identity` from a
step. step.
## Objective for Milestone v1.14 (active — NFR Refinement)
Bug fixes, security posture improvements, stub/missing-functionality
identification + implementation, and documentation + NFR refinement across
the entire codebase. **No new features.** This is an NFR milestone — the
final phase's patch IS the deliverable (no separate milestone tag).
The v1.13 line shipped the presentation polish + config.json schema
migration + badge cleanup. The v1.11/v1.12 multi-persona reviews left a
backlog of P1/P2 findings (5 P1 + 4 P2 open in `REVIEW.md`), the codebase
has 6+ swallowed-error sites and 15+ hardcoded account-ID references, 7
scripts have no test coverage, the regression gate's CAP-017..022 evidence
is an offline proxy, ARCHITECTURE.md has no v1.11v1.13 addendum, and
consumer-facing docs reference stale `@v1.6``@v1.9` workflow tags. v1.14
clears all of it in a 20-phase sweep.
**Scope axes (user-directed, 2026-07-29):**
1. **Bug fixes** — clear all open P1/P2 findings from the v1.11 review
(adapter dedup silent drop, static-assets unwired inputs, lifecycle
script vestigial args, regression-gate offline-proxy evidence, ALB
name_prefix, missing unit tests).
2. **Security posture** — narrow 6 swallowed-`except` sites; externalize
the hardcoded account ID; scope 6 `Resource: "*"` IAM statements to
`acdl-*` ARNs; harden contract-ingestor identity validation; add
`additionalProperties: false` + format validation to schemas; add
credential-pattern catch-all to `.gitignore`.
3. **Stub / missing functionality** — resolve the discarded
`--kube-version` flag in the Kyverno adapter; clean up orphan bytecode
+ dead config.
4. **Documentation + NFR refinement** — ARCHITECTURE.md v1.11v1.14
addenda; bump stale `@v1.61.9``@v1.13` across 12+ sites; sync
decks/COST.md/GRILL G-005+G-008/IAM_POLICY.md; reconcile
modules/STANDARDS.md; record the D-083 audit-ledger deferral
explicitly.
5. **Test coverage** — add unit tests for 7 untested scripts + the
adapter dedup/remote-state-key behaviors.
**Out of scope (v1.14):**
- New features (feat phases). v1.14 is NFR-only.
- D-083 audit ledger build-out (S3 Object Lock + JWS + SQS DLQ + async
worker) — remains deferred; documented explicitly in ARCHITECTURE.md.
- Real OIDC federation (blocked on go-gitea/gitea#36988).
- Per-phase regression hardening (G-007, unchanged).
- Boto3 post-deploy verification probes (deferred to a future QA
milestone).
**Milestone type:** NFR (all phases are fix/test/docs/chore/refactor).
**Ship tag:** final phase patch on the v1.13.x line IS the release.
## Milestone v1.14 Phases
| Phase | Name | Goal |
|-------|------|------|
| 0 | pre-execution | SPECIFY → CLARIFY → RESEARCH → IDEATE → PLAN → GRILL. Establish v1.14 milestone shell; ideate finds the concrete requirements; plan decomposes into 20 execution phases. |
| 120 | execution | 20 phases of bug fixes, security hardening, stub resolution, test coverage, docs sync (wave-ordered). See ROADMAP.md §v1.14 for the phase list. |
| 21 | final-review-ship | Multi-persona review + audit + milestone ship (merge to main, tag final patch = release). |
## Key Decisions (v1.14)
Resolved at the CLARIFY stage (full autonomy — all within locked
constraints or user-directed scope). New v1.14 decisions (numbered
D-095+ to continue from v1.10's D-094):
| ID | Decision | Rationale | Outcome |
|----|----------|-----------|---------|
| D-095 | v1.14 is an NFR milestone (no feat phases); final patch IS the release. | User directed: "No new features, only bug fixes, security posture improvements, identifying stub and implement missing/lacking functionality, refine all documentation + NFRs." NFR model per branch-strategy.md:181 — progressive patches, final patch = deliverable, no separate milestone tag. | 20 execution phases (P1P20) + 1 final (P21). Tags v1.13.3 → v1.13.24. |
| D-096 | D-083 (audit ledger JWS + S3 Object Lock + SQS DLQ + async worker) remains deferred; documented explicitly in ARCHITECTURE.md (P19), not implemented. | User chose "Skip — keep D-083 deferred." Requires non-offline-testable AWS infra (Object Lock bucket, KMS signing key, SQS). The hash-chain + DynamoDB outbox remains the v1.14 audit record. | P14 (originally JWS) replaced with orphan-artifact-and-dead-config-cleanup. D-083 deferral recorded in P19. |
| D-097 | 20 execution phases is the target (not consolidated to ~10). | User chose "20 phases as planned." Finer ship granularity; longer milestone. G-007 (per-phase regression) accepted — regression gate runs at milestone COMPLETE. | 20 phases + 1 final = 21-phase milestone. |
| D-098 | Wave ordering: W1 (P1P6 bug fixes), W2 (P7P12 security), W3 (P13P17 stub/test/CI/hygiene), W4 (P18P20 standards/docs/VPC). | Prerequisite chains: P2 depends on P1 (composition needs correct dedup); P9 depends on P8 (IAM ARNs reference externalized account ID); P15 depends on P7 (script tests benefit from hardened errors); P17 depends on P14 (both touch config.json); P19 lands last (reflects all prior phases). | 4 sequential waves; phases within a wave are independent (parallelizable when parallelization.enabled=true). |
| D-099 | `--ideate` flag: run the IDEATE stage between RESEARCH and PLAN (per ideate.md:218). The ideation tiers mine the 50 `partial:` + 16 `lessons:` + 3 `escalation:` + 16 `decisions:` git-native signals to validate/enrich the 20-phase scope. | User invoked with `--ideate`. The v1.14 scope is already user-directed (20 phases defined), so IDEATE acts as validation + enrichment, not scope discovery. Accepted ideas become IDEATE-NN IDs appended to REQUIREMENTS.md. | IDEATE stage runs; interactive validation gate (accept/skip/modify). |
| D-100 | Accept all 20 ideation findings as the v1.14 requirement set (REQ-135..REQ-154). | User accepted all 20 at the interactive validation gate. Mechanical + backend-enriched tiers confirmed the user-directed scope. | 20 REQs locked; PLAN.md formalizes the task decomposition. |
| D-101 | E-001 (P8 state-bucket continuity residual risk) auto-resolved at full autonomy: accept the residual risk. G-102's binding mitigation (fallback bound to live account ID + workflow env wiring) is the control. The lifecycle pipeline defaults to plan-only (REQ-134) — full-mode runs are workflow_dispatch only, reducing the accident surface. | Grill escalation E-001 (confidence 0.55) re-exposes the v1.11 4-VPC root cause. At full autonomy, auto-decide with assumption logging. The residual risk (misconfigured env at live-run time) is runtime-dependent, not plan-resolvable. If the user prefers zero residual risk, direct that P8 exclude the state-bucket name from externalization entirely. | E-001 resolved; G-102 binding decision enforced in PLAN.md P8. |
+103
View File
@@ -610,3 +610,106 @@ two probe fixes required to make the deck claims true.
backwards-sequencing failure mode (PRE_MORTEM.md FM-3). backwards-sequencing failure mode (PRE_MORTEM.md FM-3).
- New capability claims beyond what v1.11 verified. - New capability claims beyond what v1.11 verified.
- Per-phase regression hardening (G-007, unchanged). - Per-phase regression hardening (G-007, unchanged).
---
## Milestone v1.14 — NFR Refinement (REQ-135..REQ-154)
**Objective:** Bug fixes, security posture improvements, stub/missing-
functionality identification + implementation, and documentation + NFR
refinement across the entire codebase. **No new features.** NFR milestone
— the final phase's patch IS the deliverable.
The v1.11 multi-persona review left 5 P1 + 4 P2 findings open; the
codebase has 6+ swallowed-error sites, 15+ hardcoded account-ID
references, 7 untested scripts, an offline-proxy regression gate,
ARCHITECTURE.md with no v1.11v1.13 addendum, and consumer-facing docs
referencing stale `@v1.6``@v1.9` workflow tags. v1.14 clears all of it
in a 20-phase sweep.
### Requirements
- **REQ-135** — The adapter dedup loop raises `ValueError` for
unregistered-module resources instead of silently dropping them (P1-1).
(Phase P1)
- **REQ-136** — The static-assets L2 composition wires `default_ttl`/
`max_ttl`/`price_class`/`viewer_protocol_policy` and makes WAF
conditional via `waf_enabled`, so `complex.yml` is a real modify (P1-2).
(Phase P2)
- **REQ-137** — The L2 lifecycle scripts' usage strings no longer
advertise the vestigial `[ci-vpc-outputs.json]` arg, or document the
remote-state design (P1-3). (Phase P3)
- **REQ-138** — The regression gate's CAP-017..022 checks run
`terraform validate` (not just file-existence + resolver); the
offline-proxy caveat is documented honestly (P1-5). (Phase P4)
- **REQ-139** — Unit tests for adapter dedup merge behavior +
`ACDL_REMOTE_STATE_KEY` override exist and pass (P2-2). (Phase P5)
- **REQ-140** — The ALB target group `name_prefix` derives from `var.name`
(P2-1). (Phase P6)
- **REQ-141** — 6 over-broad `except ...: pass` sites narrowed to specific
exceptions; errors logged with context. (Phase P7)
- **REQ-142** — The hardcoded account ID `581513795199` is externalized to
`ACDL_AWS_ACCOUNT_ID` env / `data.aws_caller_identity` across 15+ sites.
(Phase P8)
- **REQ-143** — 6 `Resource: "*"` IAM statements scoped to `acdl-*` ARNs;
regression test asserts the scoping. (Phase P9)
- **REQ-144** — The contract ingestor validates `contractId`/`environment`/
`error`; ABAC reliance documented; spoofing-resistance test passes.
(Phase P10)
- **REQ-145** — `contract.schema.json` + `environment.schema.json` reject
undocumented fields (`additionalProperties: false`); format validation
for bucket/ARN/CIDR. (Phase P11)
- **REQ-146** — `.gitignore` has a credential-pattern catch-all;
`test_no_secrets_tracked.py` passes. (Phase P12)
- **REQ-147** — The Kyverno `--kube-version` flag is either implemented or
removed with a documented deferral rationale. (Phase P13)
- **REQ-148** — Orphan bytecode + dead config cleaned (orphan `.pyc`,
stale coverage source, stale version, dead JS allowlist). (Phase P14)
- **REQ-149** — 7 untested scripts have unit test coverage (≥1 test each).
(Phase P15)
- **REQ-150** — Gitea workflow parity resolved; `rotate_spike_key.sh` +
`sync_to_gl.sh` have `set -euo pipefail`. (Phase P16)
- **REQ-151** — `config.json` persona block + branching strategy +
ollama-cloud backend aligned with PERSONAS.md + actual runtime.
(Phase P17)
- **REQ-152** — `modules/STANDARDS.md` internally consistent; no stale
`TYPE_MAP` reference. (Phase P18)
- **REQ-153** — ARCHITECTURE.md has v1.11v1.14 addenda; stale `@v1.61.9`
`@v1.13`; GRILL G-005/G-008 resolved; COST.md window covers v1.11v1.14;
D-083 deferral recorded. (Phase P19)
- **REQ-154** — Platform VPC CIDR is a variable; subnet count is
data-driven; `0.0.0.0/0` ingress documented. (Phase P20)
### v1.14 Traceability
| Requirement | Phase | Status |
|-------------|-------|--------|
| REQ-135 | P1 | pending |
| REQ-136 | P2 | pending |
| REQ-137 | P3 | pending |
| REQ-138 | P4 | pending |
| REQ-139 | P5 | pending |
| REQ-140 | P6 | pending |
| REQ-141 | P7 | pending |
| REQ-142 | P8 | pending |
| REQ-143 | P9 | pending |
| REQ-144 | P10 | pending |
| REQ-145 | P11 | pending |
| REQ-146 | P12 | pending |
| REQ-147 | P13 | pending |
| REQ-148 | P14 | pending |
| REQ-149 | P15 | pending |
| REQ-150 | P16 | pending |
| REQ-151 | P17 | pending |
| REQ-152 | P18 | pending |
| REQ-153 | P19 | pending |
| REQ-154 | P20 | pending |
### Out of Scope (v1.14)
- New features (feat phases). v1.14 is NFR-only.
- D-083 audit ledger build-out (S3 Object Lock + JWS + SQS DLQ + async
worker) — remains deferred; documented explicitly in ARCHITECTURE.md.
- Real OIDC federation (blocked on go-gitea/gitea#36988).
- Per-phase regression hardening (G-007, unchanged).
- Boto3 post-deploy verification probes (deferred to a future QA
milestone).
+176
View File
@@ -693,3 +693,179 @@ A6 section to both talking-points files.
- **D-109** — Decks use `@v1.11` in examples during Phase 68 (current - **D-109** — Decks use `@v1.11` in examples during Phase 68 (current
state), bumped to `@v1.12` at Phase 70 complete after the tag exists. state), bumped to `@v1.12` at Phase 70 complete after the tag exists.
Avoids a dangling reference to a tag that doesn't exist yet. Avoids a dangling reference to a tag that doesn't exist yet.
---
## v1.14 Research Addendum — NFR Refinement scope audit (2026-07-29)
> Phase 0 RESEARCH for milestone v1.14 (NFR Refinement). A full codebase
> survey (8 categories, file:line evidence) was conducted to populate the
> 20-phase scope. This addendum records the findings; the phase list is
> in ROADMAP.md §v1.14; the requirements are in REQUIREMENTS.md §v1.14.
### Survey method
Read-only survey of `/root/acdl` at v1.13.2 (HEAD `139224ff`, 533 tests
collected). 8 categories: stubs, P1/P2 backlog, security, docs drift,
test gaps, terraform gaps, workflow gaps, config hygiene. All file:line
references verified against the live codebase.
### Finding 1 — Open P1/P2 backlog (REVIEW.md v1.11)
5 P1 + 4 P2 findings from the v1.11 multi-persona review remain open:
| ID | File:Line | Status | v1.14 phase |
|----|-----------|--------|-------------|
| P1-1 | `adapter.py:159-170` (silent drop of unregistered-module resources) | open | P1 |
| P1-2 | `static-assets/composition.json` (unwired cloudfront inputs; WAF unconditional) | open | P2 |
| P1-3 | `run_l2_lifecycle_*.sh` (vestigial `[ci-vpc-outputs.json]` arg) | open | P3 |
| P1-4 | `CAPABILITY_INVENTORY.md:9-16` (summary table stale) | **fixed** (now 22/22) | — |
| P1-5 | `regression_verify.py:432-519` (CAP-017..022 offline proxy, no `terraform validate`) | open | P4 |
| P2-1 | `alb/main.tf:9` (`name_prefix="tg-ci-"` discards `var.name`) | open | P6 |
| P2-2 | `test_adapter.py` (no dedup-merge or remote-state-key test) | open | P5 |
| P2-3 | `waf/complex.yml` + `locals.tf` (redundant `upper()` + uppercase example) | open (post-hoc) | folded into P2 |
| P2-4 | `COST.md:106` (account ID published; accepted exposure) | open (post-hoc) | folded into P8 (centralize code-side) |
### Finding 2 — Security posture gaps
**Swallowed errors (6 sites):**
- `core/local_emulators.py:374``except Exception: pass` in
`_fake_urlopen`; if patching fails, urlopen stays real → network
egress. [SEC] → P7.
- `core/lambda/contract_ingestor.py:157` — GitHub search failure →
`existing = []` → duplicate issues. → P7.
- `terraform/bootstrap/create_state_backend.py:51` — over-broad
`except Exception:` on `head_bucket` → spurious `create_bucket` on
permissions/network errors. → P7.
- `core/output_publisher.py:100,168` — SSM/GitHub failure → silent
`None`/`False`. → P7.
- `terraform/bootstrap/apply_iam_baseline.py:78` — over-broad on
old-version delete. → P7.
**Hardcoded account ID `581513795199` (15+ sites):**
`adapter.py:125,140`, `apply_iam_baseline.py:33`,
`create_state_backend.py:33,35`, `push_consumer_image.py:32`, terraform
state-bucket names, ECR image ref. → P8 (externalize to
`ACDL_AWS_ACCOUNT_ID` / `data.aws_caller_identity`).
**IAM policy wildcards (6 `Resource: "*"` statements):**
`spike_runner_policy.json` — cloudfront (line 117), wafv2 (129), kms
(218), iam (236). KMS allows key creation/deletion on ANY key; IAM
allows role creation on ANY role. → P9 (scope to `acdl-*` ARNs).
**Contract-ingestor identity validation gap:**
`contract_ingestor.py:221-245``_validate_caller_identity` validates
`consumerRepo` format only; doesn't verify caller owns the repo (ABAC
reliance). No `contractId`/`environment`/`error` validation. → P10.
**Schema validation gaps:**
`contract.schema.json` + `environment.schema.json` — no
`additionalProperties: false` (undocumented fields pass silently); no
format validation for bucket/ARN/CIDR. → P11.
**Credential hygiene:**
`.gitignore` covers `.env*`/`*.tfstate*` but no credential-pattern
catch-all (`*.pem`/`*.key`/`*.p12`). → P12.
**Audit ledger integrity (D-083):**
`audit_ledger_design.md:47-70` — JWS + Object Lock + DLQ deferred. Per
D-096, stays deferred; documented in P19. The hash-chain + DynamoDB
outbox is the v1.14 audit record.
### Finding 3 — Stubs / missing functionality
- `adapters/kyverno/kyverno_adapter.py:11,115-116``--kube-version`
parsed then discarded (`_ = kube_version`). → P13 (implement or
remove + document).
- `scripts/__pycache__/verify_deploy_microservice.cpython-312.pyc`
orphan bytecode for a deleted source file. → P14.
- `core/regression_verify.py:237` — DynamoDB write deferred to Phase 54
(outbox hash-chain verified, no real DynamoDB write). Accepted
deferral.
- `adapters/wiz/wiz_adapter.py` — real GraphQL client (not a stub);
degrades gracefully. OK.
- `core/separation_of_duties.py``route_halt_artifact` is real (SNS +
outbox fallback). OK.
- `core/lambda/contract_ingestor.py``report_error` is real (GitHub
issues via Secrets Manager). OK.
### Finding 4 — Documentation drift
- `ARCHITECTURE.md` — no v1.11/v1.12/v1.13/v1.14 addendum; line 500-506
still describes the **old** parameterized adapter (pre-stateless
rewrite). → P19.
- Stale `@v1.6``@v1.9` workflow refs in `README.md:225`,
`docs/consumer-guide.md` (12 sites), `docs/architecture.md:233`,
`docs/pipeline/versioning.md:29`, `docs/pipeline/index.md:42`. → P19.
- `modules/STANDARDS.md` §8 references `TYPE_MAP` (deleted in v1.11);
§9.4 requires 5-file split but §489-492 allows inlining —
inconsistent. → P18.
- `COST.md` window stops at v1.10; no v1.11v1.13 spend. → P19.
- `GRILL.md` G-005/G-008 escalations — CAP-017..022 now Verified via
lifecycle pipeline; COST.md now exists. → P19 (mark resolved).
- `IAM_POLICY.md` — reflects v1.11 re-bootstrap but not v1.12/v1.13.
→ P19.
- Decks reference "v1.12" verification status; not re-synced for
v1.13.2. → P19.
### Finding 5 — Test coverage gaps
- 533 tests collected; 5 `@pytest.mark.slow` (deselected from fast
suite). 7 scripts with no test: `seed_uptime_monitors.py`,
`push_consumer_image.py`, `sync_to_gl.sh`, `post_stage_comment.sh`,
`rotate_spike_key.sh`, `create_state_backend.py`,
`create_iam_user.py`. → P15.
- Adapter dedup-merge + `ACDL_REMOTE_STATE_KEY` override — no unit
test (P2-2). → P5.
### Finding 6 — Terraform gaps
- 3 L1 modules lack `locals.tf` (`ecr`, `ecs-cluster`, `rds`). → P18.
- `static-assets/composition.json` unwired inputs (P1-2). → P2.
- `terraform/platform/main.tf:255` — hardcoded CIDR; `count=2` subnets
not data-driven. → P20.
- `terraform/bootstrap/create_state_backend.py:51` — over-broad
except (Finding 2). → P7.
### Finding 7 — Workflow / pipeline gaps
- 4 GitHub-only workflows (patterns-plan, platform-test,
primitives-plan, release) — no Gitea mirror. → P16.
- `rotate_spike_key.sh` (only `set -u`), `sync_to_gl.sh` (no `set`
flags). → P16.
- 3 shared workflows (ci, deploy, modules-lifecycle) byte-identical
(verified). OK.
- modules-lifecycle matrix covers all 12 L1 + 2 L2. OK.
### Finding 8 — Config / project hygiene
- `config.json` bash_allowlist has dead JS entries (npm/node/jest/eslint
/tsc — no package.json). → P14/P17.
- `config.json` `branching_strategy: "phase"` mismatched with
flat-workflow practice. → P17.
- `config.json` `ollama-cloud.base_url: ""` (empty; no `glm` model
configured). → P17.
- `config.json` `frontend-engineer` persona still in `personas[]`
(PERSONAS.md:80 says inactive). → P17.
- `pyproject.toml` version `1.3.0` (stale); coverage source
`acdl_platform` (renamed to `core` in v1.6). → P14.
### Persona assessment (v1.14)
The v1.14 milestone is NFR-only (bug fixes, security, tests, docs). The
active persona roster from v1.11 (PERSONAS.md) carries forward
unchanged:
- **lead-developer** (active) — coordination; owns the wave ordering +
cross-phase dependencies.
- **backend-engineer** (active) — owns `adapters/`, `core/` (adapter
dedup, contract ingestor, regression gate, output publisher).
- **data-engineer** (active) — owns `terraform/`, `modules/` (ALB fix,
static-assets wiring, platform VPC, IAM policy, STANDARDS).
- **frontend-engineer** (inactive) — no frontend; decks are markdown
(lead-developer territory). Stays deactivated per PERSONAS.md:80.
No custom personas needed for v1.14 (no new domains). Territory
enforcement = `warn` (config.json:167). The v1.14 work is concentrated
in `adapters/`, `core/`, `terraform/`, `scripts/`, `tests/`, `docs/`,
`.ciagent/` — all within existing persona territories.
+372
View File
@@ -1060,3 +1060,375 @@ NFR patch (docs-only). Two presentation changes across both leadership decks
total) synced. Both HTML decks re-rendered via Marp. total) synced. Both HTML decks re-rendered via Marp.
Docs-only NFR patch (no code changes). Docs-only NFR patch (no code changes).
---
## v1.14 (active — NFR Refinement: bug fixes, security, stubs, tests, docs)
The v1.14 milestone is a 20-phase NFR sweep — no new features. It clears
the open P1/P2 backlog from the v1.11 review, hardens the security
posture (swallowed errors, hardcoded account ID, IAM wildcards, schema
validation, credential hygiene), resolves stub/missing functionality
(Kyverno `--kube-version`, orphan artifacts), adds test coverage for 7
untested scripts, and refines all documentation (ARCHITECTURE.md
v1.11v1.14 addenda, stale `@v1.61.9``@v1.13` refs, COST.md/GRILL/
IAM_POLICY.md sync, STANDARDS.md reconciliation).
**Milestone type:** NFR (all phases fix/test/docs/chore/refactor). The
final phase's patch IS the release — no separate milestone tag. Tags run
on the v1.13.x line: `v1.13.3` (P0) → `v1.13.4..v1.13.23` (P1P20) →
`v1.13.24` (P21 final = milestone release).
**Wave ordering:**
- Wave 1 (P1P6): bug fixes — P1 before P2 (composition depends on dedup
correctness); P3P6 independent.
- Wave 2 (P7P12): security — P8 before P9 (externalized account ID for
IAM ARNs); rest independent.
- Wave 3 (P13P17): stub/test/CI/hygiene — P15 benefits from P7 landing
first; P17 after P14 (both touch config.json).
- Wave 4 (P18P20): standards/docs/VPC — P19 last (reflects all prior
phases).
### Phase P1 — adapter-dedup-diagnostic (Wave 1)
- **Description:** Fix P1-1 from the v1.11 review. The adapter dedup loop
(`adapters/terraform/adapter.py:159-170`) silently drops resources whose
module is not in the registry — a typo'd `module` field vanishes without
diagnostic. Raise `ValueError` (preserving the pre-dedup contract) so the
misconfiguration surfaces instead of being silently omitted.
- **Status:** pending
- **Depends on:**
- **Requirements:** REQ-135
- **Success Criteria:**
- A resource with `module: nonexistent@1.0.0` raises `ValueError` with a
descriptive message, not a silent drop.
- Existing registered-module dedup behavior preserved (multi-resource L1s
still merge into one `module "x" { ... }` block).
- `pytest` passes; `run_ci.sh` exits 0.
### Phase P2 — static-assets-wiring-fix (Wave 1)
- **Description:** Fix P1-2. `modules/l2/static-assets/composition.json`
drops `default_ttl`/`max_ttl`/`price_class`/`viewer_protocol_policy`
(accepted by `cloudfront/interface.json` but never wired) and WAF is
unconditionally present (no `features`/conditional). Wire the cloudfront
inputs; make WAF conditional via a `waf_enabled` feature flag so
`examples/complex.yml` is a real modify (adds CDN + WAF), not a no-op
re-apply.
- **Status:** pending
- **Depends on:** [P1]
- **Requirements:** REQ-136
- **Success Criteria:**
- `complex.yml` resolves to a resource set that differs from `simple.yml`
(WAF + CDN TTLs present when `waf_enabled: true`, absent when false).
- The L2 static-assets lifecycle cell's "modify" step exercises a real
terraform diff, not idempotent re-apply.
- `pytest` passes; `run_ci.sh` exits 0.
### Phase P3 — lifecycle-script-arg-cleanup (Wave 1)
- **Description:** Fix P1-3. `scripts/run_l2_lifecycle_test.sh` and
`run_l2_lifecycle_destroy.sh` advertise `[ci-vpc-outputs.json]` ($3) in
their usage strings but never read it (the L2 path uses
`terraform_remote_state`, not the file). Remove the vestigial arg or
document that the L2 path uses remote state and the arg is
accepted-but-ignored for workflow-argument parity with the L1 scripts.
- **Status:** pending
- **Depends on:**
- **Requirements:** REQ-137
- **Success Criteria:**
- Usage strings no longer advertise a feature the scripts don't provide,
OR a comment explains the L2-uses-remote-state design + parity reason.
- `pytest` passes; `run_ci.sh` exits 0.
### Phase P4 — regression-gate-evidence-hardening (Wave 1)
- **Description:** Fix P1-5. `core/regression_verify.py:432-519`
CAP-017..022 checks are offline proxies (files exist + contracts
resolve) — a module with broken HCL would pass as long as files exist.
Add a `terraform validate` step to
`_check_lifecycle_module_terraform` so at least HCL syntax is verified
at the gate. Tighten the CAPABILITY_INVENTORY wording to "offline proxy;
live apply/modify/destroy verified by the modules-lifecycle workflow
run, not by this gate."
- **Status:** pending
- **Depends on:**
- **Requirements:** REQ-138
- **Success Criteria:**
- `_check_lifecycle_module_terraform` runs `terraform validate` (or
documents why it's too slow + falls back to a syntax probe).
- CAPABILITY_INVENTORY + docstrings reflect the offline-proxy caveat
honestly.
- `pytest` passes; `run_ci.sh` exits 0.
### Phase P5 — adapter-behavior-tests (Wave 1)
- **Description:** Fix P2-2. Add `test_adapter_dedup_merges_same_module`
(two resources with the same `module` collapse to one
`module "<first_id>" { ... }` block with merged inputs) and
`test_adapter_remote_state_key_override` (`ACDL_REMOTE_STATE_KEY`
overrides the default `platform/terraform.tfstate` key in the emitted
`data terraform_remote_state` block).
- **Status:** pending
- **Depends on:** [P1]
- **Requirements:** REQ-139
- **Success Criteria:**
- Both unit tests exist in `tests/test_adapter.py` and pass.
- `pytest` count increases; `run_ci.sh` exits 0.
### Phase P6 — alb-name-prefix-fix (Wave 1)
- **Description:** Fix P2-1. `modules/l1/alb/terraform/main.tf:9` uses
`name_prefix = "tg-ci-"` (hardcoded literal) which discards `var.name`
entirely — the target group name is non-configurable and inconsistent
with the LB name. Change to `name_prefix = "${var.name}-"` so the
consumer's name prefixes the target group while preserving uniqueness.
- **Status:** pending
- **Depends on:**
- **Requirements:** REQ-140
- **Success Criteria:**
- Target group `name_prefix` derives from `var.name`.
- `terraform validate` passes for the alb module standalone.
- `pytest` passes; `run_ci.sh` exits 0.
### Phase P7 — swallowed-error-hardening (Wave 2)
- **Description:** Narrow 6 over-broad `except ...: pass`/`except
Exception:` sites: `core/local_emulators.py:374` (fake_urlopen swallow
→ network egress risk if patching fails), `core/lambda/contract_ingestor.py:157`
(GitHub search failure → duplicate issues),
`terraform/bootstrap/create_state_backend.py:51` (over-broad → spurious
create_bucket), `core/output_publisher.py:100,168`,
`terraform/bootstrap/apply_iam_baseline.py:78`. Catch specific
`ClientError`/`NoSuch*` exceptions; log + re-raise where silent failure
masks a real defect.
- **Status:** pending
- **Depends on:**
- **Requirements:** REQ-141
- **Success Criteria:**
- No bare `except Exception: pass` remains in the targeted files (grep
clean for the 6 sites).
- Specific exception types caught; errors logged with context.
- `pytest` passes; `run_ci.sh` exits 0.
### Phase P8 — account-id-externalization (Wave 2)
- **Description:** Externalize the hardcoded account ID `581513795199`
from 15+ sites: `adapters/terraform/adapter.py:125,140`,
`terraform/bootstrap/apply_iam_baseline.py:33`,
`terraform/bootstrap/create_state_backend.py:33,35`,
`scripts/push_consumer_image.py:32`, terraform state-bucket names, ECR
image refs. Read from `ACDL_AWS_ACCOUNT_ID` env (code) /
`data.aws_caller_identity` (terraform); fall back to env for offline.
Keep the COST.md account ID (accepted exposure per P2-4) but centralize
the code-side.
- **Status:** pending
- **Depends on:**
- **Requirements:** REQ-142
- **Success Criteria:**
- `grep -rn "581513795199" adapters/ scripts/ terraform/ core/` returns
0 hits (excluding tests + docs).
- `ACDL_AWS_ACCOUNT_ID` env read with a clear default/fallback.
- `pytest` passes; `run_ci.sh` exits 0.
### Phase P9 — iam-policy-least-privilege (Wave 2)
- **Description:** Scope 6 `Resource: "*"` statements in
`terraform/bootstrap/spike_runner_policy.json` (cloudfront, wafv2, kms,
iam) to `acdl-*` ARNs. Scope `iam:CreateRole` etc. to
`arn:aws:iam::...:role/acdl-*`; scope KMS to
`arn:aws:kms:...:key/acdl-*`; narrow CloudFront/WAF where possible.
Add a regression test asserting no new `Resource:"*"` on non-global
actions.
- **Status:** pending
- **Depends on:** [P8]
- **Requirements:** REQ-143
- **Success Criteria:**
- `Resource: "*"` remains only on actions that require it (sts, ce).
- IAM/KMS/CloudFront/WAF scoped to `acdl-*` ARNs.
- Regression test in `tests/test_iam_policy_baseline.py` asserts the
scoping.
- `pytest` passes; `run_ci.sh` exits 0.
### Phase P10 — contract-ingestor-identity-validation (Wave 2)
- **Description:** Harden `core/lambda/contract_ingestor.py:221-245`
`_validate_caller_identity` — currently best-effort (validates
`consumerRepo` format only, doesn't verify the caller owns the repo).
Add `contractId` format validation, `environment` enum validation,
`error` length cap. Document the ABAC reliance explicitly. Add a
spoofing-resistance test.
- **Status:** pending
- **Depends on:**
- **Requirements:** REQ-144
- **Success Criteria:**
- `contractId`, `environment`, `error` validated; malformed input
rejected with 400.
- ABAC reliance documented in the function docstring + ARCHITECTURE.md.
- Spoofing-resistance test in `tests/test_contract_ingestor.py` passes.
- `pytest` passes; `run_ci.sh` exits 0.
### Phase P11 — schema-input-validation-hardening (Wave 2)
- **Description:** Add `additionalProperties: false` to
`schemas/contract.schema.json` + `schemas/environment.schema.json`
(currently allows undocumented fields silently). Add `maxItems`/
`maxProperties` bounds. Validate `state_backend.bucket` S3 naming
rules, `runner_role_arn` ARN format, `vpc_cidr` CIDR format. Add tests
asserting rejection of malformed input.
- **Status:** pending
- **Depends on:**
- **Requirements:** REQ-145
- **Success Criteria:**
- Both schemas reject undocumented top-level fields.
- Format validation (bucket/ARN/CIDR) rejects malformed values.
- New tests in `tests/test_environment_schema.py` +
`tests/test_contract_schema.py` pass.
- `pytest` passes; `run_ci.sh` exits 0.
### Phase P12 — gitignore-credential-hygiene (Wave 2)
- **Description:** `.gitignore` covers `.env*`/`*.tfstate*` but lacks a
credential-pattern catch-all (`*.pem`/`*.key`/`*.p12`/`*.pfx`). Add
credential patterns. Add `tests/test_no_secrets_tracked.py` asserting no
credential-looking file is tracked by git.
- **Status:** pending
- **Depends on:**
- **Requirements:** REQ-146
- **Success Criteria:**
- `.gitignore` has credential-pattern catch-all.
- `test_no_secrets_tracked.py` passes (grep `git ls-files` for
credential patterns → 0 hits).
- `pytest` passes; `run_ci.sh` exits 0.
### Phase P13 — kyverno-kube-version-resolution (Wave 3)
- **Description:** Resolve the discarded `--kube-version` flag in
`adapters/kyverno/kyverno_adapter.py:11,115-116` (`_ = kube_version`).
Either implement version-aware policy selection (select policies by k8s
version) or remove the flag and document why it's deferred to the
GitOps reconciler roadmap. Resolve the ambiguity either way.
- **Status:** pending
- **Depends on:**
- **Requirements:** REQ-147
- **Success Criteria:**
- `--kube-version` is either used (version-aware policy selection) or
removed with a documented deferral rationale.
- `tests/test_kyverno_adapter.py` updated to match.
- `pytest` passes; `run_ci.sh` exits 0.
### Phase P14 — orphan-artifact-and-dead-config-cleanup (Wave 3)
- **Description:** Clean up orphan artifacts + dead config: the orphan
`scripts/__pycache__/verify_deploy_microservice.cpython-312.pyc` (source
deleted in v1.11); stale `pyproject.toml` coverage source
`acdl_platform``core` (renamed in v1.6); `pyproject.toml` version
`1.3.0` → current; dead JS allowlist entries in `config.json`
(npm/node/jest/eslint/tsc — no package.json).
- **Status:** pending
- **Depends on:**
- **Requirements:** REQ-148
- **Success Criteria:**
- No orphan `.pyc` for a deleted source file.
- `pyproject.toml` coverage source = `core`; version = current.
- `config.json` bash_allowlist has no JS-only entries.
- `pytest` passes; `run_ci.sh` exits 0.
### Phase P15 — untested-scripts-coverage (Wave 3)
- **Description:** Add unit tests for 7 scripts with no test coverage:
`scripts/seed_uptime_monitors.py`, `scripts/push_consumer_image.py`,
`scripts/sync_to_gl.sh`, `scripts/post_stage_comment.sh`,
`scripts/rotate_spike_key.sh`, `terraform/bootstrap/create_state_backend.py`,
`terraform/bootstrap/create_iam_user.py`. Mock boto3/subprocess for
offline-testable coverage. Add `--check-only`/dry-run modes where
missing.
- **Status:** pending
- **Depends on:** [P7]
- **Requirements:** REQ-149
- **Success Criteria:**
- Each of the 7 scripts has a corresponding test file with ≥1 passing
test.
- `pytest` count increases by ≥7; `run_ci.sh` exits 0.
### Phase P16 — workflow-parity-and-script-flags (Wave 3)
- **Description:** 4 GitHub-only workflows (patterns-plan, platform-test,
primitives-plan, release) have no Gitea mirror — either mirror them or
document the Gitea limitation. Fix `scripts/rotate_spike_key.sh` (only
`set -u`, no `-e`/`pipefail`) and `scripts/sync_to_gl.sh` (no `set`
flags at all) — add `set -euo pipefail`.
- **Status:** pending
- **Depends on:**
- **Requirements:** REQ-150
- **Success Criteria:**
- Gitea workflow parity resolved (mirrored or documented).
- `rotate_spike_key.sh` + `sync_to_gl.sh` have `set -euo pipefail`.
- `pytest` passes; `run_ci.sh` exits 0.
### Phase P17 — config-and-persona-hygiene (Wave 3)
- **Description:** Fix `config.json` hygiene: `branching_strategy: "phase"`
mismatch with flat-workflow practice; empty `ollama-cloud` base_url (no
`glm` model configured); `frontend-engineer` persona `active: false` in
config.json (PERSONAS.md:80 already says inactive). Align config.json
with PERSONAS.md + actual runtime.
- **Status:** pending
- **Depends on:** [P14]
- **Requirements:** REQ-151
- **Success Criteria:**
- `config.json` persona block matches PERSONAS.md (frontend-engineer
inactive).
- `branching_strategy` reflects actual practice (or documented).
- `ollama-cloud` backend configured or documented as intentionally
unset.
- `pytest` passes; `run_ci.sh` exits 0.
### Phase P18 — module-standards-consistency (Wave 4)
- **Description:** 3 L1 modules (`ecr`, `ecs-cluster`, `rds`) lack
`locals.tf`; `modules/STANDARDS.md` §9.4 requires the full 5-file split
but §489-492 allows inlining — internally inconsistent. Either add
`locals.tf` to all 3 or reconcile STANDARDS §9.4 with the inline
allowance. Remove the stale `TYPE_MAP` reference in §8 (deleted in the
v1.11 stateless rewrite).
- **Status:** pending
- **Depends on:**
- **Requirements:** REQ-152
- **Success Criteria:**
- STANDARDS.md internally consistent (§8 + §9.4 agree).
- No stale `TYPE_MAP` reference.
- `pytest` passes; `run_ci.sh` exits 0.
### Phase P19 — documentation-sync-v1.14 (Wave 4)
- **Description:** ARCHITECTURE.md: add v1.11/v1.12/v1.13/v1.14 addenda
(stateless adapter, platform VPC, ACDL_LIFECYCLE_MODE, all v1.14
changes; record D-083 deferral explicitly). Bump stale `@v1.61.9`
`@v1.13` across `README.md`, `docs/consumer-guide.md` (12 sites),
`docs/architecture.md`, `docs/pipeline/`. Sync decks to v1.13.2 reality.
Update COST.md window to v1.11v1.14. Resolve G-005/G-008 in GRILL.md
(CAP-017..022 now Verified via lifecycle pipeline; COST.md now exists +
covers v1.11+). Update IAM_POLICY.md for v1.12/v1.13/v1.14.
- **Status:** pending
- **Depends on:** [P1-P18]
- **Requirements:** REQ-153
- **Success Criteria:**
- ARCHITECTURE.md has v1.11v1.14 addenda; D-083 deferral recorded.
- `grep -rn "@v1\.[6-9]" docs/ README.md` returns 0 hits (bumped to
@v1.13).
- GRILL G-005/G-008 marked resolved with evidence.
- COST.md window covers v1.11v1.14.
- `pytest` passes; `run_ci.sh` exits 0.
### Phase P20 — platform-vpc-parameterization (Wave 4)
- **Description:** `terraform/platform/main.tf:255` hardcodes
`cidr_block = "10.0.0.0/16"` (not `var.vpc_cidr`); `count = 2` subnets
hardcoded (not data-driven AZs). Parameterize; document the
`0.0.0.0/0` ingress on port 80 (ALB-fronted, acceptable but should be
explicit).
- **Status:** pending
- **Depends on:**
- **Requirements:** REQ-154
- **Success Criteria:**
- VPC CIDR is a variable (default `10.0.0.0/16`); subnet count is
data-driven (`length(data.aws_availability_zones.available)`).
- `0.0.0.0/0` ingress documented.
- `terraform validate` passes; `pytest` passes; `run_ci.sh` exits 0.
### Phase P21 — final-review-ship (Final Phase)
- **Description:** Multi-persona code review across all v1.14 phases.
Audit (reconstruction test, file discipline, branch hygiene, commit
discipline). Complete: update REQUIREMENTS.md (REQ-135..154 marked
complete), ROADMAP.md (v1.14 complete), PROJECT.md. Tag final patch
`v1.13.24` (IS the milestone release). Merge `milestone/v1.14``main`.
- **Status:** pending
- **Depends on:** [P1-P20]
- **Requirements:**
- **Success Criteria:**
- Review: 0 new P0; all P1-1..P1-5 + P2-1..P2-4 resolved.
- Audit: clean; reconstruction test passes.
- Tag `v1.13.24` created; milestone merged to main.
After Phase P21: milestone COMPLETE — `v1.13.24` IS the v1.14 release.
+1
View File
@@ -8,6 +8,7 @@
], ],
"active_project": "acdl", "active_project": "acdl",
"active_projects": ["acdl"], "active_projects": ["acdl"],
"active_milestone": "v1.14",
"autonomy": { "autonomy": {
"level": "full", "level": "full",
"escalation_hooks": ["deploy", "delete_data", "merge_to_main"], "escalation_hooks": ["deploy", "delete_data", "merge_to_main"],
+10
View File
@@ -19,3 +19,13 @@ terraform/bootstrap/.bootstrap_state.json
**/.terraform.lock.hcl **/.terraform.lock.hcl
**/tfplan **/tfplan
**/*.tfstate* **/*.tfstate*
# Credential patterns (v1.14, REQ-146)
*.pem
*.key
*.p12
*.pfx
*.cer
*.crt
*.jks
*.keystore
+8 -13
View File
@@ -8,13 +8,16 @@ v1.9 (REQ-111): the translator is fleshed out — full PolicyReport →
PolicyCheckResult mapping with severity + skip-with-reason handling. It PolicyCheckResult mapping with severity + skip-with-reason handling. It
remains inactive for Terraform-only stacks (guard preserved emits a remains inactive for Terraform-only stacks (guard preserved emits a
single SKIPPED `KYVERNO_INACTIVE_TF_STACK` record when no K8s manifests). single SKIPPED `KYVERNO_INACTIVE_TF_STACK` record when no K8s manifests).
A `--kube-version` stub is parsed but not yet used (for future GitOps). A `--kube-version` flag was previously parsed but never used. It has been
removed (v1.14, G-103) to resolve the stub. Version-aware policy selection
will be added when the GitOps reconciler emits K8s manifests (D-053
roadmap). The adapter is inactive for Terraform-only stacks today.
D-053: the platform emits Terraform, not K8s manifests. This adapter D-053: the platform emits Terraform, not K8s manifests. This adapter
activates when the GitOps reconciler (roadmap) emits K8s manifests. activates when the GitOps reconciler (roadmap) emits K8s manifests.
Sample policies are included as documentation at adapters/kyverno/policies/. Sample policies are included as documentation at adapters/kyverno/policies/.
CLI: kyverno_adapter.py <policyreport.json> <contract-id> [--kube-version <ver>] CLI: kyverno_adapter.py <policyreport.json> <contract-id>
""" """
import datetime import datetime
@@ -100,7 +103,7 @@ def _emit_inactive_tf(contract_id):
} }
def adapt(policyreport_json_path, contract_id, kube_version=None): def adapt(policyreport_json_path, contract_id):
with open(policyreport_json_path, "r", encoding="utf-8") as fh: with open(policyreport_json_path, "r", encoding="utf-8") as fh:
data = json.load(fh) data = json.load(fh)
out = [] out = []
@@ -112,8 +115,6 @@ def adapt(policyreport_json_path, contract_id, kube_version=None):
out.append(_to_pcr(entry, contract_id)) out.append(_to_pcr(entry, contract_id))
if not out: if not out:
out.append(_emit_inactive_tf(contract_id)) out.append(_emit_inactive_tf(contract_id))
# kube_version is parsed but not yet used (future GitOps reconciler).
_ = kube_version
return out return out
@@ -123,14 +124,8 @@ def adapt_inactive(contract_id):
if __name__ == "__main__": if __name__ == "__main__":
kube_ver = None
args = sys.argv[1:] args = sys.argv[1:]
if "--kube-version" in args:
idx = args.index("--kube-version")
if idx + 1 < len(args):
kube_ver = args[idx + 1]
args = args[:idx] + args[idx + 2:]
if len(args) != 2: if len(args) != 2:
print("usage: kyverno_adapter.py <policyreport.json> <contract-id> [--kube-version <ver>]", file=sys.stderr) print("usage: kyverno_adapter.py <policyreport.json> <contract-id>", file=sys.stderr)
sys.exit(2) sys.exit(2)
print(json.dumps(adapt(args[0], args[1], kube_version=kube_ver), indent=2)) print(json.dumps(adapt(args[0], args[1]), indent=2))
+4 -2
View File
@@ -112,6 +112,8 @@ def adapt(stack_instance, out_dir):
stack_name = stack.get("name", "spike") stack_name = stack.get("name", "spike")
environment = stack.get("environment", "dev") environment = stack.get("environment", "dev")
account_id = os.environ.get("ACDL_AWS_ACCOUNT_ID", "581513795199")
state_bucket = f"acdl-tfstate-{account_id}-us-east-1"
terraform_tf = ( terraform_tf = (
'terraform {\n' 'terraform {\n'
' required_version = ">= 1.9, < 1.10"\n' ' required_version = ">= 1.9, < 1.10"\n'
@@ -122,7 +124,7 @@ def adapt(stack_instance, out_dir):
' }\n' ' }\n'
' }\n' ' }\n'
' backend "s3" {\n' ' backend "s3" {\n'
' bucket = "acdl-tfstate-581513795199-us-east-1"\n' f' bucket = "{state_bucket}"\n'
f' key = "spike/{stack_name}/{environment}/terraform.tfstate"\n' f' key = "spike/{stack_name}/{environment}/terraform.tfstate"\n'
' region = "us-east-1"\n' ' region = "us-east-1"\n'
' }\n' ' }\n'
@@ -137,7 +139,7 @@ def adapt(stack_instance, out_dir):
'data "terraform_remote_state" "platform" {\n' 'data "terraform_remote_state" "platform" {\n'
' backend = "s3"\n' ' backend = "s3"\n'
' config = {\n' ' config = {\n'
' bucket = "acdl-tfstate-581513795199-us-east-1"\n' f' bucket = "{state_bucket}"\n'
f' key = "{remote_state_key}"\n' f' key = "{remote_state_key}"\n'
' region = "us-east-1"\n' ' region = "us-east-1"\n'
' }\n' ' }\n'
+42 -11
View File
@@ -17,6 +17,7 @@ requests. The invoke policy is scoped via ABAC (consumer repo identity).
import datetime import datetime
import json import json
import os import os
import urllib.error
import urllib.parse import urllib.parse
import boto3 import boto3
@@ -154,7 +155,16 @@ def _report_error(payload):
with urllib.request.urlopen(req, timeout=10) as resp: with urllib.request.urlopen(req, timeout=10) as resp:
search_result = json.loads(resp.read()) search_result = json.loads(resp.read())
existing = search_result.get("items", []) existing = search_result.get("items", [])
except Exception: except urllib.error.HTTPError as e:
if e.code == 404:
existing = []
else:
import sys
print(f"WARNING: GitHub issue search failed (HTTP {e.code}): {e}", file=sys.stderr)
existing = []
except urllib.error.URLError as e:
import sys
print(f"WARNING: GitHub issue search network error: {e}", file=sys.stderr)
existing = [] existing = []
body = f"""## Deploy Failure Report body = f"""## Deploy Failure Report
@@ -228,21 +238,42 @@ def _validate_caller_identity(event, payload):
If the identity is not available (e.g. local testing or non-IAM auth), the If the identity is not available (e.g. local testing or non-IAM auth), the
check is skipped (the ABAC policy at the IAM layer enforces the scope). check is skipped (the ABAC policy at the IAM layer enforces the scope).
v1.14 (REQ-144): also validates contractId format, environment enum, and
error length. The ABAC reliance is documented here: the Function URL IAM
identity does not expose principal tags in the event, so full enforcement
of consumerRepo ownership is at the IAM layer (ABAC via
aws:PrincipalTag/acdl:owner). This function validates format only, not
ownership.
""" """
identity = event.get("requestContext", {}).get("identity", {}) identity = event.get("requestContext", {}).get("identity", {})
caller_arn = identity.get("userArn", "") caller_arn = identity.get("userArn", "")
if not caller_arn: if not caller_arn:
return # no identity available — rely on IAM ABAC enforcement pass # no identity available — rely on IAM ABAC enforcement
payload_repo = payload.get("consumerRepo", "") payload_repo = payload.get("consumerRepo", "")
if not payload_repo: if payload_repo:
return # consumerRepo must be org/repo format, <=128 chars
# Extract the session name or principal tag from the ARN. The ABAC policy if "/" not in payload_repo or len(payload_repo) > 128:
# scopes via aws:PrincipalTag/acdl:owner = <consumerRepo>. The Function URL raise ValueError(f"invalid consumerRepo format: {payload_repo!r}")
# IAM identity does not expose principal tags in the event, so we do a
# best-effort check: the consumerRepo must not be empty and must be a valid # v1.14 (REQ-144): contractId format validation
# repo identifier (org/repo format). Full enforcement is at the IAM layer. contract_id = payload.get("contractId", "")
if "/" not in payload_repo or len(payload_repo) > 128: if contract_id:
raise ValueError(f"invalid consumerRepo format: {payload_repo!r}") import re
if not re.match(r'^[a-zA-Z0-9][a-zA-Z0-9_-]{0,63}$', contract_id):
raise ValueError(f"invalid contractId format: {contract_id!r} (alphanumeric, hyphen, underscore; max 64 chars)")
# v1.14 (REQ-144): environment enum validation
environment = payload.get("environment", "")
if environment:
valid_envs = {"dev", "qa", "prod", "dr"}
if environment not in valid_envs:
raise ValueError(f"invalid environment: {environment!r} (must be one of {valid_envs})")
# v1.14 (REQ-144): error length cap (for report_error action)
error_msg = payload.get("error", "")
if error_msg and len(str(error_msg)) > 10000:
payload["error"] = str(error_msg)[:10000]
def _validate_change_request(payload): def _validate_change_request(payload):
+3 -2
View File
@@ -371,8 +371,9 @@ class LocalLambdaStub:
return _FakeResponse( return _FakeResponse(
json.dumps([{"number": 1, "title": "stub"}]).encode()) json.dumps([{"number": 1, "title": "stub"}]).encode())
urllib.request.urlopen = _fake_urlopen urllib.request.urlopen = _fake_urlopen
except Exception: except (AttributeError, TypeError) as e:
pass import sys
print(f"WARNING: could not patch urlopen for local Lambda stub: {e}", file=sys.stderr)
try: try:
event = { event = {
+7 -3
View File
@@ -97,8 +97,10 @@ def publish_to_ssm(outputs, environment, contract_id):
Overwrite=True, Overwrite=True,
) )
results[name] = param_name results[name] = param_name
except Exception: except Exception as e:
# Don't fail the pipeline if one output fails to publish # Don't fail the pipeline if one output fails to publish, but log it
import sys
print(f"WARNING: SSM put_parameter failed for {name}: {e}", file=sys.stderr)
results[name] = None results[name] = None
return results return results
@@ -165,7 +167,9 @@ def post_github_comment(comment_text, token=None, repo=None, pr_number=None):
req.add_header("Accept", "application/vnd.github+json") req.add_header("Accept", "application/vnd.github+json")
urllib.request.urlopen(req, timeout=10) urllib.request.urlopen(req, timeout=10)
return True return True
except Exception: except Exception as e:
import sys
print(f"WARNING: GitHub PR comment failed: {e}", file=sys.stderr)
return False return False
+28 -12
View File
@@ -421,8 +421,10 @@ def _check_s3_state_bucket() -> Tuple[Status, str]:
s3 = boto3.client("s3", region_name=env.get("AWS_DEFAULT_REGION", "us-east-1"), s3 = boto3.client("s3", region_name=env.get("AWS_DEFAULT_REGION", "us-east-1"),
aws_access_key_id=env.get("AWS_ACCESS_KEY_ID"), aws_access_key_id=env.get("AWS_ACCESS_KEY_ID"),
aws_secret_access_key=env.get("AWS_SECRET_ACCESS_KEY")) aws_secret_access_key=env.get("AWS_SECRET_ACCESS_KEY"))
s3.head_bucket(Bucket="acdl-tfstate-581513795199-us-east-1") account_id = os.environ.get("ACDL_AWS_ACCOUNT_ID", "581513795199")
r = s3.list_objects_v2(Bucket="acdl-tfstate-581513795199-us-east-1", MaxKeys=5) state_bucket = f"acdl-tfstate-{account_id}-us-east-1"
s3.head_bucket(Bucket=state_bucket)
r = s3.list_objects_v2(Bucket=state_bucket, MaxKeys=5)
keys = [o["Key"] for o in r.get("Contents", [])] keys = [o["Key"] for o in r.get("Contents", [])]
return "Verified", f"state bucket exists, keys={keys}" return "Verified", f"state bucket exists, keys={keys}"
except Exception as e: except Exception as e:
@@ -431,13 +433,19 @@ def _check_s3_state_bucket() -> Tuple[Status, str]:
def _check_lifecycle_module_terraform(module: str) -> Tuple[Status, str]: def _check_lifecycle_module_terraform(module: str) -> Tuple[Status, str]:
"""Helper: verify an L1 module's terraform dir exists with the required """Helper: verify an L1 module's terraform dir exists with the required
files + its example contracts resolve. This is the offline proxy for files + its example contracts resolve + terraform fmt syntax check
'lifecycle pipeline green' the pipeline cell going green requires passes. This is the offline proxy for 'lifecycle pipeline green' the
terraform init+validate+apply+modify+destroy to succeed against live pipeline cell going green requires terraform init+validate+apply+modify+
AWS, which requires the terraform files to exist and contracts to destroy to succeed against live AWS, which requires the terraform files
resolve first. We avoid terraform init here (too slow for the to exist, contracts to resolve, and HCL syntax to be valid first.
regression gate); terraform validate is run by the lifecycle pipeline
itself.""" We run `terraform fmt -check` (fast, no init required) as a syntax probe.
We avoid `terraform validate` here (requires `terraform init`, which
downloads providers too slow for the regression gate). Full
`terraform validate` is run by the lifecycle pipeline itself. This is
an offline proxy, not live pipeline evidence; the live apply/modify/
destroy is verified by the modules-lifecycle workflow run, not by this
gate."""
tf_dir = ROOT / "modules" / "l1" / module / "terraform" tf_dir = ROOT / "modules" / "l1" / module / "terraform"
if not tf_dir.is_dir(): if not tf_dir.is_dir():
return "Broken", f"modules/l1/{module}/terraform/ does not exist" return "Broken", f"modules/l1/{module}/terraform/ does not exist"
@@ -450,6 +458,11 @@ def _check_lifecycle_module_terraform(module: str) -> Tuple[Status, str]:
tf_text = "".join((tf_dir / f).read_text() for f in ["variables.tf", "main.tf", "outputs.tf"] if (tf_dir / f).is_file()) tf_text = "".join((tf_dir / f).read_text() for f in ["variables.tf", "main.tf", "outputs.tf"] if (tf_dir / f).is_file())
if "local." in tf_text and not (tf_dir / "locals.tf").is_file(): if "local." in tf_text and not (tf_dir / "locals.tf").is_file():
return "Broken", "missing terraform files: ['locals.tf'] (referenced by module)" return "Broken", "missing terraform files: ['locals.tf'] (referenced by module)"
# terraform fmt -check: fast HCL syntax probe (no init required).
rc, out, err = _run_subprocess(
["terraform", "fmt", "-check", "-diff", str(tf_dir)], timeout=30)
if rc != 0:
return "Broken", f"terraform fmt -check failed: {err.strip()[-200:]}"
for ex in ["simple", "complex"]: for ex in ["simple", "complex"]:
contract = ROOT / "modules" / "l1" / module / "examples" / f"{ex}.yml" contract = ROOT / "modules" / "l1" / module / "examples" / f"{ex}.yml"
if not contract.is_file(): if not contract.is_file():
@@ -459,12 +472,15 @@ def _check_lifecycle_module_terraform(module: str) -> Tuple[Status, str]:
], timeout=30) ], timeout=30)
if rc != 0: if rc != 0:
return "Broken", f"{ex}.yml resolver failed: {err.strip()[-200:]}" return "Broken", f"{ex}.yml resolver failed: {err.strip()[-200:]}"
return "Verified", f"terraform files present + simple/complex contracts resolve" return "Verified", f"terraform files present + fmt -check passes + simple/complex contracts resolve"
def _check_lifecycle_l2_module(module: str) -> Tuple[Status, str]: def _check_lifecycle_l2_module(module: str) -> Tuple[Status, str]:
"""Helper: verify an L2 module's composition resolves + its example """Helper: verify an L2 module's composition resolves + its example
contracts resolve. Offline proxy for 'L2 lifecycle pipeline green'.""" contracts resolve. Offline proxy for 'L2 lifecycle pipeline green'.
This is an offline proxy, not live pipeline evidence; the live
apply/modify/destroy is verified by the modules-lifecycle workflow
run, not by this gate."""
for ex in ["simple", "complex"]: for ex in ["simple", "complex"]:
contract = ROOT / "modules" / "l2" / module / "examples" / f"{ex}.yml" contract = ROOT / "modules" / "l2" / module / "examples" / f"{ex}.yml"
if not contract.is_file(): if not contract.is_file():
@@ -474,7 +490,7 @@ def _check_lifecycle_l2_module(module: str) -> Tuple[Status, str]:
], timeout=30) ], timeout=30)
if rc != 0: if rc != 0:
return "Broken", f"{ex}.yml resolver failed: {err.strip()[-200:]}" return "Broken", f"{ex}.yml resolver failed: {err.strip()[-200:]}"
return "Verified", f"L2 composition resolves (simple + complex contracts)" return "Verified", f"L2 composition resolves (simple + complex contracts; offline proxy)"
def _check_cap_017_dynamodb() -> Tuple[Status, str]: def _check_cap_017_dynamodb() -> Tuple[Status, str]:
+1 -1
View File
@@ -6,7 +6,7 @@ resource "aws_lb" "this" {
} }
resource "aws_lb_target_group" "this" { resource "aws_lb_target_group" "this" {
name_prefix = "tg-ci-" name_prefix = "${var.name}-"
port = var.port port = var.port
protocol = var.protocol protocol = var.protocol
vpc_id = var.vpc_id vpc_id = var.vpc_id
+1 -1
View File
@@ -18,7 +18,7 @@
"wires": [ "wires": [
{"from": "contract.inputs.name", "to": "alb.inputs.name", "default": "app"}, {"from": "contract.inputs.name", "to": "alb.inputs.name", "default": "app"},
{"from": "contract.inputs.name", "to": "ecr.inputs.name", "default": "app-repo"}, {"from": "contract.inputs.name", "to": "ecr.inputs.name", "default": "app-repo"},
{"from": "contract.inputs.name", "to": "roles.inputs.role_name", "default": "app-role"}, {"from": "contract.inputs.name", "to": "roles.inputs.role_name", "default": "acdl-app-role"},
{"from": "contract.inputs.region", "to": "cluster.inputs.region"}, {"from": "contract.inputs.region", "to": "cluster.inputs.region"},
{"from": "contract.inputs.region", "to": "ecr.inputs.region"}, {"from": "contract.inputs.region", "to": "ecr.inputs.region"},
{"from": "contract.inputs.region", "to": "roles.inputs.region"}, {"from": "contract.inputs.region", "to": "roles.inputs.region"},
+5 -1
View File
@@ -18,7 +18,11 @@
{"from": "s3.outputs.bucket_regional_domain_name", "to": "cloudfront.inputs.bucket_regional_domain_name"}, {"from": "s3.outputs.bucket_regional_domain_name", "to": "cloudfront.inputs.bucket_regional_domain_name"},
{"from": "waf.outputs.web_acl_arn", "to": "cloudfront.inputs.waf_web_acl_arn"}, {"from": "waf.outputs.web_acl_arn", "to": "cloudfront.inputs.waf_web_acl_arn"},
{"from": "contract.inputs.region", "to": "kms.inputs.region"}, {"from": "contract.inputs.region", "to": "kms.inputs.region"},
{"from": "kms.outputs.kms_key_arn", "to": "s3.inputs.kms_key_arn"} {"from": "kms.outputs.kms_key_arn", "to": "s3.inputs.kms_key_arn"},
{"from": "contract.inputs.default_ttl", "to": "cloudfront.inputs.default_ttl"},
{"from": "contract.inputs.max_ttl", "to": "cloudfront.inputs.max_ttl"},
{"from": "contract.inputs.price_class", "to": "cloudfront.inputs.price_class"},
{"from": "contract.inputs.viewer_protocol_policy", "to": "cloudfront.inputs.viewer_protocol_policy"}
], ],
"outputs": [ "outputs": [
{"from": "cloudfront.outputs.distribution_domain_name", "to": "stack.outputs.distribution_domain_name"}, {"from": "cloudfront.outputs.distribution_domain_name", "to": "stack.outputs.distribution_domain_name"},
+11 -6
View File
@@ -1,16 +1,21 @@
# Complex static-assets deployment (S3 + CloudFront + WAF) # Complex static-assets deployment (S3 + CloudFront + WAF)
# Modify variant: same bucket_name as simple (in-place modify, adds CDN + WAF) # Modify variant: same bucket_name as simple (in-place modify, tunes CDN
# TTLs + price class + viewer protocol policy). The simple example uses
# the cloudfront interface defaults (default_ttl=3600, max_ttl=86400,
# PriceClass_100, redirect-to-https); this complex example sets explicit
# non-default values so the lifecycle "modify" step exercises a real
# terraform diff on the cloudfront distribution, not an idempotent
# re-apply.
environment: dev environment: dev
id: assets id: assets
infrastructure: infrastructure:
static-assets: static-assets:
inputs: inputs:
bucket_name: my-static-site bucket_name: my-static-site
default_ttl: 3600 default_ttl: 7200
max_ttl: 86400 max_ttl: 172800
price_class: PriceClass_100 price_class: PriceClass_200
region: us-east-1 region: us-east-1
viewer_protocol_policy: redirect-to-https viewer_protocol_policy: https-only
waf_enabled: true
version: 1.0.0 version: 1.0.0
name: static assets name: static assets
+10 -6
View File
@@ -27,20 +27,23 @@
"type": "object", "type": "object",
"required": ["bucket", "lock_table"], "required": ["bucket", "lock_table"],
"properties": { "properties": {
"bucket": {"type": "string", "description": "S3 state bucket name."}, "bucket": {"type": "string", "pattern": "^[a-z0-9][a-z0-9.-]{1,61}[a-z0-9]$", "description": "S3 state bucket name (lowercase, 3-63 chars, dots/hyphens)."},
"lock_table": {"type": "string", "description": "DynamoDB lock table name."} "lock_table": {"type": "string", "description": "DynamoDB lock table name."}
} },
"additionalProperties": false
}, },
"network": { "network": {
"type": "object", "type": "object",
"required": ["vpc_cidr", "azs"], "required": ["vpc_cidr", "azs"],
"properties": { "properties": {
"vpc_cidr": {"type": "string", "description": "VPC CIDR block."}, "vpc_cidr": {"type": "string", "pattern": "^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}/[0-9]{1,2}$", "description": "VPC CIDR block (e.g. 10.0.0.0/16)."},
"azs": {"type": "array", "items": {"type": "string"}, "description": "Availability zones."} "azs": {"type": "array", "items": {"type": "string"}, "maxItems": 6, "description": "Availability zones (max 6)."}
} },
"additionalProperties": false
}, },
"runner_role_arn": { "runner_role_arn": {
"type": "string", "type": "string",
"pattern": "^arn:aws:iam::[0-9]{12}:role/.+$",
"description": "The IAM role ARN surfaced to the consumer's repo via ABAC." "description": "The IAM role ARN surfaced to the consumer's repo via ABAC."
}, },
"autonomy": { "autonomy": {
@@ -54,5 +57,6 @@
"maximum": 1, "maximum": 1,
"description": "The confidence gate threshold for this environment (dev 0.50, qa 0.75, prod 0.90, dr 0.95)." "description": "The confidence gate threshold for this environment (dev 0.50, qa 0.75, prod 0.90, dr 0.95)."
} }
} },
"additionalProperties": false
} }
+1 -1
View File
@@ -29,7 +29,7 @@ import boto3
REPO_ROOT = pathlib.Path(__file__).resolve().parent.parent REPO_ROOT = pathlib.Path(__file__).resolve().parent.parent
ENV_FILE = REPO_ROOT / ".env.secrets" ENV_FILE = REPO_ROOT / ".env.secrets"
AWS_ACCOUNT_ID = "581513795199" AWS_ACCOUNT_ID = os.environ.get("ACDL_AWS_ACCOUNT_ID", "581513795199")
AWS_REGION = "us-east-1" AWS_REGION = "us-east-1"
ECR_REPO_NAME = "acdl-microservice" ECR_REPO_NAME = "acdl-microservice"
IMAGE_TAG = "latest" IMAGE_TAG = "latest"
+8 -1
View File
@@ -1,11 +1,18 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# scripts/run_l2_lifecycle_destroy.sh — run a single L2 module lifecycle destroy. # scripts/run_l2_lifecycle_destroy.sh — run a single L2 module lifecycle destroy.
# #
# Usage: run_l2_lifecycle_destroy.sh <module> [ci-vpc-outputs.json] # Usage: run_l2_lifecycle_destroy.sh <module>
# #
# Wraps run_platform.sh for L2 composition modules in the modules-lifecycle # Wraps run_platform.sh for L2 composition modules in the modules-lifecycle
# pipeline. Sets ACDL_REMOTE_STATE_KEY to point to the CI VPC state. # pipeline. Sets ACDL_REMOTE_STATE_KEY to point to the CI VPC state.
# #
# NOTE: unlike the L1 scripts (run_lifecycle_destroy.sh), the L2 path does
# NOT take a ci-vpc-outputs.json argument. L2 compositions reference the
# platform VPC via terraform_remote_state (a data source), not by injecting
# VPC outputs into the contract. The workflow passes 2 positional args for
# parity with the L1 matrix, but $2 is accepted-but-ignored here (documented,
# not a bug).
#
# Lifecycle mode (REQ-134): ACDL_LIFECYCLE_MODE default "plan" = no-op # Lifecycle mode (REQ-134): ACDL_LIFECYCLE_MODE default "plan" = no-op
# (plan mode never applies resources, so there is nothing to destroy). # (plan mode never applies resources, so there is nothing to destroy).
# Set to "full" for the real `--destroy` against live AWS. # Set to "full" for the real `--destroy` against live AWS.
+9 -1
View File
@@ -1,13 +1,21 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# scripts/run_l2_lifecycle_test.sh — run a single L2 module lifecycle apply/modify. # scripts/run_l2_lifecycle_test.sh — run a single L2 module lifecycle apply/modify.
# #
# Usage: run_l2_lifecycle_test.sh <module> <example> [ci-vpc-outputs.json] # Usage: run_l2_lifecycle_test.sh <module> <example>
# #
# Wraps run_platform.sh for L2 composition modules in the modules-lifecycle # Wraps run_platform.sh for L2 composition modules in the modules-lifecycle
# pipeline. Sets ACDL_REMOTE_STATE_KEY to point to the CI VPC state so the # pipeline. Sets ACDL_REMOTE_STATE_KEY to point to the CI VPC state so the
# microservice composition's terraform_remote_state data source reads from # microservice composition's terraform_remote_state data source reads from
# the short-lived CI VPC (not the long-lived platform VPC). # the short-lived CI VPC (not the long-lived platform VPC).
# #
# NOTE: unlike the L1 scripts (run_lifecycle_test.sh), the L2 path does NOT
# take a ci-vpc-outputs.json argument. L2 compositions reference the platform
# VPC via terraform_remote_state (a data source), not by injecting VPC
# outputs into the contract. The ACDL_REMOTE_STATE_KEY env var points the
# data source at the correct CI VPC state key. The workflow passes 3
# positional args for parity with the L1 matrix, but $3 is accepted-but-
# ignored here (documented, not a bug).
#
# Lifecycle mode (REQ-134): ACDL_LIFECYCLE_MODE default "plan" runs # Lifecycle mode (REQ-134): ACDL_LIFECYCLE_MODE default "plan" runs
# `run_platform.sh --plan-only` (fast, no AWS mutation). Set to "full" for # `run_platform.sh --plan-only` (fast, no AWS mutation). Set to "full" for
# the real `--apply` against live AWS. # the real `--apply` against live AWS.
+4 -2
View File
@@ -30,7 +30,7 @@ import boto3
ROOT = Path(__file__).resolve().parent.parent.parent ROOT = Path(__file__).resolve().parent.parent.parent
POLICY_PATH = ROOT / "terraform" / "bootstrap" / "spike_runner_policy.json" POLICY_PATH = ROOT / "terraform" / "bootstrap" / "spike_runner_policy.json"
ACCOUNT = "581513795199" ACCOUNT = os.environ.get("ACDL_AWS_ACCOUNT_ID", "581513795199")
USER = "acdl-spike-runner" USER = "acdl-spike-runner"
POLICY_NAME = "acdl-spike-runner-policy" POLICY_NAME = "acdl-spike-runner-policy"
POLICY_ARN = f"arn:aws:iam::{ACCOUNT}:policy/{POLICY_NAME}" POLICY_ARN = f"arn:aws:iam::{ACCOUNT}:policy/{POLICY_NAME}"
@@ -75,8 +75,10 @@ def apply_managed_policy(iam, policy_doc: str) -> str:
try: try:
iam.delete_policy_version(PolicyArn=POLICY_ARN, VersionId=default) iam.delete_policy_version(PolicyArn=POLICY_ARN, VersionId=default)
print(f"deleted old default version {default}") print(f"deleted old default version {default}")
except iam.exceptions.NoSuchEntityException:
pass # already deleted
except Exception as e: except Exception as e:
print(f"could not delete old version {default}: {e}") print(f"WARNING: could not delete old version {default}: {e}")
return POLICY_ARN return POLICY_ARN
except iam.exceptions.NoSuchEntityException: except iam.exceptions.NoSuchEntityException:
print(f"creating managed policy {POLICY_NAME}...") print(f"creating managed policy {POLICY_NAME}...")
+12 -8
View File
@@ -30,9 +30,9 @@ import boto3
REGION = os.environ.get("AWS_DEFAULT_REGION", "us-east-1") REGION = os.environ.get("AWS_DEFAULT_REGION", "us-east-1")
STATE_BUCKET = "acdl-tfstate-581513795199-us-east-1" ACCOUNT_ID = os.environ.get("ACDL_AWS_ACCOUNT_ID", "581513795199")
STATE_BUCKET = f"acdl-tfstate-{ACCOUNT_ID}-us-east-1"
OUTBOX_TABLE = "acdl-outbox" OUTBOX_TABLE = "acdl-outbox"
ACCOUNT_ID = "581513795199"
def main(): def main():
@@ -48,12 +48,16 @@ def main():
try: try:
s3.head_bucket(Bucket=STATE_BUCKET) s3.head_bucket(Bucket=STATE_BUCKET)
print(f"s3: bucket {STATE_BUCKET} already exists") print(f"s3: bucket {STATE_BUCKET} already exists")
except Exception: except s3.exceptions.ClientError as e:
kwargs = {"Bucket": STATE_BUCKET} error_code = e.response.get("Error", {}).get("Code", "")
if REGION != "us-east-1": if error_code in ("404", "NoSuchBucket", "NotFound"):
kwargs["CreateBucketConfiguration"] = {"LocationConstraint": REGION} kwargs = {"Bucket": STATE_BUCKET}
s3.create_bucket(**kwargs) if REGION != "us-east-1":
print(f"s3: created bucket {STATE_BUCKET}") kwargs["CreateBucketConfiguration"] = {"LocationConstraint": REGION}
s3.create_bucket(**kwargs)
print(f"s3: created bucket {STATE_BUCKET}")
else:
raise
# Enable versioning (idempotent) # Enable versioning (idempotent)
s3.put_bucket_versioning( s3.put_bucket_versioning(
Bucket=STATE_BUCKET, Bucket=STATE_BUCKET,
+5 -2
View File
@@ -215,7 +215,10 @@
"kms:TagResource", "kms:TagResource",
"kms:UntagResource" "kms:UntagResource"
], ],
"Resource": "*" "Resource": [
"arn:aws:kms:*:*:key/*",
"arn:aws:kms:*:*:alias/acdl-*"
]
}, },
{ {
"Effect": "Allow", "Effect": "Allow",
@@ -233,7 +236,7 @@
"iam:TagRole", "iam:TagRole",
"iam:UntagRole" "iam:UntagRole"
], ],
"Resource": "*" "Resource": "arn:aws:iam::*:role/acdl-*"
} }
] ]
} }
+115
View File
@@ -331,3 +331,118 @@ class TestChildIdHelper:
assert _child_id(["service-task-definition", "service-service"]) == "service" assert _child_id(["service-task-definition", "service-service"]) == "service"
# alb expands to alb-loadbalancer + alb-targetgroup + alb-listener # alb expands to alb-loadbalancer + alb-targetgroup + alb-listener
assert _child_id(["alb-loadbalancer", "alb-targetgroup", "alb-listener"]) == "alb" assert _child_id(["alb-loadbalancer", "alb-targetgroup", "alb-listener"]) == "alb"
class TestAdapterDedupRejectsUnregisteredModule:
"""P1-1 (v1.14, REQ-135): a resource whose module is not in the
registry must raise ValueError, not be silently dropped from the
dedup merge. A typo'd module field (e.g. 'iam-role' vs 'iam_roles')
must surface as a diagnostic, not vanish."""
def test_unregistered_module_raises_valueerror(self, tmp_path):
stack = {
"resources": [
{"id": "bad", "type": "aws:bogus:thing", "module": "nonexistent@1.0.0", "inputs": {}}
],
"outputs": {},
"data_sources": [],
}
with pytest.raises(ValueError, match="no terraform_dir for module 'nonexistent'"):
adapt(stack, str(tmp_path))
def test_registered_module_still_works(self, tmp_path):
"""A registered module (s3) must still emit valid terraform — the
ValueError guard must not break the happy path."""
stack = {
"resources": [
{"id": "s3", "type": "aws:s3:bucket", "module": "s3@1.0.0", "inputs": {"bucket_name": "test"}}
],
"outputs": {},
"data_sources": [],
}
adapt(stack, str(tmp_path))
assert (tmp_path / "main.tf").exists()
class TestAdapterDedupMergesSameModule:
"""P2-2 (v1.14, REQ-139): two resources with the same module collapse
to one module block named by the child id, with merged inputs. This
locks in the dedup-merge behavior at the unit level."""
def test_two_resources_same_module_collapse_to_one_block(self, tmp_path):
"""Two resources sharing the same terraform dir (e.g. cloudfront
distribution + OAC) must produce ONE module block, not two."""
stack = {
"resources": [
{"id": "cloudfront-distribution", "type": "aws:cloudfront:distribution", "module": "cloudfront@1.0.0", "inputs": {"price_class": "PriceClass_100"}},
{"id": "cloudfront-originaccesscontrol", "type": "aws:cloudfront:originaccesscontrol", "module": "cloudfront@1.0.0", "inputs": {"viewer_protocol_policy": "redirect-to-https"}},
],
"outputs": {},
"data_sources": [],
}
adapt(stack, str(tmp_path))
main_tf = (tmp_path / "main.tf").read_text()
# Exactly one module block for cloudfront (deduped to child id "cloudfront")
assert main_tf.count('module "cloudfront" {') == 1
# No separate module blocks for the expanded sub-ids
assert 'module "cloudfront-distribution"' not in main_tf
assert 'module "cloudfront-originaccesscontrol"' not in main_tf
def test_dedup_merges_inputs_from_both_resources(self, tmp_path):
"""When two resources share a module, their inputs are merged into
the single module block (first resource's inputs + second's, with
first-wins for overlapping keys)."""
stack = {
"resources": [
{"id": "cloudfront-distribution", "type": "aws:cloudfront:distribution", "module": "cloudfront@1.0.0", "inputs": {"price_class": "PriceClass_100", "region": "us-east-1"}},
{"id": "cloudfront-originaccesscontrol", "type": "aws:cloudfront:originaccesscontrol", "module": "cloudfront@1.0.0", "inputs": {"viewer_protocol_policy": "redirect-to-https"}},
],
"outputs": {},
"data_sources": [],
}
adapt(stack, str(tmp_path))
main_tf = (tmp_path / "main.tf").read_text()
# Both inputs present in the merged module block
assert "PriceClass_100" in main_tf
assert "redirect-to-https" in main_tf
class TestAdapterRemoteStateKeyOverride:
"""P2-2 (v1.14, REQ-139): ACDL_REMOTE_STATE_KEY env var overrides the
default 'platform/terraform.tfstate' key in the emitted
data terraform_remote_state block. This is the load-bearing correctness
mechanism for the microservice L2 lifecycle (remote state points at the
CI VPC, not the platform VPC)."""
def test_default_remote_state_key(self, tmp_path, monkeypatch):
"""When ACDL_REMOTE_STATE_KEY is unset, the default key is used."""
monkeypatch.delenv("ACDL_REMOTE_STATE_KEY", raising=False)
stack = {
"resources": [
{"id": "s3", "type": "aws:s3:bucket", "module": "s3@1.0.0", "inputs": {"bucket_name": "test", "region": "us-east-1"}}
],
"outputs": {},
"data_sources": ["platform"],
}
adapt(stack, str(tmp_path))
terraform_tf = (tmp_path / "terraform.tf").read_text()
main_tf = (tmp_path / "main.tf").read_text()
# The remote state data block uses the default key
assert "platform/terraform.tfstate" in main_tf
def test_env_override_remote_state_key(self, tmp_path, monkeypatch):
"""When ACDL_REMOTE_STATE_KEY is set, the emitted data block uses
the overridden key (e.g. 'spike/ci-vpc/terraform.tfstate')."""
monkeypatch.setenv("ACDL_REMOTE_STATE_KEY", "spike/ci-vpc/terraform.tfstate")
stack = {
"resources": [
{"id": "s3", "type": "aws:s3:bucket", "module": "s3@1.0.0", "inputs": {"bucket_name": "test", "region": "us-east-1"}}
],
"outputs": {},
"data_sources": ["platform"],
}
adapt(stack, str(tmp_path))
main_tf = (tmp_path / "main.tf").read_text()
# The remote state data block uses the overridden key
assert "spike/ci-vpc/terraform.tfstate" in main_tf
assert "platform/terraform.tfstate" not in main_tf
+39
View File
@@ -501,3 +501,42 @@ class TestValidateChangeRequest:
assert resp["statusCode"] == 200 assert resp["statusCode"] == 200
body = json.loads(resp["body"]) body = json.loads(resp["body"])
assert body["action"] == "validate_change_request" assert body["action"] == "validate_change_request"
class TestV14IdentityValidation:
"""v1.14 (REQ-144): contractId format, environment enum, error length
validation + spoofing resistance."""
def test_invalid_contract_id_rejected(self, moto_contracts_table, sample_payload):
sample_payload["contractId"] = "bad contract!@#"
event = {"body": json.dumps(sample_payload), "requestContext": {}}
resp = ingestor.lambda_handler(event, None)
assert resp["statusCode"] == 400
assert "invalid contractId" in resp["body"]
def test_contract_id_too_long_rejected(self, moto_contracts_table, sample_payload):
sample_payload["contractId"] = "a" * 65
event = {"body": json.dumps(sample_payload), "requestContext": {}}
resp = ingestor.lambda_handler(event, None)
assert resp["statusCode"] == 400
assert "invalid contractId" in resp["body"]
def test_invalid_environment_rejected(self, moto_contracts_table, sample_payload):
sample_payload["environment"] = "staging"
event = {"body": json.dumps(sample_payload), "requestContext": {}}
resp = ingestor.lambda_handler(event, None)
assert resp["statusCode"] == 400
assert "invalid environment" in resp["body"]
def test_valid_environments_accepted(self, moto_contracts_table, sample_payload):
for env in ["dev", "qa", "prod", "dr"]:
sample_payload["environment"] = env
event = {"body": json.dumps(sample_payload), "requestContext": {}}
resp = ingestor.lambda_handler(event, None)
assert resp["statusCode"] == 200
def test_abac_reliance_documented(self):
"""The _validate_caller_identity docstring documents the ABAC reliance."""
docstring = ingestor._validate_caller_identity.__doc__
assert "ABAC" in docstring
assert "PrincipalTag" in docstring
+60
View File
@@ -97,3 +97,63 @@ def test_account_id_is_12_digits():
env = json.loads((ENV_DIR / env_file).read_text()) env = json.loads((ENV_DIR / env_file).read_text())
assert len(env["account_id"]) == 12 assert len(env["account_id"]) == 12
assert env["account_id"].isdigit() assert env["account_id"].isdigit()
def test_v14_schema_rejects_undocumented_fields():
"""v1.14 (REQ-145): additionalProperties: false rejects unknown fields."""
schema = json.loads(SCHEMA.read_text())
bad_env = {
"name": "dev",
"account_id": "123456789012",
"region": "us-east-1",
"state_backend": {"bucket": "test", "lock_table": "test"},
"network": {"vpc_cidr": "10.0.0.0/16", "azs": ["us-east-1a"]},
"runner_role_arn": "arn:aws:iam::123456789012:role/test",
"autonomy": "full",
"confidence_threshold": 0.5,
"rogue_field": "should be rejected"
}
with pytest.raises(jsonschema.ValidationError, match="Additional properties are not allowed"):
jsonschema.validate(bad_env, schema)
def test_v14_schema_validates_bucket_name_format():
"""v1.14 (REQ-145): state_backend.bucket must match S3 naming rules."""
schema = json.loads(SCHEMA.read_text())
bad_env = {
"name": "dev", "account_id": "123456789012", "region": "us-east-1",
"state_backend": {"bucket": "Invalid_Bucket!", "lock_table": "test"},
"network": {"vpc_cidr": "10.0.0.0/16", "azs": ["us-east-1a"]},
"runner_role_arn": "arn:aws:iam::123456789012:role/test",
"autonomy": "full", "confidence_threshold": 0.5
}
with pytest.raises(jsonschema.ValidationError, match="does not match"):
jsonschema.validate(bad_env, schema)
def test_v14_schema_validates_arn_format():
"""v1.14 (REQ-145): runner_role_arn must match ARN format."""
schema = json.loads(SCHEMA.read_text())
bad_env = {
"name": "dev", "account_id": "123456789012", "region": "us-east-1",
"state_backend": {"bucket": "test", "lock_table": "test"},
"network": {"vpc_cidr": "10.0.0.0/16", "azs": ["us-east-1a"]},
"runner_role_arn": "not-an-arn",
"autonomy": "full", "confidence_threshold": 0.5
}
with pytest.raises(jsonschema.ValidationError, match="does not match"):
jsonschema.validate(bad_env, schema)
def test_v14_schema_validates_cidr_format():
"""v1.14 (REQ-145): vpc_cidr must match CIDR format."""
schema = json.loads(SCHEMA.read_text())
bad_env = {
"name": "dev", "account_id": "123456789012", "region": "us-east-1",
"state_backend": {"bucket": "test", "lock_table": "test"},
"network": {"vpc_cidr": "not-a-cidr", "azs": ["us-east-1a"]},
"runner_role_arn": "arn:aws:iam::123456789012:role/test",
"autonomy": "full", "confidence_threshold": 0.5
}
with pytest.raises(jsonschema.ValidationError, match="does not match"):
jsonschema.validate(bad_env, schema)
+39
View File
@@ -177,3 +177,42 @@ class TestIAMPolicyBaseline:
if isinstance(res, list): if isinstance(res, list):
res = " ".join(res) res = " ".join(res)
assert res != "*", "iam:PassRole must not be granted to Resource: *" assert res != "*", "iam:PassRole must not be granted to Resource: *"
def test_iam_role_creation_scoped_to_acdl_prefix(self, policy):
"""G-104: iam:CreateRole must be scoped to role/acdl-* (not Resource: *)."""
for s in policy["Statement"]:
acts = s.get("Action", [])
if isinstance(acts, str):
acts = [acts]
if "iam:CreateRole" in acts:
res = s.get("Resource", "")
if isinstance(res, list):
res = " ".join(res)
assert "acdl-*" in res, f"iam:CreateRole must be scoped to acdl-* (got: {res})"
def test_kms_scoped_to_acdl_alias(self, policy):
"""G-104: kms:CreateKey etc. must be scoped to alias/acdl-* (not Resource: *)."""
for s in policy["Statement"]:
acts = s.get("Action", [])
if isinstance(acts, str):
acts = [acts]
if any(a.startswith("kms:") for a in acts):
res = s.get("Resource", "")
if isinstance(res, list):
res = " ".join(res)
assert "acdl-*" in res, f"kms actions must be scoped to acdl-* (got: {res})"
def test_cloudfront_waf_remain_global(self, policy):
"""G-104: CloudFront + WAFv2 (CloudFront scope) ARNs are global;
Resource: * is acceptable here (documented constraint, not a defect)."""
global_actions = {"cloudfront:", "wafv2:"}
for s in policy["Statement"]:
acts = s.get("Action", [])
if isinstance(acts, str):
acts = [acts]
if any(any(a.startswith(g) for g in global_actions) for a in acts):
res = s.get("Resource", "")
if isinstance(res, list):
res = res[0] if res else ""
# CloudFront/WAFv2 are allowed to be * (global ARNs)
assert res == "*" or "acdl" in res
+5 -3
View File
@@ -211,11 +211,13 @@ class TestFleshedOutTranslator:
assert pcrs[0]["result"] == "skipped" assert pcrs[0]["result"] == "skipped"
assert "Terraform" in pcrs[0]["message"] assert "Terraform" in pcrs[0]["message"]
def test_kube_version_parsed(self, tmp_path): def test_kube_version_removed(self, tmp_path):
"""--kube-version is parsed but not yet used (future GitOps).""" """v1.14 (G-103): --kube-version flag removed; adapt() no longer
accepts kube_version parameter. Version-aware policy selection
deferred to GitOps reconciler (D-053)."""
f = tmp_path / "k.json" f = tmp_path / "k.json"
f.write_text(json.dumps({"results": [ f.write_text(json.dumps({"results": [
{"policy": "p", "rule": "r", "severity": "low", "result": "pass", "resource": "x"}, {"policy": "p", "rule": "r", "severity": "low", "result": "pass", "resource": "x"},
]})) ]}))
results = adapt(str(f), "c8", kube_version="1.28") results = adapt(str(f), "c8")
assert len(results) == 1 assert len(results) == 1
+35
View File
@@ -0,0 +1,35 @@
"""v1.14 (REQ-146): no credential-looking files are tracked by git."""
import subprocess
import sys
from pathlib import Path
import pytest
ROOT = Path(__file__).resolve().parent.parent
CREDENTIAL_EXTENSIONS = [".pem", ".key", ".p12", ".pfx", ".cer", ".crt", ".jks", ".keystore"]
def test_no_credential_files_tracked():
"""Assert no file with a credential extension is tracked by git."""
result = subprocess.run(
["git", "ls-files"],
cwd=str(ROOT),
capture_output=True,
text=True,
)
if result.returncode != 0:
pytest.skip("git not available or not a repo")
tracked = result.stdout.strip().split("\n")
cred_files = [
f for f in tracked
if any(f.endswith(ext) for ext in CREDENTIAL_EXTENSIONS)
]
assert cred_files == [], f"credential files tracked by git: {cred_files}"
def test_gitignore_has_credential_patterns():
"""Assert .gitignore contains the credential-pattern catch-all."""
gitignore = (ROOT / ".gitignore").read_text()
for ext in [".pem", ".key", ".p12", ".pfx"]:
assert f"*{ext}" in gitignore, f".gitignore missing credential pattern *{ext}"