cdk-factory 0.16.12__py3-none-any.whl → 0.16.14__py3-none-any.whl

cdk_factory/configurations/cdk_config.py

@@ -183,9 +183,11 @@ class CdkConfig:
         if self._resolved_config_file_path is None:
             raise ValueError("Config file path is not set")
 
-        file_name = f".dynamic_{os.path.basename(self._resolved_config_file_path)}"
+        file_name = os.path.join(".dynamic", os.path.basename(self._resolved_config_file_path))
         path = os.path.join(Path(self._resolved_config_file_path).parent, file_name)
-
+        
+        if not os.path.exists(Path(path).parent):
+            os.makedirs(Path(path).parent)
         cdk = config.get("cdk", {})
         if replacements and len(replacements) > 0:
             config = JsonLoadingUtility.recursive_replace(config, replacements)
@@ -214,7 +216,7 @@ class CdkConfig:
             value = static_value
         elif environment_variable_name is not None and not value:
             value = os.environ.get(environment_variable_name, None)
-            if value is None and required:
+            if (value is None or str(value).strip() == "") and required:
                 raise ValueError(
                     f"Failed to get value for environment variable {environment_variable_name}"
                 )

cdk_factory/configurations/resources/ecs_cluster.py

@@ -85,3 +85,17 @@ class EcsClusterConfig:
     def export_ssm_parameters(self) -> bool:
         """Whether to export cluster information to SSM parameters"""
         return self._config.get("export_ssm_parameters", True)
+
+    
+    @property
+    def ssm_exports(self) -> Dict[str, str]:
+        """SSM parameter exports"""
+        return self._config.get("ssm_exports", {})
+
+    @property
+    def ssm_imports(self) -> Dict[str, Any]:
+        """SSM parameter imports"""
+        # Check both nested and flat structures for backwards compatibility
+        if "ssm" in self._config and "imports" in self._config["ssm"]:
+            return self._config["ssm"]["imports"]
+        return self._config.get("ssm_imports", {})

cdk_factory/stack_library/ecs/ecs_cluster_stack.py

@@ -6,33 +6,31 @@ with proper configurability and explicit resource management.
 """
 
 import logging
-from typing import Optional, Dict, Any, List
+from typing import Optional, Dict, Any
 
 from aws_cdk import (
     aws_ecs as ecs,
-    aws_ec2 as ec2,
     aws_iam as iam,
-    aws_ssm as ssm,
-    RemovalPolicy,
-    Stack,
-    CfnOutput
+    CfnOutput,
 )
 from constructs import Construct
 
 from cdk_factory.configurations.stack import StackConfig
 from cdk_factory.configurations.deployment import DeploymentConfig
 from cdk_factory.configurations.workload import WorkloadConfig
-from cdk_factory.interfaces.ssm_parameter_mixin import SsmParameterMixin
+from cdk_factory.interfaces.vpc_provider_mixin import VPCProviderMixin
 from cdk_factory.configurations.resources.ecs_cluster import EcsClusterConfig
-
+from cdk_factory.stack.stack_module_registry import register_stack
+from cdk_factory.interfaces.istack import IStack
 
 logger = logging.getLogger(__name__)
 
 
-class EcsClusterStack(Stack, SsmParameterMixin):
+@register_stack("ecs_cluster_stack")
+class EcsClusterStack(IStack, VPCProviderMixin):
     """
     A dedicated stack for creating and managing ECS clusters.
-    
+
     This stack provides explicit configuration of ECS clusters including:
     - Cluster naming
     - Container insights
@@ -40,38 +38,64 @@ class EcsClusterStack(Stack, SsmParameterMixin):
     - SSM parameter exports
     - IAM role configurations
     """
-    
-    def __init__(
-        self,
-        scope: Construct,
-        construct_id: str,
-        stack_config: StackConfig,
-        deployment: DeploymentConfig,
-        workload: WorkloadConfig,
-        **kwargs
-    ):
+
+    def __init__(self, scope: Construct, id: str, **kwargs) -> None:
         """
         Initialize the ECS Cluster stack.
         
         Args:
             scope: The CDK construct scope
-            construct_id: The construct ID
-            stack_config: Stack configuration
-            deployment: Deployment configuration
-            workload: Workload configuration
+            id: The construct ID
         """
-        super().__init__(scope, construct_id, **kwargs)
+        super().__init__(scope, id, **kwargs)
+        
+        self._initialize_vpc_cache()
+        
+        self.ecs_config: Optional[EcsClusterConfig] = None
+        self.stack_config: Optional[StackConfig] = None
+        self.deployment: Optional[DeploymentConfig] = None
+        self.workload: Optional[WorkloadConfig] = None
+        self.ecs_cluster: Optional[ecs.Cluster] = None
+        self.instance_role: Optional[iam.Role] = None
+        self.instance_profile: Optional[iam.CfnInstanceProfile] = None
         
+        # SSM imported values
+        self.ssm_imported_values: Dict[str, Any] = {}
+
+    
+
+    def build(
+        self,
+        stack_config: StackConfig,
+        deployment: DeploymentConfig,
+        workload: WorkloadConfig,
+    ) -> None:
+        """Build the ECS Cluster stack"""
+        self._build(stack_config, deployment, workload)
+
+    def _build(
+        self,
+        stack_config: StackConfig,
+        deployment: DeploymentConfig,
+        workload: WorkloadConfig,
+    ) -> None:
+        """Internal build method for the ECS Cluster stack"""
         self.stack_config = stack_config
         self.deployment = deployment
         self.workload = workload
         
+        # Initialize VPC cache from mixin
+        self._initialize_vpc_cache()
+        
         # Load ECS cluster configuration
         self.ecs_config: EcsClusterConfig = EcsClusterConfig(
             stack_config.dictionary.get("ecs_cluster", {})
         )
         
-        logger.info(f"Creating ECS Cluster stack: {construct_id}")
+        logger.info(f"Creating ECS Cluster stack: {self.stack_name}")
+        
+        # Process SSM imports first
+        self.process_ssm_imports(self.ecs_config, deployment, "ECS Cluster")
         
         # Create the ECS cluster
         self._create_ecs_cluster()
@@ -82,159 +106,127 @@ class EcsClusterStack(Stack, SsmParameterMixin):
         # Export cluster information
         self._export_cluster_info()
         
-        logger.info(f"ECS Cluster stack created: {construct_id}")
-    
+        logger.info(f"ECS Cluster stack created: {self.stack_name}")
+
     def _create_ecs_cluster(self):
         """Create the ECS cluster with explicit configuration."""
         logger.info(f"Creating ECS cluster: {self.ecs_config.name}")
-        
+
         # Build cluster settings
         cluster_settings = []
-        
+
         # Add container insights if enabled
         if self.ecs_config.container_insights:
-            cluster_settings.append({
-                "name": "containerInsights",
-                "value": "enabled"
-            })
-        
+            cluster_settings.append({"name": "containerInsights", "value": "enabled"})
+
         # Add custom cluster settings
         if self.ecs_config.cluster_settings:
             cluster_settings.extend(self.ecs_config.cluster_settings)
-        
+
         # Create the ECS cluster
+        self.vpc = self.resolve_vpc(
+            config=self.ecs_config,
+            deployment=self.deployment,
+            workload=self.workload
+        )
+        
         self.ecs_cluster = ecs.Cluster(
             self,
             "ECSCluster",
             cluster_name=self.ecs_config.name,
-            vpc=self._get_vpc(),
+            vpc=self.vpc,
             container_insights=self.ecs_config.container_insights,
             default_cloud_map_namespace=(
-                self.ecs_config.cloud_map_namespace 
-                if self.ecs_config.cloud_map_namespace else None
+                self.ecs_config.cloud_map_namespace
+                if self.ecs_config.cloud_map_namespace
+                else None
             ),
             execute_command_configuration=(
-                self.ecs_config.execute_command_configuration 
-                if self.ecs_config.execute_command_configuration else None
-            )
+                self.ecs_config.execute_command_configuration
+                if self.ecs_config.execute_command_configuration
+                else None
+            ),
         )
-        
+
         logger.info(f"Created ECS cluster: {self.ecs_config.name}")
-    
+
     def _create_iam_roles(self):
         """Create IAM roles for the ECS cluster if configured."""
         if not self.ecs_config.create_instance_role:
             return
-        
+
         logger.info("Creating ECS instance role")
-        
+
         # Create the instance role
         self.instance_role = iam.Role(
             self,
             "ECSInstanceRole",
             assumed_by=iam.ServicePrincipal("ec2.amazonaws.com"),
-            role_name=self.ecs_config.instance_role_name or f"{self.ecs_config.name}-instance-role"
+            role_name=self.ecs_config.instance_role_name
+            or f"{self.ecs_config.name}-instance-role",
         )
-        
+
         # Add managed policies
         for policy in self.ecs_config.managed_policies:
             self.instance_role.add_managed_policy(
                 iam.ManagedPolicy.from_aws_managed_policy_name(policy)
             )
-        
+
         # Add inline policies if provided
         if self.ecs_config.inline_policies:
             for policy_name, policy_document in self.ecs_config.inline_policies.items():
                 self.instance_role.add_to_policy(
                     iam.PolicyStatement.from_json(policy_document)
                 )
-        
+
         # Create instance profile
         self.instance_profile = iam.CfnInstanceProfile(
             self,
             "ECSInstanceProfile",
             roles=[self.instance_role.role_name],
-            instance_profile_name=self.ecs_config.instance_profile_name or f"{self.ecs_config.name}-instance-profile"
+            instance_profile_name=self.ecs_config.instance_profile_name
+            or f"{self.ecs_config.name}-instance-profile",
         )
-        
+
         logger.info("Created ECS instance role and profile")
-    
-    def _get_vpc(self):
-        """Get the VPC for the ECS cluster."""
-        if self.ecs_config.vpc_id:
-            # Import VPC by ID
-            return ec2.Vpc.from_lookup(
-                self,
-                "VPC",
-                vpc_id=self.ecs_config.vpc_id
-            )
-        elif self.ecs_config.ssm_vpc_id:
-            # Import VPC from SSM
-            vpc_id = self._import_ssm_parameter_value(
-                self.ecs_config.ssm_vpc_id,
-                required=True
-            )
-            return ec2.Vpc.from_lookup(
-                self,
-                "VPC", 
-                vpc_id=vpc_id
-            )
-        else:
-            # Use default VPC
-            return ec2.Vpc.from_lookup(
-                self,
-                "VPC",
-                is_default=True
-            )
-    
+
     def _export_cluster_info(self):
         """Export cluster information via SSM parameters and CloudFormation outputs."""
         logger.info("Exporting ECS cluster information")
+
+        ssm_exports = self.ecs_config.ssm_exports
         
-        # Export cluster name
-        self.export_ssm_parameter(
-            f"/{self.deployment.name}/{self.workload.name}/ecs/cluster/name",
-            self.ecs_config.name,
-            "ECS Cluster Name"
-        )
-        
-        # Export cluster ARN
-        self.export_ssm_parameter(
-            f"/{self.deployment.name}/{self.workload.name}/ecs/cluster/arn",
-            self.ecs_cluster.cluster_arn,
-            "ECS Cluster ARN"
-        )
-        
-        # Export instance role ARN if created
-        if hasattr(self, 'instance_role'):
+        if not ssm_exports:
+            logger.info("No SSM exports configured for ECS Cluster")
+            return
+
+        logger.info(f"Processing {len(ssm_exports)} SSM exports for ECS Cluster")
+
+        if "cluster_name" in ssm_exports:
             self.export_ssm_parameter(
-                f"/{self.deployment.name}/{self.workload.name}/ecs/instance-role/arn",
-                self.instance_role.role_arn,
-                "ECS Instance Role ARN"
+                scope=self,
+                id="ClusterNameParam",
+                value=self.ecs_config.name,
+                parameter_name=ssm_exports["cluster_name"],
+                description=f"ECS Cluster Name: {self.ecs_config.name}",
             )
-        
-        # CloudFormation outputs
-        CfnOutput(
-            self,
-            "cluster-name",
-            value=self.ecs_config.name,
-            description=f"Name of the ECS cluster: {self.ecs_config.name}",
-            export_name=f"{self.deployment.name}-ecs-cluster-name"
-        )
-        
-        CfnOutput(
-            self,
-            "cluster-arn",
-            value=self.ecs_cluster.cluster_arn,
-            description=f"ARN of the ECS cluster: {self.ecs_config.name}",
-            export_name=f"{self.deployment.name}-ecs-cluster-arn"
-        )
-        
-        if hasattr(self, 'instance_role'):
-            CfnOutput(
-                self,
-                "instance-role-arn",
+
+        if "cluster_arn" in ssm_exports:
+            self.export_ssm_parameter(
+                scope=self,
+                id="ClusterArnParam",
+                value=self.ecs_cluster.cluster_arn,
+                parameter_name=ssm_exports["cluster_arn"],
+                description=f"ECS Cluster ARN: {self.ecs_cluster.cluster_arn}",
+            )
+
+        if "instance_role_arn" in ssm_exports:
+            self.export_ssm_parameter(
+                scope=self,
+                id="InstanceRoleArnParam",
                 value=self.instance_role.role_arn,
-                description=f"ARN of the ECS instance role: {self.ecs_config.name}",
-                export_name=f"{self.deployment.name}-ecs-instance-role-arn"
+                parameter_name=ssm_exports["instance_role_arn"],
+                description=f"ECS Instance Role ARN: {self.instance_role.role_arn}",
             )
+        
+        

cdk_factory/stack_library/ecs/ecs_service_stack.py

@@ -47,7 +47,7 @@ class EcsServiceStack(IStack, EnhancedSsmParameterMixin):
         self.workload: Optional[WorkloadConfig] = None
         self.cluster: Optional[ecs.ICluster] = None
         self.service: Optional[ecs.FargateService] = None
-        self.task_definition: Optional[ecs.FargateTaskDefinition] = None
+        self.task_definition: Optional[ecs.FargateTaskDefinition] | Optional[ecs.EcsTaskDefinition] = None
         self._vpc: Optional[ec2.IVpc] = None
         # SSM imported values
         self.ssm_imported_values: Dict[str, Any] = {}
@@ -662,15 +662,6 @@ class EcsServiceStack(IStack, EnhancedSsmParameterMixin):
                 description=f"ECS Service ARN: {service_name}",
             )
         
-        # Cluster name
-        if "cluster_name" in ssm_exports:
-            self.export_ssm_parameter(
-                scope=self,
-                id="ClusterNameParam",
-                value=self.cluster.cluster_name,
-                parameter_name=ssm_exports["cluster_name"],
-                description=f"ECS Cluster Name for {service_name}",
-            )
         
         # Task definition ARN
         if "task_definition_arn" in ssm_exports:

cdk_factory/version.py

@@ -1 +1 @@
-__version__ = "0.16.12"
+__version__ = "0.16.14"

{cdk_factory-0.16.12.dist-info → cdk_factory-0.16.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdk_factory
-Version: 0.16.12
+Version: 0.16.14
 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.12.dist-info → cdk_factory-0.16.14.dist-info}/RECORD

@@ -2,11 +2,11 @@ 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=SAMCCZXLVjpbIMZUK3fel2LF9pnzvZrYuoLBraKZrMc,24
+cdk_factory/version.py,sha256=6Ct3SAY8LHU_PjOBMmvLfAqWeaN9DnbWY3LjDl9rzok,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
-cdk_factory/configurations/cdk_config.py,sha256=eYboaXcz9CUx4rJbEagX8ppgtIERUlopcJXii7Vn8Ws,8796
+cdk_factory/configurations/cdk_config.py,sha256=I1mgDcGJgDCoS_WelJUQdUJLAZgyUA1NVF2q2UJ1hBw,8939
 cdk_factory/configurations/deployment.py,sha256=LO2gd1yv1nqlX_2MIjRXptylFybWiTKsMKZU0N58rSM,12110
 cdk_factory/configurations/deployment_wave.py,sha256=TFX7CYgr5SmLyziEb-R_OTteFWtlMHB4pT53ekV3d1Y,233
 cdk_factory/configurations/devops.py,sha256=PG-s2ldZmMULheWdKf2lf2LSugLoKiOKyLELTZJJxu8,2506
@@ -31,7 +31,7 @@ cdk_factory/configurations/resources/cognito.py,sha256=udX2AJ1ITLhy4f1XiJQwrva6F
 cdk_factory/configurations/resources/docker.py,sha256=hUbuxkuhcQu9LnLX7I8_57eTmHefEAGVnOHO37MkqC4,2166
 cdk_factory/configurations/resources/dynamodb.py,sha256=HsZMOaRwfuNPwKIzokeeE3f5zAQLTB5hRb_GzYq2ibg,2903
 cdk_factory/configurations/resources/ecr.py,sha256=o9hHzEBVPoxUvWZGXGbRJ-98FmP6fMLY5a1-qg42jL0,8253
-cdk_factory/configurations/resources/ecs_cluster.py,sha256=5U4PizVZtbx6-LNL1RgF_UcTQD2C_j9LJlb-yt5CCtg,3031
+cdk_factory/configurations/resources/ecs_cluster.py,sha256=oz8bXdW8dxYWQX0VIjvgAQA8quXJFF0NBTvtksS2vN4,3527
 cdk_factory/configurations/resources/ecs_service.py,sha256=fAW4EuBNhPrE7G0QcHXongKoAnFeGMRS6iP7OuGP5Fw,4926
 cdk_factory/configurations/resources/exisiting.py,sha256=EVOLnkB-DGfTlmDgyQ5DD5k2zYfpFxqI3gugDR7mifI,478
 cdk_factory/configurations/resources/lambda_edge.py,sha256=MjmiwDkys4aoRvDQhH3MT6BgeShzJXNWL7761HJrLtQ,3404
@@ -99,8 +99,8 @@ cdk_factory/stack_library/dynamodb/dynamodb_stack.py,sha256=TVyOrUhgaSuN8uymkpaQ
 cdk_factory/stack_library/ecr/README.md,sha256=xw2wPx9WN03Y4BBwqvbi9lAFGNyaD1FUNpqxVJX14Oo,179
 cdk_factory/stack_library/ecr/ecr_stack.py,sha256=1xA68sxFVyqreYjXrP_7U9I8RF9RtFeR6KeEfSWuC2U,2118
 cdk_factory/stack_library/ecs/__init__.py,sha256=ZZLBmuSt6z_cnFz6OkIFv_APmjqf706wWROruZGyFEI,289
-cdk_factory/stack_library/ecs/ecs_cluster_stack.py,sha256=gYNPJuzqYw40dYr0nPwt9vyk1tjGCZRafV98cqpVLpE,7979
-cdk_factory/stack_library/ecs/ecs_service_stack.py,sha256=c6K3BjlXyldr8ikvEhfC9C-LpKJILQQkwwU9DNlepH4,27747
+cdk_factory/stack_library/ecs/ecs_cluster_stack.py,sha256=epDF28JlBMgq9UlOlv1PkwhTYuX2ghqe2Af6ruyMtnE,7863
+cdk_factory/stack_library/ecs/ecs_service_stack.py,sha256=9kf7VifC2joOqFg9_w8wJ5TkB6L7TyPt45LIMiH-x0w,27419
 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
@@ -136,8 +136,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.12.dist-info/METADATA,sha256=n0rDgo0sPzkmsgDuEGer0D42bSshFdWPLSLB1RtC8Ow,2452
-cdk_factory-0.16.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cdk_factory-0.16.12.dist-info/entry_points.txt,sha256=S1DPe0ORcdiwEALMN_WIo3UQrW_g4YdQCLEsc_b0Swg,53
-cdk_factory-0.16.12.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
-cdk_factory-0.16.12.dist-info/RECORD,,
+cdk_factory-0.16.14.dist-info/METADATA,sha256=bMeaIm1k3H_vJvVmIaRlE9Cco-FMcIBmVYbtg85twPg,2452
+cdk_factory-0.16.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cdk_factory-0.16.14.dist-info/entry_points.txt,sha256=S1DPe0ORcdiwEALMN_WIo3UQrW_g4YdQCLEsc_b0Swg,53
+cdk_factory-0.16.14.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
+cdk_factory-0.16.14.dist-info/RECORD,,