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---

adapters/terraform/adapter.py

@@ -112,6 +112,8 @@ def adapt(stack_instance, out_dir):
 
     stack_name = stack.get("name", "spike")
     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 {\n'
         '  required_version = ">= 1.9, < 1.10"\n'
@@ -122,7 +124,7 @@ def adapt(stack_instance, out_dir):
         '    }\n'
         '  }\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'
         '    region = "us-east-1"\n'
         '  }\n'
@@ -137,7 +139,7 @@ def adapt(stack_instance, out_dir):
             'data "terraform_remote_state" "platform" {\n'
             '  backend = "s3"\n'
             '  config = {\n'
-            '    bucket = "acdl-tfstate-581513795199-us-east-1"\n'
+            f'    bucket = "{state_bucket}"\n'
             f'    key    = "{remote_state_key}"\n'
             '    region = "us-east-1"\n'
             '  }\n'

core/lambda/contract_ingestor.py

@@ -17,6 +17,7 @@ requests. The invoke policy is scoped via ABAC (consumer repo identity).
 import datetime
 import json
 import os
+import urllib.error
 import urllib.parse
 
 import boto3
@@ -154,7 +155,16 @@ def _report_error(payload):
         with urllib.request.urlopen(req, timeout=10) as resp:
             search_result = json.loads(resp.read())
         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 = []
 
     body = f"""## Deploy Failure Report

core/local_emulators.py

@@ -371,8 +371,9 @@ class LocalLambdaStub:
                 return _FakeResponse(
                     json.dumps([{"number": 1, "title": "stub"}]).encode())
             urllib.request.urlopen = _fake_urlopen
-        except Exception:
-            pass
+        except (AttributeError, TypeError) as e:
+            import sys
+            print(f"WARNING: could not patch urlopen for local Lambda stub: {e}", file=sys.stderr)
 
         try:
             event = {

core/output_publisher.py

@@ -97,8 +97,10 @@ def publish_to_ssm(outputs, environment, contract_id):
                 Overwrite=True,
             )
             results[name] = param_name
-        except Exception:
-            # Don't fail the pipeline if one output fails to publish
+        except Exception as e:
+            # 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
     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")
         urllib.request.urlopen(req, timeout=10)
         return True
-    except Exception:
+    except Exception as e:
+        import sys
+        print(f"WARNING: GitHub PR comment failed: {e}", file=sys.stderr)
         return False
 
 

core/regression_verify.py

@@ -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"),
                           aws_access_key_id=env.get("AWS_ACCESS_KEY_ID"),
                           aws_secret_access_key=env.get("AWS_SECRET_ACCESS_KEY"))
-        s3.head_bucket(Bucket="acdl-tfstate-581513795199-us-east-1")
-        r = s3.list_objects_v2(Bucket="acdl-tfstate-581513795199-us-east-1", MaxKeys=5)
+        account_id = os.environ.get("ACDL_AWS_ACCOUNT_ID", "581513795199")
+        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", [])]
         return "Verified", f"state bucket exists, keys={keys}"
     except Exception as e:

modules/l1/alb/terraform/main.tf

@@ -6,7 +6,7 @@ resource "aws_lb" "this" {
 }
 
 resource "aws_lb_target_group" "this" {
-  name_prefix = "tg-ci-"
+  name_prefix = "${var.name}-"
   port        = var.port
   protocol    = var.protocol
   vpc_id      = var.vpc_id

scripts/push_consumer_image.py

@@ -29,7 +29,7 @@ import boto3
 
 REPO_ROOT = pathlib.Path(__file__).resolve().parent.parent
 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"
 ECR_REPO_NAME = "acdl-microservice"
 IMAGE_TAG = "latest"

terraform/bootstrap/apply_iam_baseline.py

@@ -30,7 +30,7 @@ import boto3
 
 ROOT = Path(__file__).resolve().parent.parent.parent
 POLICY_PATH = ROOT / "terraform" / "bootstrap" / "spike_runner_policy.json"
-ACCOUNT = "581513795199"
+ACCOUNT = os.environ.get("ACDL_AWS_ACCOUNT_ID", "581513795199")
 USER = "acdl-spike-runner"
 POLICY_NAME = "acdl-spike-runner-policy"
 POLICY_ARN = f"arn:aws:iam::{ACCOUNT}:policy/{POLICY_NAME}"
@@ -75,8 +75,10 @@ def apply_managed_policy(iam, policy_doc: str) -> str:
             try:
                 iam.delete_policy_version(PolicyArn=POLICY_ARN, VersionId=default)
                 print(f"deleted old default version {default}")
+            except iam.exceptions.NoSuchEntityException:
+                pass  # already deleted
             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
     except iam.exceptions.NoSuchEntityException:
         print(f"creating managed policy {POLICY_NAME}...")

terraform/bootstrap/create_state_backend.py

@@ -30,9 +30,9 @@ import boto3
 
 
 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"
-ACCOUNT_ID = "581513795199"
 
 
 def main():
@@ -48,12 +48,16 @@ def main():
     try:
         s3.head_bucket(Bucket=STATE_BUCKET)
         print(f"s3: bucket {STATE_BUCKET} already exists")
-    except Exception:
-        kwargs = {"Bucket": STATE_BUCKET}
-        if REGION != "us-east-1":
-            kwargs["CreateBucketConfiguration"] = {"LocationConstraint": REGION}
-        s3.create_bucket(**kwargs)
-        print(f"s3: created bucket {STATE_BUCKET}")
+    except s3.exceptions.ClientError as e:
+        error_code = e.response.get("Error", {}).get("Code", "")
+        if error_code in ("404", "NoSuchBucket", "NotFound"):
+            kwargs = {"Bucket": STATE_BUCKET}
+            if REGION != "us-east-1":
+                kwargs["CreateBucketConfiguration"] = {"LocationConstraint": REGION}
+            s3.create_bucket(**kwargs)
+            print(f"s3: created bucket {STATE_BUCKET}")
+        else:
+            raise
     # Enable versioning (idempotent)
     s3.put_bucket_versioning(
         Bucket=STATE_BUCKET,

tests/test_adapter.py

@@ -361,4 +361,88 @@ class TestAdapterDedupRejectsUnregisteredModule:
             "data_sources": [],
         }
         adapt(stack, str(tmp_path))
-        assert (tmp_path / "main.tf").exists()
+        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