cdk-factory 0.17.0__py3-none-any.whl → 0.17.2__py3-none-any.whl

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

@@ -1 +1 @@
-__version__ = "0.17.0"
+__version__ = "0.17.2"

{cdk_factory-0.17.0.dist-info → cdk_factory-0.17.2.dist-info}/METADATA

@@ -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.dist-info → cdk_factory-0.17.2.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=XpM3lncCzPBIwMSvDN7i10pke_c6KdJtVLZYbCiaTRw,23
+cdk_factory/version.py,sha256=I5u6uLh7NsbyGkKLvVteW175Afe6HJt5UsjBZ28EGks,23
 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=eJ3Pl3GWk1jVr_bYQaaWlw4_-ZiFGaiXllI_fOOX1i0,9323
@@ -67,7 +67,7 @@ cdk_factory/interfaces/istack.py,sha256=3xqGw5kNTt_KeLHdMxI7rIR0YORqcWQOqsacmDlT
 cdk_factory/interfaces/live_ssm_resolver.py,sha256=3FIr9a02SXqZmbFs3RT0WxczWEQR_CF7QSt7kWbDrVE,8163
 cdk_factory/interfaces/networked_stack_mixin.py,sha256=69pJp4IE1n_tdHh2UZQ08O6ZW-v5P4uJJ_fleNaj6Nw,2897
 cdk_factory/interfaces/standardized_ssm_mixin.py,sha256=-BT-K7mro2f3taS7biAm_oaxC7z2lurUfNUpryvahXk,22680
-cdk_factory/interfaces/vpc_provider_mixin.py,sha256=8ltvceRGS97fvno4JgVfcAAvry7EC_V9hVl1q1uPFXE,7837
+cdk_factory/interfaces/vpc_provider_mixin.py,sha256=tfe3XqWd4lf5mMHGKexDcWmS0T2CKHSP0TDDyp6MPoY,8363
 cdk_factory/lambdas/health_handler.py,sha256=dd40ykKMxWCFEIyp2ZdQvAGNjw_ylI9CSm1N24Hp2ME,196
 cdk_factory/lambdas/edge/ip_gate/handler.py,sha256=gUevgX462mqGYddtQIyJ1-Jk3oXhFmbmd46jlqjai9E,10657
 cdk_factory/pipeline/path_utils.py,sha256=fvWdrcb4onmpIu1APkHLhXg8zWfK74HcW3Ra2ynxfXM,2586
@@ -86,7 +86,7 @@ cdk_factory/stack_library/acm/__init__.py,sha256=4FNRLykblcKZvq_wieYwvv9N_jgrZnJ
 cdk_factory/stack_library/acm/acm_stack.py,sha256=QJ3GkT17PmWoGkfO5Um02hvrfyJ9HbiPMnclwDP7IbA,5846
 cdk_factory/stack_library/api_gateway/api_gateway_stack.py,sha256=_wbPBsgh7FHq9cnL44CiuffBj3XCO5ErQx_yclxFsVY,39669
 cdk_factory/stack_library/auto_scaling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cdk_factory/stack_library/auto_scaling/auto_scaling_stack_standardized.py,sha256=4wE4kKgOvIISwoN23deGNgT1R3Ge2HVR6IR4wh2Z3W4,21976
+cdk_factory/stack_library/auto_scaling/auto_scaling_stack_standardized.py,sha256=wpR8m4JuM5BaKNOAQ4SPUbmsnpd1QQWSqffpNVMgZ8w,21991
 cdk_factory/stack_library/aws_lambdas/lambda_stack.py,sha256=SFbBPvvCopbyiuYtq-O5sQkFCf94Wzua6aDUXiFDSB4,26161
 cdk_factory/stack_library/buckets/README.md,sha256=XkK3UNVtRLE7NtUvbhCOBBYUYi8hlrrSaI1s3GJVrqI,78
 cdk_factory/stack_library/buckets/bucket_stack.py,sha256=SLoZqSffAqmeBBEVUQg54D_8Ad5UKdkjEAmKAVgAqQo,1778
@@ -111,13 +111,13 @@ cdk_factory/stack_library/rds/rds_stack.py,sha256=YwRLvqfIEDE5uwocnr7HpmniIfEF5O
 cdk_factory/stack_library/route53/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cdk_factory/stack_library/route53/route53_stack.py,sha256=mPUJta6maUNlkXup7xKsqq7gefsRI1w_ulInE29wJs4,8387
 cdk_factory/stack_library/rum/__init__.py,sha256=gUrWQdzd4rZ2J0YzAQC8PsEGAS7QgyYjB2ZCUKWasy4,90
-cdk_factory/stack_library/rum/rum_stack.py,sha256=GWmj_t5SElvSYzUm7mPcR2QQ2cxTcwFEBRUMdoxabyQ,13707
+cdk_factory/stack_library/rum/rum_stack.py,sha256=BEXsx_PsZOu2dR3Pmv1_flY51uRIeHP5l5rj96bOgPQ,14106
 cdk_factory/stack_library/security_group/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cdk_factory/stack_library/security_group/security_group_full_stack.py,sha256=yvZ5QS9eDj_LkkwHY_Pcb37lOVPbGMfSdizZa1X6BEI,13561
 cdk_factory/stack_library/security_group/security_group_stack.py,sha256=Zv9FCEHvSBT1cM9bXOtyIUFwhRHKCSTgvaqOyhGj0wg,14456
 cdk_factory/stack_library/simple_queue_service/sqs_stack.py,sha256=jJksWrvrvgZUMM01RZ317DOIxqIJbkYYSYu38w0jHpc,6039
 cdk_factory/stack_library/vpc/__init__.py,sha256=7pIqP97Gf2AJbv9Ebp1WbQGHYhgEbWJ52L1MzeXBybA,42
-cdk_factory/stack_library/vpc/vpc_stack_standardized.py,sha256=yF6tz7GdkvpLeQFGa2Gt5WP-PKjj_yr2hu7Z1TGBQfM,17562
+cdk_factory/stack_library/vpc/vpc_stack_standardized.py,sha256=yUmmAugFl0jhQYHZy93ZKjBqtwgnqXEY7oHLfNQzxvo,16443
 cdk_factory/stack_library/websites/static_website_stack.py,sha256=A292BlKDof0JnVewkK_3JiRB04rX7J9Na0a-iz3JWzw,11243
 cdk_factory/stages/websites/static_website_stage.py,sha256=X4fpKXkhb0zIbSHx3QyddBhVSLBryb1vf1Cg2fMTqog,755
 cdk_factory/templates/README.md,sha256=ATBEjG6beYvbEAdLtZ_8xnxgFD5X0cgZoI_6pToqH90,2679
@@ -136,8 +136,8 @@ cdk_factory/utilities/os_execute.py,sha256=5Op0LY_8Y-pUm04y1k8MTpNrmQvcLmQHPQITE
 cdk_factory/utils/api_gateway_utilities.py,sha256=If7Xu5s_UxmuV-kL3JkXxPLBdSVUKoLtohm0IUFoiV8,4378
 cdk_factory/validation/config_validator.py,sha256=Pb0TkLiPFzUplBOgMorhRCVm08vEzZhRU5xXCDTa5CA,17602
 cdk_factory/workload/workload_factory.py,sha256=yDI3cRhVI5ELNDcJPLpk9UY54Uind1xQoV3spzT4z7E,6068
-cdk_factory-0.17.0.dist-info/METADATA,sha256=HE9QAWN7QOmq7YWwx8cTbT-8Z_nYccEZEmDkhQRUCBI,2451
-cdk_factory-0.17.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cdk_factory-0.17.0.dist-info/entry_points.txt,sha256=S1DPe0ORcdiwEALMN_WIo3UQrW_g4YdQCLEsc_b0Swg,53
-cdk_factory-0.17.0.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
-cdk_factory-0.17.0.dist-info/RECORD,,
+cdk_factory-0.17.2.dist-info/METADATA,sha256=xmiyleHsFEcn_VXTYKBNrDH8sgLyuAXRGxR2-RyvtRU,2451
+cdk_factory-0.17.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cdk_factory-0.17.2.dist-info/entry_points.txt,sha256=S1DPe0ORcdiwEALMN_WIo3UQrW_g4YdQCLEsc_b0Swg,53
+cdk_factory-0.17.2.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
+cdk_factory-0.17.2.dist-info/RECORD,,