cdk-factory 0.15.19__py3-none-any.whl → 0.15.22__py3-none-any.whl

cdk_factory/stack_library/load_balancer/load_balancer_stack.py

@@ -141,6 +141,19 @@ class LoadBalancerStack(IStack, EnhancedSsmParameterMixin):
                 vpc_subnets=ec2.SubnetSelection(subnets=subnets) if subnets else None,
             )
 
+        # If subnets is None, check if we have SSM-imported subnet_ids as a token
+        # We need to use Fn.Split to convert the comma-separated string to an array
+        if subnets is None and "subnet_ids" in self.ssm_imported_values:
+            subnet_ids_value = self.ssm_imported_values["subnet_ids"]
+            if cdk.Token.is_unresolved(subnet_ids_value):
+                logger.info("Using Fn.Split to convert comma-separated subnet IDs token to array")
+                # Use CloudFormation escape hatch to set Subnets property with Fn.Split
+                cfn_lb = load_balancer.node.default_child
+                cfn_lb.add_property_override(
+                    "Subnets",
+                    cdk.Fn.split(",", subnet_ids_value)
+                )
+
         # Add tags
         for key, value in self.lb_config.tags.items():
             cdk.Tags.of(load_balancer).add(key, value)
@@ -255,15 +268,28 @@ class LoadBalancerStack(IStack, EnhancedSsmParameterMixin):
         
         # Check SSM imported values first
         if "subnet_ids" in self.ssm_imported_values:
-            subnet_ids = self.ssm_imported_values["subnet_ids"]
-            # SSM returns comma-separated string for StringList, need to split
-            if isinstance(subnet_ids, str):
-                subnet_ids = [s.strip() for s in subnet_ids.split(',')]
-            elif not isinstance(subnet_ids, list):
-                subnet_ids = [subnet_ids]
+            subnet_ids_value = self.ssm_imported_values["subnet_ids"]
+            
+            # Check if this is a CDK token (unresolved SSM parameter)
+            if cdk.Token.is_unresolved(subnet_ids_value):
+                # For tokens, we can't split at synth time
+                # Return None to signal that subnets should be resolved via SubnetSelection
+                # The ALB construct will handle the token-based subnet IDs
+                logger.info("Subnet IDs are unresolved tokens, will use vpc_subnets with token resolution")
+                return None
+            elif isinstance(subnet_ids_value, str):
+                # If it's a resolved string, split it
+                subnet_ids = [s.strip() for s in subnet_ids_value.split(',')]
+            elif isinstance(subnet_ids_value, list):
+                subnet_ids = subnet_ids_value
+            else:
+                subnet_ids = [subnet_ids_value]
         else:
             subnet_ids = self.lb_config.subnets
         
+        if not subnet_ids:
+            return None
+            
         for idx, subnet_id in enumerate(subnet_ids):
             subnets.append(
                 ec2.Subnet.from_subnet_id(self, f"Subnet-{idx}", subnet_id)

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/version.py

@@ -1 +1 @@
-__version__ = "0.15.19"
+__version__ = "0.15.22"

{cdk_factory-0.15.19.dist-info → cdk_factory-0.15.22.dist-info}/METADATA

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

@@ -2,7 +2,7 @@ cdk_factory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=Z3uMBj60vZ3EVuxU5wkKqelcN0y_zs1XVBGw7z_-3cw,24
+cdk_factory/version.py,sha256=shv1DnYQStFbMP5tTfMYOU43hXngTdA0D45wB2TtIY4,24
 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
@@ -97,7 +97,7 @@ cdk_factory/stack_library/ecs/ecs_service_stack.py,sha256=c6K3BjlXyldr8ikvEhfC9C
 cdk_factory/stack_library/lambda_edge/__init__.py,sha256=ByBJ_CWdc4UtTmFBZH-6pzBMNkjkdtE65AmnB0Fs6lM,156
 cdk_factory/stack_library/lambda_edge/lambda_edge_stack.py,sha256=CdId_1kcZmYr1lLI9AD3-KqtE6voC3641PIloJmWiNI,16414
 cdk_factory/stack_library/load_balancer/__init__.py,sha256=wZpKw2OecLJGdF5mPayCYAEhu2H3c2gJFFIxwXftGDU,52
-cdk_factory/stack_library/load_balancer/load_balancer_stack.py,sha256=SBB-Cknon7U317iR2chFNWjny-lp8BFmzFMCYLP-8Uo,28253
+cdk_factory/stack_library/load_balancer/load_balancer_stack.py,sha256=fgp2s3DjP1fIRZT2PaxQVPrL4MGILML3ovcreEdmFlo,29651
 cdk_factory/stack_library/monitoring/__init__.py,sha256=k1G_KDx47Aw0UugaL99PN_TKlyLK4nkJVApCaAK7GJg,153
 cdk_factory/stack_library/monitoring/monitoring_stack.py,sha256=N_1YvEXE7fboH_S3kv_dSKZsufxMuPdFMjGzlNFpuSo,19283
 cdk_factory/stack_library/rds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -124,13 +124,13 @@ cdk_factory/utilities/docker_utilities.py,sha256=6ee9KEGsaRJWo6FqvdPtE3_L2Emp3Lc
 cdk_factory/utilities/environment_services.py,sha256=cd2T0efJtFPMLa1Fm7MPL-sqUlhKXCB7_XHsR8sfymE,9696
 cdk_factory/utilities/file_operations.py,sha256=fxqT0iyYZkb46lQr_XXadhFTca_1neVW0VRVkbyMmhA,9462
 cdk_factory/utilities/git_utilities.py,sha256=7Xac8PaThc7Lmk5jtDBHaJOj-fWRT017cgZmgXkVizM,3155
-cdk_factory/utilities/json_loading_utility.py,sha256=YRgzA1I-B_HwZm1eWJTeQ1JLkebCL4C1gpHOqo6GkCA,10341
+cdk_factory/utilities/json_loading_utility.py,sha256=Ko28g-Izh7tBnRtOSqzOXyfcZvQlthFj4kOXCFVF4oc,10787
 cdk_factory/utilities/lambda_function_utilities.py,sha256=S1GvBsY_q2cyUiaud3HORJMnLhI5cRi31fbeaktY-_Q,15826
 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=yDI3cRhVI5ELNDcJPLpk9UY54Uind1xQoV3spzT4z7E,6068
-cdk_factory-0.15.19.dist-info/METADATA,sha256=ODF22xVdpQsHyeJOF05R1r0sI66hkIWjADBT5x58eRY,2452
-cdk_factory-0.15.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cdk_factory-0.15.19.dist-info/entry_points.txt,sha256=S1DPe0ORcdiwEALMN_WIo3UQrW_g4YdQCLEsc_b0Swg,53
-cdk_factory-0.15.19.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
-cdk_factory-0.15.19.dist-info/RECORD,,
+cdk_factory-0.15.22.dist-info/METADATA,sha256=MIXVvmQIOmO3HcrhZrF7Cj9c9t-og0x9Av89UN4qfWo,2452
+cdk_factory-0.15.22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cdk_factory-0.15.22.dist-info/entry_points.txt,sha256=S1DPe0ORcdiwEALMN_WIo3UQrW_g4YdQCLEsc_b0Swg,53
+cdk_factory-0.15.22.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
+cdk_factory-0.15.22.dist-info/RECORD,,