continuous-intelligence/acdl
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 128 Wiki Activity

feat(P67): fix adapter dedup defect + 2 probe bugs -> 22/22 Verified

Browse Source 
---
ci---
project: acdl
phase: 67
milestone: v1.12
status: execute
---
/ci---

CAP-013 (REQ-129): adapter dedup logic collapsed multi-resource L1s
(ecs-service, alb) to one module block named after the first sub-resource
id, but stack outputs + cross-module refs used the expanded sub-ids
(e.g. service-service, alb-targetgroup). terraform validate failed:
'No module call name'. Fix: name merged module by the composition child
id (common-prefix heuristic), build id_remap, rewrite stack-output 'from'
ids + ref: input targets through id_remap before emitting. terraform
validate now succeeds for the microservice stack. Adapter 236->192 lines
(still < 200 line gate).

CAP-017 (REQ-130): regression probe required locals.tf for every L1 module,
but the rds module legitimately omits it (no local.* refs). Fix: make
locals.tf conditional on the module referencing local.* values.

CAP-018 (REQ-130): regression probe called LocalLambdaStub() with no args,
but the dataclass requires an outbox field (since P53). Fix: construct a
FlatFileOutbox and pass it.

Regression gate (D-091) re-run: 22/22 Verified, 0 Broken. The decks can
now honestly claim 22/22 Verified (PRE_MORTEM.md FM-3 mitigation).
This commit is contained in:
Jon Chery
2026-07-29 13:07:30 +00:00
parent aebc63127d
commit 76364c33c2
4 changed files with 140 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adapters/terraform/adapter.py
+65 -69
View File
@@ -1,14 +1,11 @@
"""ACDL Terraform adapter — stateless assembler (v1.11 RESTART, P56a).
The adapter is a STATELESS ASSEMBLER. It owns no module content — no resource
shape, no nested HCL blocks, no defaults, no type-specific logic. It reads
the registry to find each L1 module's terraform/ dir, then emits a root
main.tf that instantiates each resource as a `module "<rid>" { source = ... }`
block with resolved inputs and wired refs.
Engine-specific knowledge (resource type, arg names, nested blocks, defaults)
lives in the per-module terraform/ subdir (versions/variables/locals/main/
outputs.tf), NOT in this file. interface.json stays engine-agnostic.
A STATELESS ASSEMBLER. It owns no module content — no resource shape, no
nested HCL blocks, no defaults, no type-specific logic. It reads the
registry to find each L1 module's terraform/ dir, then emits a root
main.tf that instantiates each resource as a `module "<rid>" { source }`
block with resolved inputs and wired refs. Engine-specific knowledge
lives in the per-module terraform/ subdir, NOT in this file.
CLI: adapter.py <instance.json> <out_dir>
"""
@@ -22,42 +19,39 @@ def _load_registry(repo_root):
"""Load registry.json → {module_name: terraform_dir}."""
with open(os.path.join(repo_root, "modules", "registry.json")) as fh:
registry = json.load(fh)
terraform_dirs = {}
for name, versions in registry.items():
latest = versions.get("1.0.0", {})
if "terraform_dir" in latest:
terraform_dirs[name] = latest["terraform_dir"]
return terraform_dirs
return {n: v.get("1.0.0", {}).get("terraform_dir")
for n, v in registry.items()
if v.get("1.0.0", {}).get("terraform_dir")}
def _module_name(resource):
"""Extract the module name from a resource's `module` field (e.g. s3@1.0.0 → s3)."""
"""Extract the module name from a resource's `module` field (s3@1.0.0 → s3)."""
return resource.get("module", "").split("@")[0]
def _ref_expr(value, data_source_names=None):
"""Translate a `ref:<rid>.<output>` string to a Terraform interpolation.
For module resources: `module.<rid>.<output>`.
For data sources (platform-owned): `data.terraform_remote_state.platform.outputs.<output>`.
Returns None if the value is not a ref."""
def _ref_expr(value, data_source_names=None, id_remap=None):
"""Translate `ref:<rid>.<output>` → `module.<rid>.<output>` (or
`data.terraform_remote_state.platform.outputs.<output>` for data
sources). Returns None if not a ref. id_remap rewrites expanded
multi-resource L1 sub-ids (e.g. alb-targetgroup → alb). CAP-013."""
if not isinstance(value, str) or not value.startswith("ref:"):
return None
body = value[len("ref:"):]
rid, out_name = body.split(".", 1)
rid, out_name = value[len("ref:"):].split(".", 1)
if data_source_names and rid in data_source_names:
return f"data.terraform_remote_state.platform.outputs.{out_name}"
if id_remap:
rid = id_remap.get(rid, rid)
return f"module.{rid}.{out_name}"
def _tf_value(value, data_source_names=None):
def _tf_value(value, data_source_names=None, id_remap=None):
"""Render a Python value as a Terraform expression fragment."""
if isinstance(value, bool):
return "true" if value else "false"
if isinstance(value, (int, float)) and not isinstance(value, bool):
return str(value)
if isinstance(value, str):
ref = _ref_expr(value, data_source_names)
ref = _ref_expr(value, data_source_names, id_remap)
if ref is not None:
return ref
stripped = value.lstrip()
@@ -74,19 +68,16 @@ def _tf_value(value, data_source_names=None):
raise ValueError(f"unsupported input value type {type(value).__name__}")
def _emit_module_block(resource, terraform_dirs, repo_root, data_source_names=None):
"""Emit a `module "<rid>" { source = ... ... }` block for one resource."""
def _emit_module_block(resource, terraform_dirs, repo_root, data_source_names=None, id_remap=None):
"""Emit a `module "<rid>" { source = ... ... }` block."""
rid = resource["id"]
name = _module_name(resource)
tf_dir = terraform_dirs.get(name)
tf_dir = terraform_dirs.get(_module_name(resource))
if not tf_dir:
raise ValueError(f"no terraform_dir in registry for module '{name}' (resource {rid})")
source_path = os.path.join(repo_root, tf_dir)
lines = [f'module "{rid}" {{', f' source = "{source_path}"']
raise ValueError(f"no terraform_dir for module '{_module_name(resource)}' (resource {rid})")
lines = [f'module "{rid}" {{', f' source = "{os.path.join(repo_root, tf_dir)}"']
for in_name, value in resource.get("inputs", {}).items():
if in_name == "region":
continue
lines.append(f" {in_name} = {_tf_value(value, data_source_names)}")
if in_name != "region":
lines.append(f" {in_name} = {_tf_value(value, data_source_names, id_remap)}")
lines.append("}")
return "\n".join(lines)
@@ -96,6 +87,16 @@ def _emit_root_output(out_name, rid, module_output_name):
return f'output "{out_name}" {{\n value = module.{rid}.{module_output_name}\n}}'
def _child_id(group_ids):
"""Composition child id for resource ids sharing one terraform dir.
Multi-resource L1s expand a child to `<childId>-<subType>` ids; the
common-prefix (trailing `-` stripped) is the child id. Single-resource
L1s: the id IS the child id."""
if len(group_ids) == 1:
return group_ids[0]
return os.path.commonprefix([i + "-" for i in group_ids]).rstrip("-") or group_ids[0]
def adapt(stack_instance, out_dir):
"""Emit main.tf + terraform.tf + providers.tf to out_dir for the stack instance."""
os.makedirs(out_dir, exist_ok=True)
@@ -106,15 +107,9 @@ def adapt(stack_instance, out_dir):
resources = stack_instance.get("resources", [])
stack_outputs = stack_instance.get("outputs", {})
# --- providers.tf: aws provider, region from the first resource's inputs.region ---
region = "us-east-1"
for r in resources:
if "region" in r.get("inputs", {}):
region = r["inputs"]["region"]
break
region = next((r["inputs"]["region"] for r in resources if "region" in r.get("inputs", {})), "us-east-1")
providers_tf = f'provider "aws" {{\n region = "{region}"\n}}\n'
# --- terraform.tf: required_version + required_providers + S3 backend ---
stack_name = stack.get("name", "spike")
environment = stack.get("environment", "dev")
terraform_tf = (
@@ -134,12 +129,11 @@ def adapt(stack_instance, out_dir):
'}\n'
)
# --- data sources: emit terraform_remote_state for platform-owned resources ---
data_source_names = stack_instance.get("data_sources", [])
data_blocks = []
parts = []
if data_source_names:
remote_state_key = os.environ.get("ACDL_REMOTE_STATE_KEY", "platform/terraform.tfstate")
data_blocks.append(
parts.append(
'data "terraform_remote_state" "platform" {\n'
' backend = "s3"\n'
' config = {\n'
@@ -150,32 +144,35 @@ def adapt(stack_instance, out_dir):
'}\n'
)
# --- main.tf: data blocks + module instantiations + root outputs ---
parts = list(data_blocks)
# Deduplicate: multi-resource L1s (e.g. cloudfront) expand to multiple
# stack resources sharing one terraform dir. Emit ONE module block per
# dir, merging inputs. Use the first resource's id as the module name.
seen = {} # terraform_dir → resource
# Deduplicate multi-resource L1s (ecs-service, alb, ...) to ONE module
# block per terraform dir, named by the composition child id (common
# prefix), NOT the first sub-resource id. Stack outputs + cross-module
# refs reference expanded sub-ids, rewritten via id_remap. CAP-013.
groups = {} # terraform_dir → {"ids": [...], "inputs": {}, "module": ""}
for r in resources:
tf_dir = terraform_dirs.get(_module_name(r))
if not tf_dir:
raise ValueError(f"no terraform_dir in registry for module '{_module_name(r)}' (resource {r['id']})")
if tf_dir in seen:
for k, v in r.get("inputs", {}).items():
if k != "region" and k not in seen[tf_dir].get("inputs", {}):
seen[tf_dir].setdefault("inputs", {})[k] = v
for k, v in r.get("outputs", {}).items():
seen[tf_dir].setdefault("outputs", {})[k] = v
else:
seen[tf_dir] = r
merged = list(seen.values()) if seen else resources
parts.extend(_emit_module_block(r, terraform_dirs, repo_root, set(data_source_names)) for r in merged)
raise ValueError(f"no terraform_dir for module '{_module_name(r)}' (resource {r['id']})")
grp = groups.setdefault(tf_dir, {"ids": [], "inputs": {}, "module": r["module"]})
grp["ids"].append(r["id"])
for k, v in r.get("inputs", {}).items():
if k != "region":
grp["inputs"].setdefault(k, v)
id_remap = {}
merged_resources = []
for tf_dir, grp in groups.items():
child_id = _child_id(grp["ids"])
for sub_id in grp["ids"]:
id_remap[sub_id] = child_id
merged_resources.append({"id": child_id, "module": grp["module"], "inputs": grp["inputs"]})
parts.extend(_emit_module_block(r, terraform_dirs, repo_root, set(data_source_names), id_remap)
for r in merged_resources)
for out_name, out_spec in stack_outputs.items():
if isinstance(out_spec, dict) and "from" in out_spec:
rid = out_spec["from"]
mod_out = out_spec.get("output", out_name)
parts.append(_emit_root_output(out_name, rid, mod_out))
rid = id_remap.get(out_spec["from"], out_spec["from"])
parts.append(_emit_root_output(out_name, rid, out_spec.get("output", out_name)))
main_tf = "\n\n".join(parts) + "\n"
with open(os.path.join(out_dir, "main.tf"), "w") as fh:
@@ -192,6 +189,5 @@ if __name__ == "__main__":
print("usage: adapter.py <instance.json> <out_dir>", file=sys.stderr)
sys.exit(2)
with open(sys.argv[1], "r") as fh:
stack = json.load(fh)
adapt(stack, sys.argv[2])
adapt(json.load(fh), sys.argv[2])
print(f"adapter: emitted terraform to {sys.argv[2]}", file=sys.stderr)