cdk-factory 0.15.21__py3-none-any.whl → 0.15.23__py3-none-any.whl

cdk_factory/stack_library/load_balancer/load_balancer_stack.py

@@ -112,34 +112,59 @@ class LoadBalancerStack(IStack, EnhancedSsmParameterMixin):
         # Get subnets
         subnets = self._get_subnets()
 
+        # Prepare vpc_subnets parameter
+        # If subnets is None, we'll handle it via escape hatch after creation
+        vpc_subnets_param = ec2.SubnetSelection(subnets=subnets) if subnets else None
+
         # Create the Load Balancer based on type
         if self.lb_config.type == "APPLICATION":
-            load_balancer = elbv2.ApplicationLoadBalancer(
-                self,
-                lb_name,
-                load_balancer_name=lb_name,
-                vpc=self.vpc,
-                internet_facing=self.lb_config.internet_facing,
-                security_group=(
+            # When vpc_subnets is None and we have token-based subnet_ids,
+            # we need to create the ALB without vpc_subnets to avoid VPC subnet lookup errors
+            alb_props = {
+                "load_balancer_name": lb_name,
+                "vpc": self.vpc,
+                "internet_facing": self.lb_config.internet_facing,
+                "security_group": (
                     security_groups[0]
                     if security_groups and len(security_groups) > 0
                     else None
                 ),
-                deletion_protection=self.lb_config.deletion_protection,
-                idle_timeout=cdk.Duration.seconds(self.lb_config.idle_timeout),
-                http2_enabled=self.lb_config.http2_enabled,
-                vpc_subnets=ec2.SubnetSelection(subnets=subnets) if subnets else None,
-            )
+                "deletion_protection": self.lb_config.deletion_protection,
+                "idle_timeout": cdk.Duration.seconds(self.lb_config.idle_timeout),
+                "http2_enabled": self.lb_config.http2_enabled,
+            }
+            
+            # Only add vpc_subnets if we have concrete subnet objects
+            if vpc_subnets_param:
+                alb_props["vpc_subnets"] = vpc_subnets_param
+            
+            load_balancer = elbv2.ApplicationLoadBalancer(self, lb_name, **alb_props)
         else:  # NETWORK
-            load_balancer = elbv2.NetworkLoadBalancer(
-                self,
-                lb_name,
-                load_balancer_name=lb_name,
-                vpc=self.vpc,
-                internet_facing=self.lb_config.internet_facing,
-                deletion_protection=self.lb_config.deletion_protection,
-                vpc_subnets=ec2.SubnetSelection(subnets=subnets) if subnets else None,
-            )
+            nlb_props = {
+                "load_balancer_name": lb_name,
+                "vpc": self.vpc,
+                "internet_facing": self.lb_config.internet_facing,
+                "deletion_protection": self.lb_config.deletion_protection,
+            }
+            
+            # Only add vpc_subnets if we have concrete subnet objects
+            if vpc_subnets_param:
+                nlb_props["vpc_subnets"] = vpc_subnets_param
+            
+            load_balancer = elbv2.NetworkLoadBalancer(self, lb_name, **nlb_props)
+
+        # 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():
@@ -160,9 +185,16 @@ class LoadBalancerStack(IStack, EnhancedSsmParameterMixin):
             # Build VPC attributes
             vpc_attrs = {
                 "vpc_id": vpc_id,
-                "availability_zones": ["us-east-1a", "us-east-1b"]
+                "availability_zones": ["us-east-1a", "us-east-1b"],
             }
             
+            # If we have subnet_ids from SSM, provide dummy public subnets
+            # The actual subnets will be set via CloudFormation escape hatch
+            if "subnet_ids" in self.ssm_imported_values:
+                # Provide dummy subnet IDs - these will be overridden by the escape hatch
+                # We need at least one dummy subnet per AZ to satisfy CDK's validation
+                vpc_attrs["public_subnet_ids"] = ["subnet-dummy1", "subnet-dummy2"]
+            
             # Use from_vpc_attributes() instead of from_lookup() because SSM imports return tokens
             self._vpc = ec2.Vpc.from_vpc_attributes(self, "VPC", **vpc_attrs)
         elif self.lb_config.vpc_id:
@@ -255,15 +287,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/version.py

@@ -1 +1 @@
-__version__ = "0.15.21"
+__version__ = "0.15.23"

{cdk_factory-0.15.21.dist-info → cdk_factory-0.15.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdk_factory
-Version: 0.15.21
+Version: 0.15.23
 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.21.dist-info → cdk_factory-0.15.23.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=R3P7A3OIRwLs91Pf7vcKK6okyw2Hfach3FjnAE4bSO8,24
+cdk_factory/version.py,sha256=7op-jiE3Ez13LGI3TOZuMVElwwRvXglYAxFNKJgv7P8,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=5JqBUJCeHjhzJFTBoh63gpCzQjYb5vcAJwC5U7MLhCk,30762
 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
@@ -129,8 +129,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=yDI3cRhVI5ELNDcJPLpk9UY54Uind1xQoV3spzT4z7E,6068
-cdk_factory-0.15.21.dist-info/METADATA,sha256=gDy99ATFt-hq-9aKupyCd-Quk7VCkRGmyltq4tbvWt8,2452
-cdk_factory-0.15.21.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cdk_factory-0.15.21.dist-info/entry_points.txt,sha256=S1DPe0ORcdiwEALMN_WIo3UQrW_g4YdQCLEsc_b0Swg,53
-cdk_factory-0.15.21.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
-cdk_factory-0.15.21.dist-info/RECORD,,
+cdk_factory-0.15.23.dist-info/METADATA,sha256=TJZXugMYlzyNorvDOrQVTCY8OGPImjY97iso0ro2rhQ,2452
+cdk_factory-0.15.23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cdk_factory-0.15.23.dist-info/entry_points.txt,sha256=S1DPe0ORcdiwEALMN_WIo3UQrW_g4YdQCLEsc_b0Swg,53
+cdk_factory-0.15.23.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
+cdk_factory-0.15.23.dist-info/RECORD,,