fix stack

Author: jdkent

.github/workflows/deploy.yml

@@ -54,6 +54,24 @@ jobs:
             ComposeRunnerImageRepositoriesStack \
             --require-approval never
 
+      - name: Verify ComposeRunnerStack does not synthesize CDK Docker assets
+        working-directory: infra/cdk
+        env:
+          VERSION: ${{ github.event.release.tag_name }}
+        run: |
+          source .venv/bin/activate
+          rm -rf /tmp/compose-runner-cdk-verify
+          cdk synth \
+            ComposeRunnerStack \
+            --output /tmp/compose-runner-cdk-verify \
+            -c composeRunnerVersion=${VERSION} >/dev/null
+          jq -e '(.dockerImages // {}) | length == 0' \
+            /tmp/compose-runner-cdk-verify/ComposeRunnerStack.assets.json >/dev/null || {
+              echo "ComposeRunnerStack synthesized Docker image assets; deployment would require the CDK bootstrap ECR repository."
+              cat /tmp/compose-runner-cdk-verify/ComposeRunnerStack.assets.json
+              exit 1
+          }
+
       - name: Log in to Amazon ECR
         run: |
           AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)

infra/cdk/tests/test_compose_runner_stack.py

@@ -1,14 +1,25 @@
 from __future__ import annotations
 
 import json
+import sys
+import tempfile
 import unittest
+from pathlib import Path
 
-import aws_cdk as cdk
-from aws_cdk.assertions import Template
+try:
+    import aws_cdk as cdk
+    from aws_cdk.assertions import Template
+except ModuleNotFoundError:
+    cdk = None
+    Template = None
 
-from stacks import ComposeRunnerImageRepositoriesStack, ComposeRunnerStack
+sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
 
+if cdk is not None:
+    from stacks import ComposeRunnerImageRepositoriesStack, ComposeRunnerStack
 
+
+@unittest.skipIf(cdk is None, "aws_cdk is not installed in this test environment")
 class ComposeRunnerStackImageConfigTest(unittest.TestCase):
     def test_stack_uses_explicit_ecr_repositories(self) -> None:
         app = cdk.App(context={"composeRunnerVersion": "0.7.8"})
@@ -42,6 +53,34 @@ def test_stack_uses_explicit_ecr_repositories(self) -> None:
         self.assertNotIn("cdk-hnb659fds-container-assets", app_template_json)
         self.assertNotIn("AssetParameters", app_template_json)
 
+    def test_cloud_assembly_does_not_include_docker_image_assets(self) -> None:
+        with tempfile.TemporaryDirectory() as output_dir:
+            app = cdk.App(
+                context={"composeRunnerVersion": "0.7.8"},
+                outdir=output_dir,
+            )
+
+            image_repositories_stack = ComposeRunnerImageRepositoriesStack(
+                app,
+                "ComposeRunnerImageRepositoriesStack",
+                env=cdk.Environment(account="631329474511", region="us-east-1"),
+            )
+
+            ComposeRunnerStack(
+                app,
+                "ComposeRunnerStack",
+                ecs_image_repository=image_repositories_stack.ecs_image_repository,
+                lambda_image_repository=image_repositories_stack.lambda_image_repository,
+                env=cdk.Environment(account="631329474511", region="us-east-1"),
+            )
+
+            app.synth()
+
+            with open(f"{output_dir}/ComposeRunnerStack.assets.json", encoding="utf-8") as manifest_file:
+                assets_manifest = json.load(manifest_file)
+
+            self.assertEqual(assets_manifest.get("dockerImages", {}), {})
+
 
 if __name__ == "__main__":
     unittest.main()