cdk-factory 0.9.10__py3-none-any.whl → 0.9.12__py3-none-any.whl

cdk_factory/app.py

@@ -32,47 +32,41 @@ class CdkAppFactory:
         config_path: str | None = None,
         outdir: str | None = None,
         add_env_context: bool = True,
-        auto_detect_project_root: bool = True,
-        is_pipeline: bool = False,
     ) -> None:
 
         self.args = args or CommandlineArgs()
         self.runtime_directory = runtime_directory
         self.config_path: str | None = config_path
         self.add_env_context = add_env_context
-        self._is_pipeline = is_pipeline
 
-        if not self.runtime_directory and auto_detect_project_root:
+        # Auto-detect runtime_directory if not provided
+        if not self.runtime_directory:
             self.runtime_directory = FileOperations.caller_app_dir()
 
-        print(f"📂 Runtime directory: {self.runtime_directory}")
+        # Determine output directory with clear priority order:
+        # 1. Explicit outdir parameter (highest priority)
+        # 2. CDK_OUTDIR environment variable
+        # 3. Default: {runtime_directory}/cdk.out
 
-        # Handle outdir - backward compatible with smart defaults
         supplied_outdir = outdir or (
             self.args.outdir if hasattr(self.args, "outdir") else None
         )
 
         if supplied_outdir:
-            # If absolute path: use as-is (backward compatible)
+            # Explicit outdir: if relative, resolve against runtime_directory
+            # If absolute, use as-is
             if os.path.isabs(supplied_outdir):
                 self.outdir = supplied_outdir
             else:
-                # If relative path/name: treat as namespace within /tmp/cdk-factory
-                namespace = supplied_outdir.rstrip("/")
-                if not namespace or namespace in (".", ".."):
-                    namespace = "default"
-                # TODO: NOT SURE IF WE SHOULD DO THIS
-                self.outdir = f"/tmp/cdk-factory/{namespace}/cdk.out"
+                # Relative path: resolve against runtime_directory, not cwd
+                self.outdir = os.path.join(self.runtime_directory, supplied_outdir)
+        elif os.getenv("CDK_OUTDIR"):
+            # Environment variable override
+            self.outdir = os.path.abspath(os.getenv("CDK_OUTDIR"))
         else:
-            # Default: cdk.out relative to runtime_directory (where app.py lives)
-            # This ensures CDK CLI can find it when running via cdk.json
-            self.outdir = str(Path(self.runtime_directory) / "cdk.out")
-
-        # Env or CLI still win if you want to honor them:
-        env_out = os.getenv("CDK_OUTDIR")
-        if env_out:
-            self.outdir = os.path.abspath(env_out)
-            print(f"[cdk-factory] CDK_OUTDIR override -> {self.outdir}")
+            # Default: cdk.out in runtime_directory
+            # This resolves correctly in both local and CodeBuild environments
+            self.outdir = os.path.join(self.runtime_directory, "cdk.out")
 
         # Clean and recreate directory for fresh synthesis
         if os.path.exists(self.outdir):
@@ -81,8 +75,6 @@ class CdkAppFactory:
 
         self.app: aws_cdk.App = aws_cdk.App(outdir=self.outdir)
 
-        print(f"📂 CDK output directory: {self.outdir}")
-
     def synth(
         self,
         cdk_app_file: str | None = None,
@@ -95,13 +87,9 @@ class CdkAppFactory:
             CloudAssembly: CDK CloudAssembly
         """
 
-        print(f"👋 Synthesizing CDK App from the cdk-factory version: {__version__}")
-
-        # Log consistent output directory
-        print(f"📂 CDK output directory: {self.outdir}")
-        print(
-            f"   └─ Consistent location works in both local and CodeBuild environments"
-        )
+        print(f"👋 Synthesizing CDK App from cdk-factory v{__version__}")
+        print(f"📂 Runtime directory: {self.runtime_directory}")
+        print(f"📂 Output directory: {self.outdir}")
 
         if not paths:
             paths = []
@@ -140,6 +128,8 @@ class CdkAppFactory:
         # Validate that the assembly directory exists and has files
         self._validate_synth_output(assembly)
 
+        self._copy_cdk_out_to_project_root()
+
         return assembly
 
     def _validate_synth_output(self, assembly: CloudAssembly) -> None:
@@ -258,6 +248,33 @@ class CdkAppFactory:
         # Priority 4: Fallback to runtime_directory
         return str(current)
 
+    def _copy_cdk_out_to_project_root(self):
+        # Copy the cdk.out directory to the project root so it can be picked up by CodeBuild
+        # Source: the actual CDK output directory from the synthesis (e.g., /tmp/cdk-factory/cdk.out)
+        cdk_out_source = self.outdir
+
+        # raise Exception(f"cdk_out_source: {cdk_out_source}")
+
+        # Destination: project root (two directories up from devops/cdk-iac where this file lives)
+        project_root = os.getenv("CODEBUILD_SRC_DIR")
+        if not project_root:
+            return
+
+        cdk_out_dest = os.path.join(project_root, "cdk.out")
+
+        print(f"👉 Project root: {project_root}")
+        print(f"👉 CDK output source: {cdk_out_source}")
+        print(f"👉 CDK output destination: {cdk_out_dest}")
+
+        if os.path.exists(cdk_out_dest):
+            print("❌ CDK output directory already exists, skipping copy")
+            return
+        else:
+            print("✅ CDK output directory does not exist, copying")
+
+        shutil.copytree(cdk_out_source, cdk_out_dest)
+        print(f"✅  Copied CDK output to {cdk_out_dest}")
+
 
 if __name__ == "__main__":
     # deploy_test()

cdk_factory/pipeline/pipeline_factory.py

@@ -359,14 +359,17 @@ class PipelineFactoryStack(IStack):
 
         build_commands = self._get_build_commands()
 
-        # Use consistent /tmp/cdk-factory/cdk.out location
-        # This matches the output directory configured in CdkAppFactory
-        # cdk_out_directory = "/tmp/cdk-factory/cdk.out"
-        cdk_out_directory = self.workload.output_directory
+        # Convert absolute output directory to relative path for BuildSpec
+        # This prevents baking in local absolute paths
+        cdk_out_directory = self._get_relative_output_directory()
+
+        if cdk_out_directory.startswith("/"):
+            raise ValueError("CDK output directory must be a relative path")
 
         # Debug logging - will be baked into buildspec
-        build_commands.append(f"echo '👉 CDK output directory: {cdk_out_directory}'")
-        build_commands.append("echo '👉 Consistent location in all environments'")
+        build_commands.append(
+            f"echo '👉 CDK output directory (relative): {cdk_out_directory}'"
+        )
 
         shell = pipelines.ShellStep(
             "CDK Synth",
@@ -377,6 +380,34 @@ class PipelineFactoryStack(IStack):
 
         return shell
 
+    def _get_relative_output_directory(self) -> str:
+        """
+        Convert absolute output directory to relative path from repository root.
+        This prevents baking local absolute paths into the BuildSpec.
+
+        Example:
+            Absolute: /Users/eric/project/devops/cdk-iac/cdk.out
+            Relative: devops/cdk-iac/cdk.out
+        """
+        output_dir = self.workload.output_directory
+
+        # Get the current working directory (repository root during synthesis)
+        cwd = os.getcwd()
+
+        # Convert to absolute paths for reliable comparison
+        abs_output = os.path.abspath(output_dir)
+        abs_cwd = os.path.abspath(cwd)
+
+        # Compute relative path from repo root to output directory
+        try:
+            relative_path = os.path.relpath(abs_output, abs_cwd)
+            return relative_path
+        except ValueError:
+            print(f"Failed to compute relative path from {abs_output} to {abs_cwd}")
+            # Different drives on Windows or other edge case
+            # Fall back to basename approach (just the directory name)
+            return "cdk.out"
+
     def _get_build_commands(self) -> List[str]:
         # print("generating building commands")
 

cdk_factory/version.py

@@ -1 +1 @@
-__version__ = "0.9.10"
+__version__ = "0.9.12"

{cdk_factory-0.9.10.dist-info → cdk_factory-0.9.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdk_factory
-Version: 0.9.10
+Version: 0.9.12
 Summary: CDK Factory. A QuickStarter and best practices setup for CDK projects
 Author-email: Eric Wilson <eric.wilson@geekcafe.com>
 License: MIT License

{cdk_factory-0.9.10.dist-info → cdk_factory-0.9.12.dist-info}/RECORD

@@ -1,8 +1,8 @@
 cdk_factory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cdk_factory/app.py,sha256=VPO4ohK54hcWJa9Auq06t0oAW2nLekMGjSxAnxUWCvs,9640
+cdk_factory/app.py,sha256=RnX0-pwdTAPAdKJK_j13Zl8anf9zYKBwboR0KA8K8xM,10346
 cdk_factory/cdk.json,sha256=SKZKhJ2PBpFH78j-F8S3VDYW-lf76--Q2I3ON-ZIQfw,3106
 cdk_factory/cli.py,sha256=FGbCTS5dYCNsfp-etshzvFlGDCjC28r6rtzYbe7KoHI,6407
-cdk_factory/version.py,sha256=5nY2lKMmQwtU8FXTQ2Qpv9EUNfy2UJF9cHFr82n7ARw,23
+cdk_factory/version.py,sha256=XR5b9xrEQYlPbzUgeAtHjn10uKetzrpCdRIvgcGJkoI,23
 cdk_factory/builds/README.md,sha256=9BBWd7bXpyKdMU_g2UljhQwrC9i5O_Tvkb6oPvndoZk,90
 cdk_factory/commands/command_loader.py,sha256=QbLquuP_AdxtlxlDy-2IWCQ6D-7qa58aphnDPtp_uTs,3744
 cdk_factory/configurations/base_config.py,sha256=JKjhNsy0RCUZy1s8n5D_aXXI-upR9izaLtCTfKYiV9k,9624
@@ -65,7 +65,7 @@ cdk_factory/interfaces/live_ssm_resolver.py,sha256=3FIr9a02SXqZmbFs3RT0WxczWEQR_
 cdk_factory/interfaces/ssm_parameter_mixin.py,sha256=uA2j8HmAOpuEA9ynRj51s0WjUHMVLsbLQN-QS9NKyHA,12089
 cdk_factory/lambdas/health_handler.py,sha256=dd40ykKMxWCFEIyp2ZdQvAGNjw_ylI9CSm1N24Hp2ME,196
 cdk_factory/pipeline/path_utils.py,sha256=fvWdrcb4onmpIu1APkHLhXg8zWfK74HcW3Ra2ynxfXM,2586
-cdk_factory/pipeline/pipeline_factory.py,sha256=PqaPu5tQpkMObSgoHUxVcuA5UoI8CaMRiX2jx4XTg9c,16111
+cdk_factory/pipeline/pipeline_factory.py,sha256=rvtkdlTPJG477nTVRN8S2ksWt4bwpd9eVLFd9WO02pM,17248
 cdk_factory/pipeline/stage.py,sha256=Be7ExMB9A-linRM18IQDOzQ-cP_I2_ThRNzlT4FIrUg,437
 cdk_factory/pipeline/security/policies.py,sha256=H3-S6nipz3UtF9Pc5eJYr4-aREUTCaJWMjOUyd6Rdv4,4406
 cdk_factory/pipeline/security/roles.py,sha256=ZB_O5H_BXgotvVspS2kVad9EMcY-a_-vU7Nm1_Z5MB8,4985
@@ -120,8 +120,8 @@ cdk_factory/utilities/lambda_function_utilities.py,sha256=S1GvBsY_q2cyUiaud3HORJ
 cdk_factory/utilities/os_execute.py,sha256=5Op0LY_8Y-pUm04y1k8MTpNrmQvcLmQHPQITEP7EuSU,1019
 cdk_factory/utils/api_gateway_utilities.py,sha256=If7Xu5s_UxmuV-kL3JkXxPLBdSVUKoLtohm0IUFoiV8,4378
 cdk_factory/workload/workload_factory.py,sha256=yBUDGIuB8-5p_mGcVFxsD2ZoZIziak3yh3LL3JvS0M4,5903
-cdk_factory-0.9.10.dist-info/METADATA,sha256=B9EhOfGJhkb_Du8nOE5NmJ0A-YqDU0ou8a6l6o7E8GM,2451
-cdk_factory-0.9.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cdk_factory-0.9.10.dist-info/entry_points.txt,sha256=S1DPe0ORcdiwEALMN_WIo3UQrW_g4YdQCLEsc_b0Swg,53
-cdk_factory-0.9.10.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
-cdk_factory-0.9.10.dist-info/RECORD,,
+cdk_factory-0.9.12.dist-info/METADATA,sha256=wgeRcZWqPKX7AJQGcU38dz44uB09hpGdp-MVTjfxsOA,2451
+cdk_factory-0.9.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cdk_factory-0.9.12.dist-info/entry_points.txt,sha256=S1DPe0ORcdiwEALMN_WIo3UQrW_g4YdQCLEsc_b0Swg,53
+cdk_factory-0.9.12.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
+cdk_factory-0.9.12.dist-info/RECORD,,