cdk-factory 0.9.6__tar.gz → 0.9.9__tar.gz

{cdk_factory-0.9.6 → cdk_factory-0.9.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdk_factory
-Version: 0.9.6
+Version: 0.9.9
 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.6 → cdk_factory-0.9.9}/pyproject.toml

@@ -33,7 +33,7 @@ markers = [
 [project]
 
 name = "cdk_factory"
-version = "0.9.6"
+version = "0.9.9"
 authors = [
   { name="Eric Wilson", email="eric.wilson@geekcafe.com" }
 ]

{cdk_factory-0.9.6 → cdk_factory-0.9.9}/src/cdk_factory/app.py

@@ -4,14 +4,21 @@ Geek Cafe, LLC
 Maintainers: Eric Wilson
 MIT License.  See Project Root for the license information.
 """
+import json
 import os
+import shutil
+import sys
+import warnings
 from pathlib import Path
+from typing import Optional
 import aws_cdk
 from aws_cdk.cx_api import CloudAssembly
+from aws_lambda_powertools import Logger
 
 from cdk_factory.utilities.commandline_args import CommandlineArgs
 from cdk_factory.workload.workload_factory import WorkloadFactory
 from cdk_factory.utilities.configuration_loader import ConfigurationLoader
+from cdk_factory.utilities.file_operations import FileOperations
 from cdk_factory.version import __version__
 
 
@@ -30,27 +37,52 @@ class CdkAppFactory:
     ) -> None:
 
         self.args = args or CommandlineArgs()
-        self.runtime_directory = runtime_directory or str(Path(__file__).parent)
+        self.runtime_directory = runtime_directory
         self.config_path: str | None = config_path
         self.add_env_context = add_env_context
         self._is_pipeline = is_pipeline
-        
-        # Auto-detect outdir for CodeBuild compatibility
-        if outdir is None and self.args.outdir is None and auto_detect_project_root:
-            # For both local dev and CodeBuild: use CDK default (./cdk.out in current directory)
-            # This ensures CDK CLI can always find the files where it expects them
-            # CodeBuild buildspec handles artifact collection from the correct location
-            self.outdir = None
-            
-            # Log for transparency
-            if os.getenv('CODEBUILD_SRC_DIR'):
-                print(f"📦 CodeBuild detected: using CDK default (./cdk.out)")
-                print(f"   └─ BuildSpec will collect artifacts from correct location")
+
+        if not self.runtime_directory and auto_detect_project_root:
+            self.runtime_directory = FileOperations.caller_app_dir()
+
+        print(f"📂 Runtime directory: {self.runtime_directory}")
+
+        # 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)
+            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"
         else:
-            self.outdir = outdir or self.args.outdir
-        
+            # 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}")
+
+        # Clean and recreate directory for fresh synthesis
+        if os.path.exists(self.outdir):
+            shutil.rmtree(self.outdir)
+        os.makedirs(self.outdir, exist_ok=True)
+
         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,
@@ -64,16 +96,12 @@ class CdkAppFactory:
         """
 
         print(f"👋 Synthesizing CDK App from the cdk-factory version: {__version__}")
-        
-        # Log outdir configuration
-        if self.outdir:
-            resolved_outdir = str(Path(self.outdir).resolve()) if not os.path.isabs(self.outdir) else self.outdir
-            print(f"📂 CDK output directory configured: {self.outdir}")
-            if not os.path.isabs(self.outdir):
-                print(f"   └─ Resolves to: {resolved_outdir}")
-        else:
-            print(f"📂 CDK output directory: using CDK default (./cdk.out in current directory)")
-            print(f"   └─ Current directory: {os.getcwd()}")
+
+        # Log consistent output directory
+        print(f"📂 CDK output directory: {self.outdir}")
+        print(
+            f"   └─ Consistent location works in both local and CodeBuild environments"
+        )
 
         if not paths:
             paths = []
@@ -108,24 +136,24 @@ class CdkAppFactory:
         assembly: CloudAssembly = workload.synth()
 
         print("☁️ cloud assembly dir", assembly.directory)
-        
+
         # Validate that the assembly directory exists and has files
         self._validate_synth_output(assembly)
 
         return assembly
-    
+
     def _validate_synth_output(self, assembly: CloudAssembly) -> None:
         """
         Validate that CDK synthesis actually created the expected files.
-        
+
         Args:
             assembly: The CloudAssembly returned from synth
-            
+
         Raises:
             RuntimeError: If the output directory doesn't exist or is empty
         """
         assembly_dir = Path(assembly.directory)
-        
+
         # Check if directory exists
         if not assembly_dir.exists():
             raise RuntimeError(
@@ -134,7 +162,7 @@ class CdkAppFactory:
                 f"   Configured outdir: {self.outdir}\n"
                 f"   Current directory: {os.getcwd()}"
             )
-        
+
         # Check if directory has files
         files = list(assembly_dir.iterdir())
         if not files:
@@ -143,7 +171,7 @@ class CdkAppFactory:
                 f"   Directory: {assembly_dir}\n"
                 f"   This usually means CDK failed to write files."
             )
-        
+
         # Check for manifest.json (key CDK file)
         manifest = assembly_dir / "manifest.json"
         if not manifest.exists():
@@ -153,13 +181,13 @@ class CdkAppFactory:
                 f"   Files found: {[f.name for f in files]}\n"
                 f"   CDK may have failed during synthesis."
             )
-        
+
         # Success - log details
         print(f"✅ CDK synthesis successful!")
         print(f"   └─ Output directory: {assembly_dir}")
         print(f"   └─ Files created: {len(files)}")
         print(f"   └─ Stacks: {len(assembly.stacks)}")
-        
+
         # Log stack names
         if assembly.stacks:
             stack_names = [stack.stack_name for stack in assembly.stacks]

cdk_factory-0.9.9/src/cdk_factory/pipeline/path_utils.py

@@ -0,0 +1,68 @@
+"""
+Pipeline path utility functions.
+
+This module contains path conversion utilities used by the pipeline factory.
+Separated from pipeline_factory.py to avoid circular import issues.
+"""
+import os
+from pathlib import Path
+
+
+def convert_app_file_to_relative_directory(cdk_app_file: str) -> str:
+    """
+    Convert a CDK app.py file path to a relative directory path.
+    
+    CRITICAL: This ensures paths are ALWAYS relative before being baked into the buildspec.
+    This prevents:
+    1. Local absolute paths from being baked into CloudFormation templates
+    2. Self-mutate loops due to changing CODEBUILD_SRC_DIR paths
+    
+    Args:
+        cdk_app_file: Path to app.py (can be absolute or relative)
+        
+    Returns:
+        Relative directory path (e.g., "devops/cdk-iac") or empty string for root
+        
+    Examples:
+        >>> convert_app_file_to_relative_directory("/project/devops/cdk-iac/app.py")
+        "devops/cdk-iac"
+        
+        >>> convert_app_file_to_relative_directory("devops/cdk-iac/app.py")
+        "devops/cdk-iac"
+        
+        >>> convert_app_file_to_relative_directory("/project/app.py")
+        ""
+    """
+    cdk_app_file_path = Path(cdk_app_file)
+    
+    # If absolute path, try to make it relative
+    if cdk_app_file_path.is_absolute():
+        # Check if we have a project root hint (CODEBUILD_SRC_DIR or current working directory)
+        codebuild_src = os.getenv('CODEBUILD_SRC_DIR')
+        base_dir = codebuild_src if codebuild_src else os.getcwd()
+        
+        try:
+            # Resolve symlinks (important for macOS where /var -> /private/var)
+            resolved_file = str(Path(cdk_app_file_path).resolve())
+            resolved_base = str(Path(base_dir).resolve())
+            
+            # Make it relative to base directory
+            rel_path = os.path.relpath(resolved_file, resolved_base)
+            # If we ended up going outside (../), that's probably wrong
+            if not rel_path.startswith('..'):
+                cdk_app_file_path = Path(rel_path)
+        except ValueError:
+            # Different drives on Windows - can't make relative
+            pass
+    
+    # Remove /app.py to get directory
+    cdk_directory = str(cdk_app_file_path.parent if cdk_app_file_path.name == 'app.py' else cdk_app_file_path.parent)
+    
+    # Normalize to use forward slashes (works on Windows and Linux)
+    cdk_directory = cdk_directory.replace('\\', '/')
+    
+    # If it's just '.' (current directory), use empty string
+    if cdk_directory in ('.', './'):
+        cdk_directory = ""
+    
+    return cdk_directory

{cdk_factory-0.9.6 → cdk_factory-0.9.9}/src/cdk_factory/pipeline/pipeline_factory.py

@@ -26,11 +26,12 @@ from cdk_factory.workload.workload_factory import WorkloadConfig
 from cdk_factory.configurations.cdk_config import CdkConfig
 from cdk_factory.configurations.pipeline_stage import PipelineStageConfig
 from cdk_factory.interfaces.istack import IStack
+from cdk_factory.pipeline.path_utils import convert_app_file_to_relative_directory
 
 logger = Logger()
 
 
-class PipelineFactoryStack(cdk.Stack):
+class PipelineFactoryStack(IStack):
     """
     Pipeline Stacks wrap up your application for a CI/CD pipeline Stack
     """
@@ -355,51 +356,16 @@ class PipelineFactoryStack(cdk.Stack):
     def _get_synth_shell_step(self) -> pipelines.ShellStep:
         if not self.workload.cdk_app_file:
             raise ValueError("CDK app file is not defined")
-        cdk_directory = self.workload.cdk_app_file.removesuffix("/app.py")
 
         build_commands = self._get_build_commands()
 
-        # Calculate where cdk.out will be created relative to project root
-        # The build commands cd into cdk_directory and create ./cdk.out there
-        # We need to tell the pipeline where to find those artifacts
-        import os
-        from pathlib import Path
-        
-        # Get the directory portion of cdk_app_file
-        cdk_dir_path = Path(cdk_directory)
-        
-        # If we have CODEBUILD_SRC_DIR, use it as the base to calculate relative path
-        codebuild_src = os.getenv('CODEBUILD_SRC_DIR')
-        
-        if codebuild_src and cdk_dir_path.is_absolute():
-            # Calculate relative path from CodeBuild source directory
-            # Example: /codebuild/.../src/devops/cdk-iac relative to /codebuild/.../src = devops/cdk-iac
-            try:
-                cdk_relative_dir = os.path.relpath(str(cdk_dir_path), codebuild_src)
-                # If relpath resulted in going up directories (starts with ..), use empty
-                # If relpath is '.' (same directory), use empty (app.py at root)
-                if cdk_relative_dir.startswith('..') or cdk_relative_dir == '.':
-                    cdk_relative_dir = ""
-            except ValueError:
-                # Paths on different drives (Windows) - fallback to empty
-                cdk_relative_dir = ""
-        elif cdk_dir_path.is_absolute():
-            # No CODEBUILD_SRC_DIR but path is absolute - can't determine relative path reliably
-            # Fallback to empty (will use "cdk.out" at root)
-            cdk_relative_dir = ""
-        else:
-            # Path is already relative - use as-is
-            cdk_relative_dir = str(cdk_dir_path)
-        
-        # Construct the path to cdk.out relative to project root
-        if cdk_relative_dir:
-            cdk_out_directory = f"{cdk_relative_dir}/cdk.out"
-        else:
-            cdk_out_directory = "cdk.out"
+        # Use consistent /tmp/cdk-factory/cdk.out location
+        # This matches the output directory configured in CdkAppFactory
+        cdk_out_directory = "/tmp/cdk-factory/cdk.out"
 
-        build_commands.append(f"echo 👉 cdk_directory: {cdk_directory}")
-        build_commands.append(f"echo 👉 cdk_out_directory: {cdk_out_directory}")
-        build_commands.append("echo 👉 PWD from synth shell step: ${PWD}")
+        # 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'")
 
         shell = pipelines.ShellStep(
             "CDK Synth",

{cdk_factory-0.9.6 → cdk_factory-0.9.9}/src/cdk_factory/utilities/file_operations.py

@@ -6,6 +6,7 @@ MIT License.  See Project Root for the license information.
 
 import os
 import shutil
+import inspect
 import zipfile
 from typing import List
 from pathlib import Path
@@ -277,3 +278,13 @@ class FileOperations:
                 return sub_dir
 
         return None
+
+    @staticmethod
+    def caller_app_dir(default: str = ".") -> str:
+        # frame[0] is this function; frame[1] is the factory; frame[2] should be app.py
+        for frame_info in inspect.stack():
+            # first non-package frame likely belongs to app.py
+            candidate = os.path.abspath(os.path.dirname(frame_info.filename))
+            if "site-packages" not in candidate and "dist-packages" not in candidate:
+                return candidate
+        return os.path.abspath(default)

cdk_factory-0.9.9/src/cdk_factory/version.py

@@ -0,0 +1 @@
+__version__ = "0.9.9"

cdk_factory-0.9.6/src/cdk_factory/version.py

@@ -1 +0,0 @@
-__version__ = "0.9.6"