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

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

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

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

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

@@ -18,6 +18,7 @@ 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__
 
 
@@ -36,36 +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
-        
-        # ALWAYS use /tmp/cdk-factory for consistent, predictable output location
-        # This works in both local dev and CodeBuild environments
-        CDK_FACTORY_BASE_DIR = "/tmp/cdk-factory"
-        
-        # Use outdir as a namespace directory (not full path)
-        # This allows multiple projects/deployments to coexist without conflicts
-        supplied_outdir = outdir or (self.args.outdir if hasattr(self.args, 'outdir') else None)
-        
+
+        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:
-            # Extract just the directory name (not full path)
-            namespace = os.path.basename(supplied_outdir.rstrip('/'))
-            if not namespace or namespace in ('.', '..'):
-                namespace = "default"
-            self.outdir = f"{CDK_FACTORY_BASE_DIR}/{namespace}/cdk.out"
+            # 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:
-            # Default namespace
-            self.outdir = f"{CDK_FACTORY_BASE_DIR}/cdk.out"
-        
+            # 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,
@@ -79,10 +96,12 @@ class CdkAppFactory:
         """
 
         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"   └─ Consistent location works in both local and CodeBuild environments"
+        )
 
         if not paths:
             paths = []
@@ -117,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(
@@ -143,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:
@@ -152,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():
@@ -162,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.8 → 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.8/src/cdk_factory/version.py

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