cdk-factory 0.15.18__tar.gz → 0.15.21__tar.gz

{cdk_factory-0.15.18 → cdk_factory-0.15.21}/PKG-INFO

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

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

{cdk_factory-0.15.18 → cdk_factory-0.15.21}/src/cdk_factory/pipeline/pipeline_factory.py

@@ -5,6 +5,7 @@ Geek Cafe Pipeline
 import os
 from pathlib import Path
 from typing import List, Dict, Any
+import yaml
 
 import aws_cdk as cdk
 from aws_cdk import aws_codebuild as codebuild
@@ -326,12 +327,27 @@ class PipelineFactoryStack(IStack):
             return None
         
         # Parse buildspec
-        # If a buildspec path is specified, use the buildspec.yml from the source repo
+        # If a buildspec path is specified, try to load it locally and convert to from_object()
         buildspec_path = build.get("buildspec")
         buildspec = None
 
         if buildspec_path:
-            buildspec = codebuild.BuildSpec.from_source_filename(buildspec_path)
+            try:
+                candidate = Path(buildspec_path)
+                if not candidate.is_file():
+                    # Try relative to cwd
+                    candidate = Path(os.getcwd()) / buildspec_path
+                if candidate.is_file():
+                    with candidate.open("r", encoding="utf-8") as f:
+                        yml = yaml.safe_load(f)
+                    if isinstance(yml, dict):
+                        buildspec = codebuild.BuildSpec.from_object(yml)
+                    else:
+                        raise ValueError("Parsed buildspec YAML is not a dictionary")
+                else:
+                    raise FileNotFoundError(f"Buildspec file not found: {buildspec_path}")
+            except Exception as exc:
+                raise RuntimeError(f"Failed to load buildspec from '{buildspec_path}': {exc}")
         else:
             # No buildspec specified - check for inline commands
             inline_commands = build.get("commands", [])

{cdk_factory-0.15.18 → cdk_factory-0.15.21}/src/cdk_factory/utilities/json_loading_utility.py

@@ -171,9 +171,18 @@ class JsonLoadingUtility:
     def merge_sections(self, base: dict, new: dict):
         """Merge two configuration sections, with new section overriding base section."""
         for key, value in new.items():
-            if key in base and isinstance(base[key], dict) and isinstance(value, dict):
-                self.merge_sections(base[key], value)
+            if key in base:
+                if isinstance(base[key], dict) and isinstance(value, dict):
+                    # Recursively merge nested dicts
+                    self.merge_sections(base[key], value)
+                elif isinstance(base[key], list) and isinstance(value, list):
+                    # Extend arrays instead of replacing them
+                    base[key].extend(value)
+                else:
+                    # Override for all other types (string, int, bool, etc.)
+                    base[key] = value
             else:
+                # Key doesn't exist in base, add it
                 base[key] = value
         return base
 

cdk_factory-0.15.21/src/cdk_factory/version.py

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

cdk_factory-0.15.18/src/cdk_factory/version.py

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