cdk-factory 0.16.8__py3-none-any.whl → 0.16.11__py3-none-any.whl

cdk_factory/interfaces/vpc_provider_mixin.py

@@ -71,15 +71,29 @@ class VPCProviderMixin:
         # This works with the enhanced SsmParameterMixin
         if hasattr(self, '_ssm_imported_values') and "vpc_id" in self._ssm_imported_values:
             vpc_id = self._ssm_imported_values["vpc_id"]
+            
+            # Get subnet IDs first to determine AZ count
+            subnet_ids = []
+            if hasattr(self, '_ssm_imported_values') and "subnet_ids" in self._ssm_imported_values:
+                imported_subnets = self._ssm_imported_values["subnet_ids"]
+                if isinstance(imported_subnets, str):
+                    subnet_ids = [s.strip() for s in imported_subnets.split(",") if s.strip()]
+                elif isinstance(imported_subnets, list):
+                    subnet_ids = imported_subnets
+            
+            # Adjust availability zones to match subnet count
+            if subnet_ids and availability_zones:
+                availability_zones = [f"us-east-1{chr(97+i)}" for i in range(len(subnet_ids))]
+            
             return self._create_vpc_from_ssm(vpc_id, availability_zones)
         
         # Check config-level VPC ID
         if hasattr(config, 'vpc_id') and config.vpc_id:
-            return ec2.Vpc.from_lookup(self, "VPC", vpc_id=config.vpc_id)
+            return ec2.Vpc.from_lookup(self, f"{self.stack_name}-VPC", vpc_id=config.vpc_id)
         
         # Check workload-level VPC ID
         if hasattr(workload, 'vpc_id') and workload.vpc_id:
-            return ec2.Vpc.from_lookup(self, "VPC", vpc_id=workload.vpc_id)
+            return ec2.Vpc.from_lookup(self, f"{self.stack_name}-VPC", vpc_id=workload.vpc_id)
         
         # No VPC found - raise descriptive error
         raise self._create_vpc_not_found_error(config, workload)
@@ -105,15 +119,26 @@ class VPCProviderMixin:
             "availability_zones": availability_zones,
         }
         
-        # If we have subnet_ids from SSM, provide dummy subnets
-        # The actual subnets will be set via CloudFormation escape hatch
+        # If we have subnet_ids from SSM, use the actual subnet IDs
         if hasattr(self, '_ssm_imported_values') and "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"]
+            imported_subnets = self._ssm_imported_values["subnet_ids"]
+            if isinstance(imported_subnets, str):
+                # Split comma-separated subnet IDs
+                subnet_ids = [s.strip() for s in imported_subnets.split(",") if s.strip()]
+            elif isinstance(imported_subnets, list):
+                subnet_ids = imported_subnets
+            else:
+                subnet_ids = []
+            
+            # Use the actual subnet IDs from SSM
+            if subnet_ids:
+                vpc_attrs["public_subnet_ids"] = subnet_ids
+            else:
+                # Fallback to dummy subnets if no valid subnet IDs
+                vpc_attrs["public_subnet_ids"] = ["subnet-dummy1", "subnet-dummy2"]
         
-        # Use from_vpc_attributes() for SSM tokens
-        self._vpc = ec2.Vpc.from_vpc_attributes(self, "VPC", **vpc_attrs)
+        # Use from_vpc_attributes() for SSM tokens with unique construct name
+        self._vpc = ec2.Vpc.from_vpc_attributes(self, f"{self.stack_name}-VPC", **vpc_attrs)
         return self._vpc
 
     def _create_vpc_not_found_error(self, config: Any, workload: Any) -> ValueError:

cdk_factory/stack_library/auto_scaling/auto_scaling_stack.py

@@ -21,6 +21,7 @@ from cdk_factory.configurations.deployment import DeploymentConfig
 from cdk_factory.configurations.stack import StackConfig
 from cdk_factory.configurations.resources.auto_scaling import AutoScalingConfig
 from cdk_factory.interfaces.istack import IStack
+from cdk_factory.interfaces.vpc_provider_mixin import VPCProviderMixin
 from cdk_factory.stack.stack_module_registry import register_stack
 from cdk_factory.workload.workload_factory import WorkloadConfig
 
@@ -29,7 +30,7 @@ logger = Logger(service="AutoScalingStack")
 
 @register_stack("auto_scaling_library_module")
 @register_stack("auto_scaling_stack")
-class AutoScalingStack(IStack):
+class AutoScalingStack(IStack, VPCProviderMixin):
     """
     Reusable stack for AWS Auto Scaling Groups.
     Supports creating EC2 Auto Scaling Groups with customizable configurations.
@@ -41,6 +42,9 @@ class AutoScalingStack(IStack):
         # Initialize parent class properly - IStack inherits from enhanced SsmParameterMixin
         super().__init__(scope, id, **kwargs)
         
+        # Initialize VPC cache from mixin
+        self._initialize_vpc_cache()
+        
         self.asg_config = None
         self.stack_config = None
         self.deployment = None
@@ -50,10 +54,11 @@ class AutoScalingStack(IStack):
         self.launch_template = None
         self.instance_role = None
         self.user_data = None
+        self.user_data_commands = []  # Store raw commands for ECS cluster detection
         self.ecs_cluster = None
-        self._vpc = None
         
         # SSM imports storage is now handled by the enhanced SsmParameterMixin via IStack
+        # VPC caching is now handled by VPCProviderMixin
 
     def build(
         self,
@@ -92,12 +97,13 @@ class AutoScalingStack(IStack):
         # Create user data
         self.user_data = self._create_user_data()
 
-        # Create launch template
-        self.launch_template = self._create_launch_template(asg_name)
-
         # Create ECS cluster if ECS configuration is detected
+        # This must happen before launch template creation so user data can be updated
         self._create_ecs_cluster_if_needed(asg_name)
 
+        # Create launch template
+        self.launch_template = self._create_launch_template(asg_name)
+
         # Create Auto Scaling Group
         self.auto_scaling_group = self._create_auto_scaling_group(asg_name)
 
@@ -112,57 +118,16 @@ class AutoScalingStack(IStack):
 
     @property
     def vpc(self) -> ec2.IVpc:
-        """Get the VPC for the Auto Scaling Group using enhanced SsmParameterMixin"""
+        """Get the VPC for the Auto Scaling Group using VPCProviderMixin"""
         if not self.asg_config:
             raise AttributeError("AutoScalingStack not properly initialized. Call build() first.")
 
-        # Return cached VPC if already created
-        if self._vpc:
-            return self._vpc
-
-        # Check SSM imported values first using enhanced mixin
-        if self.has_ssm_import("vpc_id"):
-            vpc_id = self.get_ssm_imported_value("vpc_id")
-            
-            # Get subnet IDs first to determine AZ count
-            subnet_ids = []
-            if self.has_ssm_import("subnet_ids"):
-                imported_subnets = self.get_ssm_imported_value("subnet_ids", [])
-                if isinstance(imported_subnets, str):
-                    # Split comma-separated subnet IDs
-                    subnet_ids = [s.strip() for s in imported_subnets.split(",") if s.strip()]
-                elif isinstance(imported_subnets, list):
-                    subnet_ids = imported_subnets
-            
-            # Build VPC attributes with matching AZ count
-            vpc_attrs = {
-                "vpc_id": vpc_id,
-                "availability_zones": [f"us-east-1{chr(97+i)}" for i in range(len(subnet_ids))] if subnet_ids else ["us-east-1a", "us-east-1b"],
-            }
-            
-            # Use the actual subnet IDs from SSM
-            if subnet_ids:
-                vpc_attrs["public_subnet_ids"] = subnet_ids
-            else:
-                # Fallback to dummy subnets if no valid subnet IDs
-                vpc_attrs["public_subnet_ids"] = ["subnet-dummy1", "subnet-dummy2"]
-            
-            # Use from_vpc_attributes() for SSM tokens
-            self._vpc = ec2.Vpc.from_vpc_attributes(self, f"{self.stack_name}-VPC", **vpc_attrs)
-            return self._vpc
-        elif self.asg_config.vpc_id:
-            self._vpc = ec2.Vpc.from_lookup(self, f"{self.stack_name}-VPC", vpc_id=self.asg_config.vpc_id)
-            return self._vpc
-        elif self.workload.vpc_id:
-            self._vpc = ec2.Vpc.from_lookup(self, f"{self.stack_name}-VPC", vpc_id=self.workload.vpc_id)
-            return self._vpc
-        else:
-            # Use default VPC if not provided
-            raise ValueError(
-                "VPC is not defined in the configuration.  "
-                "You can provide it a the auto_scaling.vpc_id in the configuration "
-                "or a top level workload.vpc_id in the workload configuration."
-            )
+        # Use VPCProviderMixin to resolve VPC with proper subnet handling
+        return self.resolve_vpc(
+            config=self.asg_config,
+            deployment=self.deployment,
+            workload=self.workload
+        )
 
     def _get_target_group_arns(self) -> List[str]:
         """Get target group ARNs from SSM imports using enhanced SsmParameterMixin"""
@@ -277,12 +242,18 @@ class AutoScalingStack(IStack):
         """Create user data for EC2 instances"""
         user_data = ec2.UserData.for_linux()
 
+        # Store raw commands for ECS cluster detection
+        self.user_data_commands = ["set -euxo pipefail"]
+
         # Add base commands
         user_data.add_commands("set -euxo pipefail")
 
-        # Add custom commands from config
+        # Add custom commands from config (with variable substitution)
         for command in self.asg_config.user_data_commands:
-            user_data.add_commands(command)
+            # Perform variable substitution on the command
+            substituted_command = self._substitute_variables(command)
+            user_data.add_commands(substituted_command)
+            self.user_data_commands.append(substituted_command)
 
         # Add user data scripts from files (with variable substitution)
         if self.asg_config.user_data_scripts:
@@ -355,6 +326,49 @@ class AutoScalingStack(IStack):
             
             logger.info(f"Added user data script from {script_type}: {script_config.get('path', 'inline')}")
 
+    def _substitute_variables(self, command: str) -> str:
+        """
+        Perform variable substitution on a user data command.
+        Uses workload and deployment configuration for substitution.
+        """
+        if not command:
+            return command
+            
+        # Start with the original command
+        substituted_command = command
+        
+        # Define available variables for substitution
+        variables = {}
+        
+        # Add workload variables
+        if self.workload:
+            variables.update({
+                "WORKLOAD_NAME": getattr(self.workload, 'name', ''),
+                "ENVIRONMENT": getattr(self.workload, 'environment', ''),
+                "WORKLOAD": getattr(self.workload, 'name', ''),
+            })
+        
+        # Add deployment variables
+        if self.deployment:
+            variables.update({
+                "DEPLOYMENT_NAME": getattr(self.deployment, 'name', ''),
+                "REGION": getattr(self.deployment, 'region', ''),
+                "ACCOUNT": getattr(self.deployment, 'account', ''),
+            })
+        
+        # Add stack-level variables
+        variables.update({
+            "STACK_NAME": self.stack_name,
+        })
+        
+        # Perform substitution
+        for var_name, var_value in variables.items():
+            if var_value is not None:
+                placeholder = f"{{{{{var_name}}}}}"  # {{VAR_NAME}}
+                substituted_command = substituted_command.replace(placeholder, str(var_value))
+        
+        return substituted_command
+
     def _add_container_user_data(
         self, user_data: ec2.UserData, container_config: Dict[str, Any]
     ) -> None:
@@ -622,8 +636,6 @@ class AutoScalingStack(IStack):
         """Create ECS cluster if ECS configuration is detected"""
         # Check if this is an ECS configuration by looking for ECS-related patterns
         is_ecs_config = (
-            # Check if ECS cluster name is in user data
-            (self.user_data and "ECS_CLUSTER=" in str(self.user_data)) or
             # Check if ECS managed policy is attached
             any("AmazonEC2ContainerServiceforEC2Role" in policy for policy in self.asg_config.managed_policies) or
             # Check for explicit ECS configuration
@@ -634,16 +646,8 @@ class AutoScalingStack(IStack):
             logger.debug("No ECS configuration detected, skipping cluster creation")
             return
         
-        # Extract cluster name from user data or use default
-        cluster_name = f"{self.deployment.build_resource_name('cluster')}"
-        
-        # Try to extract cluster name from user data if available
-        if self.user_data:
-            user_data_str = str(self.user_data)
-            for line in user_data_str.split('\n'):
-                if 'ECS_CLUSTER=' in line:
-                    cluster_name = line.split('ECS_CLUSTER=')[1].strip()
-                    break
+        # Generate cluster name from stack configuration
+        cluster_name = f"{self.workload.name}-{self.workload.environment}-cluster"
         
         logger.info(f"Creating ECS cluster: {cluster_name}")
         
@@ -656,6 +660,10 @@ class AutoScalingStack(IStack):
             container_insights=True
         )
         
+        # Inject the cluster name into user data if user data exists
+        if self.user_data and self.user_data_commands:
+            self._inject_cluster_name_into_user_data(cluster_name)
+        
         # Export cluster name
         cdk.CfnOutput(
             self,
@@ -672,6 +680,50 @@ class AutoScalingStack(IStack):
             export_name=f"{self.deployment.build_resource_name(cluster_name)}-arn",
         )
 
+    def _inject_cluster_name_into_user_data(self, cluster_name: str) -> None:
+        """Inject the ECS cluster name into user data commands"""
+        injected_commands = []
+        cluster_name_injected = False
+        
+        for command in self.user_data_commands:
+            # If this command already sets ECS_CLUSTER, replace it
+            if 'ECS_CLUSTER=' in command:
+                # Replace existing ECS_CLUSTER setting with our cluster name
+                parts = command.split('ECS_CLUSTER=')
+                if len(parts) > 1:
+                    # Keep everything before ECS_CLUSTER=, add our cluster name, then add the rest
+                    before = parts[0]
+                    after_parts = parts[1].split(None, 1)  # Split on first whitespace
+                    after = after_parts[1] if len(after_parts) > 1 else ''
+                    new_command = f"{before}ECS_CLUSTER={cluster_name} {after}".strip()
+                    injected_commands.append(new_command)
+                    cluster_name_injected = True
+                else:
+                    injected_commands.append(f"{command}ECS_CLUSTER={cluster_name}")
+                    cluster_name_injected = True
+            else:
+                injected_commands.append(command)
+        
+        # If no ECS_CLUSTER was found in existing commands, add it
+        if not cluster_name_injected:
+            injected_commands.append(f"echo ECS_CLUSTER={cluster_name} >> /etc/ecs/ecs.config")
+        
+        # Update the user data with the injected commands
+        self.user_data_commands = injected_commands
+        
+        # If user data object exists, we need to recreate it with the updated commands
+        if hasattr(self, 'user_data') and self.user_data:
+            self.user_data = self._recreate_user_data_with_commands(injected_commands)
+
+    def _recreate_user_data_with_commands(self, commands: List[str]) -> ec2.UserData:
+        """Recreate user data with updated commands"""
+        user_data = ec2.UserData.for_linux()
+        
+        for command in commands:
+            user_data.add_commands(command)
+        
+        return user_data
+
     def _export_resources(self, asg_name: str) -> None:
         """Export stack resources to SSM and CloudFormation outputs"""
         # Export ASG name

cdk_factory/version.py

@@ -1 +1 @@
-__version__ = "0.16.8"
+__version__ = "0.16.11"

{cdk_factory-0.16.8.dist-info → cdk_factory-0.16.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdk_factory
-Version: 0.16.8
+Version: 0.16.11
 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.16.8.dist-info → cdk_factory-0.16.11.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=gTaD1zTddtl6pHFsMfOrT2s2L-el8KyB3KZmgEpwcwo,23
+cdk_factory/version.py,sha256=EakrCPGyBoMWg8RWPZfDpree9gtV1Dzj_7yPvePXTLA,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
@@ -67,7 +67,7 @@ cdk_factory/interfaces/istack.py,sha256=4Bqls3Xbgwbnl9MjxsX8S2d5lMOMPdhlVu0DiAiT
 cdk_factory/interfaces/live_ssm_resolver.py,sha256=3FIr9a02SXqZmbFs3RT0WxczWEQR_CF7QSt7kWbDrVE,8163
 cdk_factory/interfaces/networked_stack_mixin.py,sha256=c_wDWPU4Y8HrTt2yGRwBJvVCfwHNy0SEeNMQjaUgcrI,2808
 cdk_factory/interfaces/ssm_parameter_mixin.py,sha256=Z0KUbvDfvU-Kfpjtjm33Eo0ZonHQbnMlenR8FtG-0ls,17194
-cdk_factory/interfaces/vpc_provider_mixin.py,sha256=-AZJRRHzaxej8hToGFAa0zK0ax_t0x46Cjg5v6WyMwQ,5602
+cdk_factory/interfaces/vpc_provider_mixin.py,sha256=HPehSjYjCncYMNkmbwfDgfF4n91iazFVMd1NsF_U4fY,6860
 cdk_factory/lambdas/health_handler.py,sha256=dd40ykKMxWCFEIyp2ZdQvAGNjw_ylI9CSm1N24Hp2ME,196
 cdk_factory/lambdas/edge/ip_gate/handler.py,sha256=YrXO42gEhJoBTaH6jS7EWqjHe9t5Fpt4WLgY8vjtou0,10474
 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=hflRXyOSjqGeJxBx87EV3Z3MJ5HEX2rnrjJ_E9wwhH8,5862
 cdk_factory/stack_library/api_gateway/api_gateway_stack.py,sha256=l6J5uurBQqbhj9JuvQitV9PiIHS5kqa-dFWifCeA3GM,39347
 cdk_factory/stack_library/auto_scaling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cdk_factory/stack_library/auto_scaling/auto_scaling_stack.py,sha256=_OcX_J4ftm0HQdiW0u1sl14wXI60pBTjw4buo5ugWDE,28691
+cdk_factory/stack_library/auto_scaling/auto_scaling_stack.py,sha256=5GeQDp0PNULaSI2FPEWLscbSZRK_QjRwk1cyaeD8STI,30787
 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
@@ -134,8 +134,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.16.8.dist-info/METADATA,sha256=GvGrA3k62K1D9u4WBepkbZOjOpW2IcNqHi-GFzLhoew,2451
-cdk_factory-0.16.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cdk_factory-0.16.8.dist-info/entry_points.txt,sha256=S1DPe0ORcdiwEALMN_WIo3UQrW_g4YdQCLEsc_b0Swg,53
-cdk_factory-0.16.8.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
-cdk_factory-0.16.8.dist-info/RECORD,,
+cdk_factory-0.16.11.dist-info/METADATA,sha256=Z14DgOnRweXe38PJbLFn1ZdMUOl13d3nbqRSGyMyQU8,2452
+cdk_factory-0.16.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cdk_factory-0.16.11.dist-info/entry_points.txt,sha256=S1DPe0ORcdiwEALMN_WIo3UQrW_g4YdQCLEsc_b0Swg,53
+cdk_factory-0.16.11.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
+cdk_factory-0.16.11.dist-info/RECORD,,