feat(P39): refresh design docs + parameterize adapter (P1-1)
---ci--- project: acdl phase: 39 milestone: v1.9 status: execute ---/ci--- Phase 39 — design-doc-refresh-and-p1-1-parameterization: Design docs (REQ-100, REQ-101): - hitl_matrix_design.md: 'dev-only spike'/'v1.2 wires the gates' framing replaced with v1.9 wired-gates reality; 8-concern matrix marked implemented (offline-testable subset + signed evidence artifacts, D-084); v1.9 wiring section cross-references hitl_gates.py + attestation_matrix.py; approver_dr noted. - audit_ledger_design.md: outbox marked shipped+production since v1.8; S3 Object Lock + JWS + async worker + DLQ + daily checkpoints clearly labeled 'Deferred to a future milestone (D-083)'; RPO/RTO table updated; approver fields note v1.9 hitl_gates.attest. P1-1 adapter parameterization (REQ-102, D-085): - ecs-service interface.json: desired_count (default 1), launch_type (FARGATE), family (app) inputs added. - alb interface.json: load_balancer_type (application), target_type (ip). - adapter.py: hardcoded defaults replaced with inputs.get(<name>, <default>); hardcoded 'acdl-microservice-rt'/'acdl-microservice-igw' Name tags derive from the VPC name input. - contract_resolver.py: child_input_map routes wires to the sub-resource that declares the input (desired_count → aws:ecs:service, family → aws:ecs:task_definition, target_type → targetgroup, etc.). - microservice composition.json: wires added for the new inputs. Tests: +21 (test_p1_1_adapter_parameterization.py, test_design_docs_current.py). 371 passed; run_ci.sh green; run_platform.sh --check-only green; v1.1 S3 regression preserved.
This commit is contained in:
@@ -235,8 +235,10 @@ def _emit_resource(resource, type_by_id=None):
|
||||
else _tf_value([sg_val] if isinstance(sg_val, str) else sg_val or [])
|
||||
))
|
||||
body.append("}")
|
||||
body.append("desired_count = 1")
|
||||
body.append("launch_type = \"FARGATE\"")
|
||||
desired = inputs.get("desired_count", 1)
|
||||
launch = inputs.get("launch_type", "FARGATE")
|
||||
body.append(f"desired_count = {desired}")
|
||||
body.append(f'launch_type = "{launch}"')
|
||||
body.append("task_definition = aws_ecs_task_definition.service-taskdefinition.arn")
|
||||
body.append("name = \"acdl-microservice\"")
|
||||
nfrs = resource.get("nfrs", {})
|
||||
@@ -269,9 +271,11 @@ def _emit_resource(resource, type_by_id=None):
|
||||
body.append("}")
|
||||
body.append("load_balancer_arn = aws_lb.alb-loadbalancer.id")
|
||||
if rtype == "aws:elbv2:loadbalancer":
|
||||
body.append("load_balancer_type = \"application\"")
|
||||
lb_type = inputs.get("load_balancer_type", "application")
|
||||
body.append(f'load_balancer_type = "{lb_type}"')
|
||||
if rtype == "aws:elbv2:targetgroup":
|
||||
body.append("target_type = \"ip\"")
|
||||
tgt_type = inputs.get("target_type", "ip")
|
||||
body.append(f'target_type = "{tgt_type}"')
|
||||
body.append("vpc_id = aws_vpc.vpc-vpc.id")
|
||||
body.append("protocol = \"HTTP\"")
|
||||
if rtype == "aws:ec2:routetable":
|
||||
@@ -280,7 +284,8 @@ def _emit_resource(resource, type_by_id=None):
|
||||
body.append(" gateway_id = aws_internet_gateway.vpc-igw.id")
|
||||
body.append("}")
|
||||
body.append("tags = {")
|
||||
body.append(' Name = "acdl-microservice-rt"')
|
||||
rt_name = inputs.get("name", "app")
|
||||
body.append(f' Name = "{rt_name}-rt"')
|
||||
body.append("}")
|
||||
if rtype == "aws:cloudfront:originaccesscontrol":
|
||||
name = inputs.get("name", "acdl-oac")
|
||||
@@ -478,8 +483,10 @@ def _emit_resource(resource, type_by_id=None):
|
||||
"UPTIME_KUMA_MONITOR_CONFIG": json.dumps(all_checks),
|
||||
"UPTIME_KUMA_ALERT_CONFIG": json.dumps(alert_channels),
|
||||
}
|
||||
body.append("desired_count = 1")
|
||||
body.append("launch_type = \"FARGATE\"")
|
||||
desired = inputs.get("desired_count", 1)
|
||||
launch = inputs.get("launch_type", "FARGATE")
|
||||
body.append(f"desired_count = {desired}")
|
||||
body.append(f'launch_type = "{launch}"')
|
||||
body.append("network_configuration {")
|
||||
body.append(" subnets = [\"subnet-uptime\"]")
|
||||
body.append(" security_groups = [\"sg-uptime\"]")
|
||||
@@ -508,11 +515,13 @@ def _emit_igw(resources):
|
||||
vpc_id = next((r["id"] for r in resources if r["type"] == "aws:ec2:vpc"), "vpc-vpc")
|
||||
subnet_id = next((r["id"] for r in resources if r["type"] == "aws:ec2:subnet"), "vpc-subnet")
|
||||
rt_id = next((r["id"] for r in resources if r["type"] == "aws:ec2:routetable"), "vpc-routetable")
|
||||
vpc_res = next((r for r in resources if r["type"] == "aws:ec2:vpc"), None)
|
||||
igw_name = (vpc_res.get("inputs", {}).get("name", "app") if vpc_res else "app")
|
||||
parts = []
|
||||
parts.append(_resource_block("vpc-igw", "aws_internet_gateway", [
|
||||
f"vpc_id = aws_vpc.{vpc_id}.id",
|
||||
"tags = {",
|
||||
' Name = "acdl-microservice-igw"',
|
||||
f' Name = "{igw_name}-igw"',
|
||||
"}",
|
||||
]))
|
||||
parts.append(_resource_block("vpc-rta", "aws_route_table_association", [
|
||||
|
||||
Reference in New Issue
Block a user