cdk-factory 0.17.0__tar.gz → 0.17.2__tar.gz

{cdk_factory-0.17.0 → cdk_factory-0.17.2}/PKG-INFO

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

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

{cdk_factory-0.17.0 → cdk_factory-0.17.2}/src/cdk_factory/interfaces/vpc_provider_mixin.py

@@ -6,7 +6,7 @@ MIT License. See Project Root for license information.
 
 from typing import Optional, List, Any
 from aws_lambda_powertools import Logger
-from aws_cdk import aws_ec2 as ec2
+from aws_cdk import aws_ec2 as ec2, aws_ssm as ssm
 from constructs import Construct
 
 logger = Logger(__name__)
@@ -113,16 +113,26 @@ class VPCProviderMixin:
         Create VPC reference from SSM imported VPC ID.
         
         Args:
-            vpc_id: The VPC ID from SSM
+            vpc_id: The VPC ID from SSM (can be SSM path or actual VPC ID)
             availability_zones: List of availability zones
             subnet_ids: Optional list of subnet IDs from SSM
             
         Returns:
             VPC reference created from attributes
         """
+        # Check if vpc_id is an SSM path (starts with /) or actual VPC ID
+        if vpc_id.startswith('/'):
+            # Create CDK token for VPC ID from SSM parameter
+            vpc_id_token = ssm.StringParameter.from_string_parameter_name(
+                self, f"{self.stack_name}-VPC-ID-Token", vpc_id
+            ).string_value
+        else:
+            # Use the VPC ID directly (for testing or direct configuration)
+            vpc_id_token = vpc_id
+        
         # Build VPC attributes
         vpc_attrs = {
-            "vpc_id": vpc_id,
+            "vpc_id": vpc_id_token,
             "availability_zones": availability_zones,
         }
         

{cdk_factory-0.17.0 → cdk_factory-0.17.2}/src/cdk_factory/stack_library/auto_scaling/auto_scaling_stack_standardized.py

@@ -137,8 +137,8 @@ class AutoScalingStack(IStack, VPCProviderMixin, StandardizedSsmMixin):
         logger.info(f"Auto Scaling Group {asg_name} built successfully")
 
     def _get_ssm_imports(self) -> Dict[str, Any]:
-        """Get SSM imports from configuration"""
-        return self.asg_config.ssm_imports
+        """Get SSM imports from standardized mixin processing"""
+        return self.get_all_ssm_imports()
 
     def _get_security_groups(self) -> List[ec2.ISecurityGroup]:
         """

{cdk_factory-0.17.0 → cdk_factory-0.17.2}/src/cdk_factory/stack_library/rum/rum_stack.py

@@ -59,14 +59,18 @@ class RumStack(IStack, StandardizedSsmMixin):
 
         # Configure SSM imports for cognito resources if needed
         if not self.rum_config.cognito_identity_pool_id:
-            # Add explicit import path for cognito identity pool using new pattern
-            if "ssm" not in rum_config:
-                rum_config["ssm"] = {}
-            if "imports" not in rum_config["ssm"]:
-                rum_config["ssm"]["imports"] = {}
-            rum_config["ssm"]["imports"][
-                "cognito_identity_pool_id"
-            ] = "/{{ORGANIZATION}}/{{ENVIRONMENT}}/cognito/user-pool/identity-pool-id"
+            # Only add SSM imports if we have the required template variables
+            # Check if deployment has organization info for template resolution
+            if (hasattr(deployment, 'organization') and deployment.organization and
+                hasattr(deployment, 'environment') and deployment.environment):
+                # Add explicit import path for cognito identity pool using new pattern
+                if "ssm" not in rum_config:
+                    rum_config["ssm"] = {}
+                if "imports" not in rum_config["ssm"]:
+                    rum_config["ssm"]["imports"] = {}
+                rum_config["ssm"]["imports"][
+                    "cognito_identity_pool_id"
+                ] = "/{{ORGANIZATION}}/{{ENVIRONMENT}}/cognito/user-pool/identity-pool-id"
 
         self.setup_standardized_ssm_integration(
             scope=self,
@@ -75,6 +79,9 @@ class RumStack(IStack, StandardizedSsmMixin):
             resource_name=self.rum_config.name,
         )
 
+        # Process SSM imports using standardized method
+        self.process_standardized_ssm_imports()
+
         # Import or create Cognito resources
         identity_pool_id, guest_role_arn = self._setup_cognito_integration()
 
@@ -97,9 +104,8 @@ class RumStack(IStack, StandardizedSsmMixin):
             identity_pool_id = self.rum_config.cognito_identity_pool_id
             logger.info(f"Using existing Cognito Identity Pool: {identity_pool_id}")
         else:
-            # Try to import from SSM using new pattern - read directly from config
-            ssm_imports = self.rum_config.ssm_imports
-            cognito_identity_pool_id = ssm_imports.get("cognito_identity_pool_id")
+            # Try to import from SSM using standardized approach
+            cognito_identity_pool_id = self.get_ssm_imported_value("cognito_identity_pool_id")
 
             if cognito_identity_pool_id:
                 identity_pool_id = cognito_identity_pool_id

{cdk_factory-0.17.0 → cdk_factory-0.17.2}/src/cdk_factory/stack_library/vpc/vpc_stack_standardized.py

@@ -111,25 +111,7 @@ class VpcStack(IStack, StandardizedSsmMixin):
         # Configure NAT gateways
         nat_gateway_count = self.vpc_config.nat_gateways.get("count", 1)
 
-        # Get explicit availability zones to avoid dummy AZs in pipeline synthesis
-        # When CDK synthesizes in a pipeline context, it doesn't have access to real AZs
-        # So we explicitly specify them based on the deployment region
-        availability_zones = None
-        if self.deployment:
-            region = self.deployment.region or "us-east-1"
-            # Explicitly list AZs for the region to avoid dummy values
-            max_azs = self.vpc_config.max_azs or 2
-            if region == "us-east-1":
-                availability_zones = [f"us-east-1{chr(97+i)}" for i in range(max_azs)]  # us-east-1a, us-east-1b, etc.
-            elif region == "us-east-2":
-                availability_zones = [f"us-east-2{chr(97+i)}" for i in range(max_azs)]
-            elif region == "us-west-1":
-                availability_zones = [f"us-west-1{chr(97+i)}" for i in range(max_azs)]
-            elif region == "us-west-2":
-                availability_zones = [f"us-west-2{chr(97+i)}" for i in range(max_azs)]
-        
         # Build VPC properties
-        # Note: CDK doesn't allow both 'availability_zones' and 'max_azs' - use one or the other
         vpc_props = {
             "vpc_name": vpc_name,
             "cidr": self.vpc_config.cidr,
@@ -137,6 +119,7 @@ class VpcStack(IStack, StandardizedSsmMixin):
             "subnet_configuration": subnet_configuration,
             "enable_dns_hostnames": self.vpc_config.enable_dns_hostnames,
             "enable_dns_support": self.vpc_config.enable_dns_support,
+            "max_azs": self.vpc_config.max_azs,  # Use max_azs instead of explicit availability_zones
             "gateway_endpoints": (
                 {
                     "S3": ec2.GatewayVpcEndpointOptions(
@@ -148,12 +131,6 @@ class VpcStack(IStack, StandardizedSsmMixin):
             ),
         }
         
-        # Use either availability_zones or max_azs, not both
-        if availability_zones:
-            vpc_props["availability_zones"] = availability_zones
-        else:
-            vpc_props["max_azs"] = self.vpc_config.max_azs
-        
         # Create the VPC
         vpc = ec2.Vpc(self, vpc_name, **vpc_props)
 
@@ -350,9 +327,9 @@ class VpcStack(IStack, StandardizedSsmMixin):
         # Prepare resource values for export
         resource_values = {
             "vpc_id": self.vpc.vpc_id,
-            "public_subnet_ids": [subnet.subnet_id for subnet in self.vpc.public_subnets],
-            "private_subnet_ids": [subnet.subnet_id for subnet in self.vpc.private_subnets],
-            "isolated_subnet_ids": [subnet.subnet_id for subnet in self.vpc.isolated_subnets],
+            "public_subnet_ids": ",".join([subnet.subnet_id for subnet in self.vpc.public_subnets]) if self.vpc.public_subnets else "",
+            "private_subnet_ids": ",".join([subnet.subnet_id for subnet in self.vpc.private_subnets]) if self.vpc.private_subnets else "",
+            "isolated_subnet_ids": ",".join([subnet.subnet_id for subnet in self.vpc.isolated_subnets]) if self.vpc.isolated_subnets else "",
         }
         
         # Add route table IDs if available - commented out due to CDK API issues
@@ -386,7 +363,7 @@ class VpcStack(IStack, StandardizedSsmMixin):
                     if hasattr(child, 'nat_gateway_id') and child.nat_gateway_id:
                         nat_gateway_ids.append(child.nat_gateway_id)
         if nat_gateway_ids:
-            resource_values["nat_gateway_ids"] = nat_gateway_ids
+            resource_values["nat_gateway_ids"] = ",".join(nat_gateway_ids)
         
         # Add Internet Gateway ID if available
         if hasattr(self.vpc, 'internet_gateway_id') and self.vpc.internet_gateway_id:

cdk_factory-0.17.2/src/cdk_factory/version.py

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

cdk_factory-0.17.0/src/cdk_factory/version.py

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