cdk-factory 0.16.6__tar.gz → 0.16.8__tar.gz

{cdk_factory-0.16.6 → cdk_factory-0.16.8}/PKG-INFO

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

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

{cdk_factory-0.16.6 → cdk_factory-0.16.8}/src/cdk_factory/stack_library/auto_scaling/auto_scaling_stack.py

@@ -12,6 +12,7 @@ from aws_cdk import aws_autoscaling as autoscaling
 from aws_cdk import aws_cloudwatch as cloudwatch
 from aws_cdk import aws_iam as iam
 from aws_cdk import aws_ssm as ssm
+from aws_cdk import aws_ecs as ecs
 from aws_cdk import Duration, Stack
 from aws_lambda_powertools import Logger
 from constructs import Construct
@@ -49,6 +50,8 @@ class AutoScalingStack(IStack):
         self.launch_template = None
         self.instance_role = None
         self.user_data = None
+        self.ecs_cluster = None
+        self._vpc = None
         
         # SSM imports storage is now handled by the enhanced SsmParameterMixin via IStack
 
@@ -92,6 +95,9 @@ class AutoScalingStack(IStack):
         # Create launch template
         self.launch_template = self._create_launch_template(asg_name)
 
+        # Create ECS cluster if ECS configuration is detected
+        self._create_ecs_cluster_if_needed(asg_name)
+
         # Create Auto Scaling Group
         self.auto_scaling_group = self._create_auto_scaling_group(asg_name)
 
@@ -110,6 +116,10 @@ class AutoScalingStack(IStack):
         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")
@@ -138,11 +148,14 @@ class AutoScalingStack(IStack):
                 vpc_attrs["public_subnet_ids"] = ["subnet-dummy1", "subnet-dummy2"]
             
             # Use from_vpc_attributes() for SSM tokens
-            return ec2.Vpc.from_vpc_attributes(self, "VPC", **vpc_attrs)
+            self._vpc = ec2.Vpc.from_vpc_attributes(self, f"{self.stack_name}-VPC", **vpc_attrs)
+            return self._vpc
         elif self.asg_config.vpc_id:
-            return ec2.Vpc.from_lookup(self, "VPC", vpc_id=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:
-            return ec2.Vpc.from_lookup(self, "VPC", vpc_id=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(
@@ -605,6 +618,60 @@ class AutoScalingStack(IStack):
             # Scheduled action implementation would go here
             pass
 
+    def _create_ecs_cluster_if_needed(self, asg_name: str) -> None:
+        """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
+            self.stack_config.dictionary.get("auto_scaling", {}).get("enable_ecs_cluster", False)
+        )
+        
+        if not is_ecs_config:
+            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
+        
+        logger.info(f"Creating ECS cluster: {cluster_name}")
+        
+        # Create ECS cluster
+        self.ecs_cluster = ecs.Cluster(
+            self,
+            "ECSCluster",
+            cluster_name=cluster_name,
+            vpc=self.vpc,
+            container_insights=True
+        )
+        
+        # Export cluster name
+        cdk.CfnOutput(
+            self,
+            f"{cluster_name}-name",
+            value=self.ecs_cluster.cluster_name,
+            export_name=f"{self.deployment.build_resource_name(cluster_name)}-name",
+        )
+        
+        # Export cluster ARN
+        cdk.CfnOutput(
+            self,
+            f"{cluster_name}-arn",
+            value=self.ecs_cluster.cluster_arn,
+            export_name=f"{self.deployment.build_resource_name(cluster_name)}-arn",
+        )
+
     def _export_resources(self, asg_name: str) -> None:
         """Export stack resources to SSM and CloudFormation outputs"""
         # Export ASG name

cdk_factory-0.16.8/src/cdk_factory/version.py

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

cdk_factory-0.16.6/src/cdk_factory/version.py

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