cdk-factory 0.17.7__tar.gz → 0.18.2__tar.gz

{cdk_factory-0.17.7 → cdk_factory-0.18.2}/PKG-INFO

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

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

{cdk_factory-0.17.7 → cdk_factory-0.18.2}/src/cdk_factory/stack_library/auto_scaling/auto_scaling_stack_standardized.py

@@ -264,9 +264,9 @@ class AutoScalingStack(IStack, VPCProviderMixin, StandardizedSsmMixin):
             for command in self.asg_config.user_data_commands:
                 processed_command = command
                 # Substitute SSM-imported values
-                if "ecs_cluster_name" in ssm_imports and "{{ecs_cluster_name}}" in command:
-                    cluster_name = ssm_imports["ecs_cluster_name"]
-                    processed_command = command.replace("{{ecs_cluster_name}}", cluster_name)
+                if "cluster_name" in ssm_imports and "{{cluster_name}}" in command:
+                    cluster_name = ssm_imports["cluster_name"]
+                    processed_command = command.replace("{{cluster_name}}", cluster_name)
                 processed_commands.append(processed_command)
             
             user_data.add_commands(*processed_commands)
@@ -276,8 +276,8 @@ class AutoScalingStack(IStack, VPCProviderMixin, StandardizedSsmMixin):
         if self.ecs_cluster:
             # Use the SSM-imported cluster name if available, otherwise fallback to default format
             ssm_imports = self._get_ssm_imports()
-            if "ecs_cluster_name" in ssm_imports:
-                cluster_name = ssm_imports["ecs_cluster_name"]
+            if "cluster_name" in ssm_imports:
+                cluster_name = ssm_imports["cluster_name"]
                 ecs_commands = [
                     f"echo 'ECS_CLUSTER={cluster_name}' >> /etc/ecs/ecs.config",
                     "systemctl restart ecs"
@@ -335,8 +335,8 @@ class AutoScalingStack(IStack, VPCProviderMixin, StandardizedSsmMixin):
         
         if ecs_detected:
             ssm_imports = self._get_ssm_imports()
-            if "ecs_cluster_name" in ssm_imports:
-                cluster_name = ssm_imports["ecs_cluster_name"]
+            if "cluster_name" in ssm_imports:
+                cluster_name = ssm_imports["cluster_name"]
                 
                 # Use the shared VPC
                 vpc = self._get_or_create_vpc()

{cdk_factory-0.17.7 → cdk_factory-0.18.2}/src/cdk_factory/stack_library/ecs/ecs_cluster_stack_standardized.py

@@ -174,6 +174,8 @@ class EcsClusterStack(IStack, VPCProviderMixin, StandardizedSsmMixin):
 
     def _create_iam_roles(self):
         """Create IAM roles for the ECS cluster if configured."""
+        logger.info(f"create_instance_role setting: {self.ecs_config.create_instance_role}")
+        
         if not self.ecs_config.create_instance_role:
             logger.info("Skipping instance role creation (disabled in config)")
             return
@@ -193,14 +195,18 @@ class EcsClusterStack(IStack, VPCProviderMixin, StandardizedSsmMixin):
             role_name=f"{self.ecs_config.name}-ecs-instance-role",
         )
 
+        logger.info(f"Created ECS instance role: {self.instance_role.role_name}")
+
         # Create instance profile
         self.instance_profile = iam.CfnInstanceProfile(
             self,
             "ECSInstanceProfile",
-            roles=[self.instance_role.role_name],
             instance_profile_name=f"{self.ecs_config.name}-ecs-instance-profile",
+            roles=[self.instance_role.role_name],
         )
 
+        logger.info(f"Created ECS instance profile: {self.instance_profile.instance_profile_name}")
+
         logger.info("ECS instance role and profile created")
 
     def _export_cluster_info(self):
@@ -254,30 +260,51 @@ class EcsClusterStack(IStack, VPCProviderMixin, StandardizedSsmMixin):
 
     def _export_ssm_parameters(self) -> None:
         """Export SSM parameters using standardized approach"""
+        logger.info("=== Starting SSM Parameter Export ===")
+        
         if not self.ecs_cluster:
             logger.warning("No ECS cluster to export")
             return
 
+        logger.info(f"ECS cluster found: {self.ecs_cluster.cluster_name}")
+        logger.info(f"SSM exports configured: {self.ssm_config.get('exports', {})}")
+
         # Prepare resource values for export
         resource_values = {
-            "ecs_cluster_name": self.ecs_cluster.cluster_name,
-            "ecs_cluster_arn": self.ecs_cluster.cluster_arn,
+            "cluster_name": self.ecs_cluster.cluster_name,
+            "cluster_arn": self.ecs_cluster.cluster_arn,
         }
         
+        # Add instance role ARN if created
+        if self.instance_role:
+            resource_values["instance_role_arn"] = self.instance_role.role_arn
+            logger.info(f"Instance role ARN added: {self.instance_role.role_name}")
+        else:
+            logger.info("No instance role to export")
+        
         # Add security group ID if available
         if hasattr(self.ecs_cluster, 'connections') and self.ecs_cluster.connections:
             security_groups = self.ecs_cluster.connections.security_groups
             if security_groups:
-                resource_values["ecs_cluster_security_group_id"] = security_groups[0].security_group_id
+                resource_values["security_group_id"] = security_groups[0].security_group_id
+                logger.info(f"Security group ID added: {security_groups[0].security_group_id}")
         
         # Add instance profile ARN if created
         if self.instance_profile:
-            resource_values["ecs_instance_profile_arn"] = self.instance_profile.attr_arn
+            resource_values["instance_profile_arn"] = self.instance_profile.attr_arn
+            logger.info(f"Instance profile ARN added: {self.instance_profile.instance_profile_name}")
 
         # Export using standardized SSM mixin
-        exported_params = self.export_standardized_ssm_parameters(resource_values)
-        
-        logger.info(f"Exported SSM parameters: {exported_params}")
+        logger.info(f"Resource values available for export: {list(resource_values.keys())}")
+        for key, value in resource_values.items():
+            logger.info(f"  {key}: {value}")
+            
+        try:
+            exported_params = self.export_standardized_ssm_parameters(resource_values)
+            logger.info(f"Successfully exported SSM parameters: {exported_params}")
+        except Exception as e:
+            logger.error(f"Failed to export SSM parameters: {str(e)}")
+            raise
 
     # Backward compatibility methods
     def process_ssm_imports(self, config: Any, deployment: DeploymentConfig, resource_type: str = "resource") -> None:

cdk_factory-0.18.2/src/cdk_factory/version.py

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

cdk_factory-0.17.7/src/cdk_factory/version.py

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