cdk-factory 0.9.3__py3-none-any.whl → 0.9.5__py3-none-any.whl

cdk_factory/pipeline/pipeline_factory.py

@@ -248,11 +248,11 @@ class PipelineFactoryStack(cdk.Stack):
     def _get_steps(self, key: str, stage_config: PipelineStageConfig):
         """
         Gets the build steps from the config.json.
-        
+
         Commands can be:
         - A list of strings (each string is a separate command)
         - A single multi-line string (treated as a single script block)
-        
+
         This allows support for complex shell constructs like if blocks, loops, etc.
         """
         shell_steps: List[pipelines.ShellStep] = []
@@ -264,12 +264,12 @@ class PipelineFactoryStack(cdk.Stack):
                 for step in steps:
                     step_id = step.get("id") or step.get("name")
                     commands = step.get("commands", [])
-                    
+
                     # Normalize commands to a list
                     # If commands is a single string, wrap it in a list
                     if isinstance(commands, str):
                         commands = [commands]
-                    
+
                     shell_step = pipelines.ShellStep(
                         id=step_id,
                         commands=commands,
@@ -359,19 +359,47 @@ class PipelineFactoryStack(cdk.Stack):
 
         build_commands = self._get_build_commands()
 
-        cdk_out_directory = self.workload.output_directory
+        # 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
         
-        # CdkAppFactory already provides the correct path:
-        # - For pipelines: relative path (e.g., "../../cdk.out" or "cdk.out")
-        # - For local: absolute path (but this code only runs for pipelines)
-        # If somehow we get an absolute path, convert it to just the basename
-        if cdk_out_directory and os.path.isabs(cdk_out_directory):
-            # Fallback: just use the last component
-            cdk_out_directory = os.path.basename(cdk_out_directory)
+        # 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"
 
         build_commands.append(f"echo 👉 cdk_directory: {cdk_directory}")
-        build_commands.append(f"echo 👉 cdk_out_directory (relative): {cdk_out_directory}")
-        build_commands.append("echo 👉 PWD from synth shell step: ${PWD}")
+        build_commands.append(f"echo 👉 cdk_out_directory: {cdk_out_directory}")
+        build_commands.append("echo 👉 PWD from synth shell step: ${{PWD}}")
 
         shell = pipelines.ShellStep(
             "CDK Synth",

cdk_factory/version.py

@@ -1 +1 @@
-__version__ = "0.9.3"
+__version__ = "0.9.5"

{cdk_factory-0.9.3.dist-info → cdk_factory-0.9.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdk_factory
-Version: 0.9.3
+Version: 0.9.5
 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.3.dist-info → cdk_factory-0.9.5.dist-info}/RECORD

@@ -2,7 +2,7 @@ cdk_factory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cdk_factory/app.py,sha256=TR9U84oc20x2oPH3tcSgr8ukxddqMQjVHILTgvBNsA4,8980
 cdk_factory/cdk.json,sha256=SKZKhJ2PBpFH78j-F8S3VDYW-lf76--Q2I3ON-ZIQfw,3106
 cdk_factory/cli.py,sha256=FGbCTS5dYCNsfp-etshzvFlGDCjC28r6rtzYbe7KoHI,6407
-cdk_factory/version.py,sha256=xKd3pzbczuMsdB08eLAOqZDUd_q1IRxwZ_ccAFL4c4A,22
+cdk_factory/version.py,sha256=ORAtCCI2THBDcdzIbh6oBsoshDvkkmXUWpmO4Q5McAk,22
 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
@@ -64,7 +64,7 @@ cdk_factory/interfaces/istack.py,sha256=bhTBs-o9FgKwvJMSuwxjUV6D3nUlvZHVzfm27jP9
 cdk_factory/interfaces/live_ssm_resolver.py,sha256=3FIr9a02SXqZmbFs3RT0WxczWEQR_CF7QSt7kWbDrVE,8163
 cdk_factory/interfaces/ssm_parameter_mixin.py,sha256=uA2j8HmAOpuEA9ynRj51s0WjUHMVLsbLQN-QS9NKyHA,12089
 cdk_factory/lambdas/health_handler.py,sha256=dd40ykKMxWCFEIyp2ZdQvAGNjw_ylI9CSm1N24Hp2ME,196
-cdk_factory/pipeline/pipeline_factory.py,sha256=NSyuADuVPsmNeo7-uoRZJrnn_KVdHzwXjLKLUcsJwRA,16480
+cdk_factory/pipeline/pipeline_factory.py,sha256=OYziT0n1CwjEecLgC8IIAmtbTEOyNfS5JEDmzcjkXuk,17743
 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
@@ -119,8 +119,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.3.dist-info/METADATA,sha256=J6-gWzSHahIyQU5gNMKs8UGYsKfD32XRDt0thjCL9sk,2450
-cdk_factory-0.9.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cdk_factory-0.9.3.dist-info/entry_points.txt,sha256=S1DPe0ORcdiwEALMN_WIo3UQrW_g4YdQCLEsc_b0Swg,53
-cdk_factory-0.9.3.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
-cdk_factory-0.9.3.dist-info/RECORD,,
+cdk_factory-0.9.5.dist-info/METADATA,sha256=yjJp1FFXxz0rUS_B25Ow_K9di6vHGViv_A9YCPcLxkI,2450
+cdk_factory-0.9.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cdk_factory-0.9.5.dist-info/entry_points.txt,sha256=S1DPe0ORcdiwEALMN_WIo3UQrW_g4YdQCLEsc_b0Swg,53
+cdk_factory-0.9.5.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
+cdk_factory-0.9.5.dist-info/RECORD,,