cdk-factory 0.16.3__tar.gz → 0.16.5__tar.gz

{cdk_factory-0.16.3 → cdk_factory-0.16.5}/PKG-INFO

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

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

{cdk_factory-0.16.3 → cdk_factory-0.16.5}/src/cdk_factory/configurations/resources/auto_scaling.py

@@ -175,3 +175,8 @@ class AutoScalingConfig(EnhancedBaseConfig):
     def key_name(self) -> Optional[str]:
         """EC2 key pair name for SSH access"""
         return self.__config.get("key_name")
+
+    @property
+    def ssm_imports(self) -> Dict[str, Any]:
+        """SSM imports for the Auto Scaling Group"""
+        return self.__config.get("ssm", {}).get("imports", {})

{cdk_factory-0.16.3 → cdk_factory-0.16.5}/src/cdk_factory/configurations/resources/rds.py

@@ -155,6 +155,12 @@ class RdsConfig(EnhancedBaseConfig):
         """Allocated storage in GB"""
         # Ensure we return an integer
         return int(self.__config.get("allocated_storage", 20))
+    
+    @property
+    def max_allocated_storage(self) -> Optional[int]:
+        """Maximum storage for auto-scaling in GB (enables storage auto-scaling if set)"""
+        max_storage = self.__config.get("max_allocated_storage")
+        return int(max_storage) if max_storage is not None else None
 
     @property
     def storage_encrypted(self) -> bool:
@@ -180,6 +186,11 @@ class RdsConfig(EnhancedBaseConfig):
     def enable_performance_insights(self) -> bool:
         """Whether to enable Performance Insights"""
         return self.__config.get("enable_performance_insights", True)
+    
+    @property
+    def allow_major_version_upgrade(self) -> bool:
+        """Whether to allow major version upgrades"""
+        return self.__config.get("allow_major_version_upgrade", False)
 
     @property
     def subnet_group_name(self) -> str:

{cdk_factory-0.16.3 → cdk_factory-0.16.5}/src/cdk_factory/stack_library/auto_scaling/auto_scaling_stack.py

@@ -47,6 +47,8 @@ class AutoScalingStack(IStack, EnhancedSsmParameterMixin):
         self.instance_role = None
         self.user_data = None
         self._vpc = None
+        # SSM imported values
+        self.ssm_imported_values: Dict[str, str] = {}
 
     def build(
         self,
@@ -73,6 +75,9 @@ class AutoScalingStack(IStack, EnhancedSsmParameterMixin):
         )
         asg_name = deployment.build_resource_name(self.asg_config.name)
 
+        # Process SSM imports
+        self._process_ssm_imports()
+
         # Get VPC and security groups
         self.security_groups = self._get_security_groups()
 
@@ -97,11 +102,28 @@ class AutoScalingStack(IStack, EnhancedSsmParameterMixin):
     @property
     def vpc(self) -> ec2.IVpc:
         """Get the VPC for the Auto Scaling Group"""
-        # Assuming VPC is provided by the workload
-
         if self._vpc:
             return self._vpc
 
+        # Check SSM imported values first (tokens from SSM parameters)
+        if "vpc_id" in self.ssm_imported_values:
+            vpc_id = self.ssm_imported_values["vpc_id"]
+            
+            # Build VPC attributes
+            vpc_attrs = {
+                "vpc_id": vpc_id,
+                "availability_zones": ["us-east-1a", "us-east-1b"],
+            }
+            
+            # If we have subnet_ids from SSM, provide dummy subnets
+            # The actual subnets will be set via CloudFormation escape hatch
+            if "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"]
+            
+            # Use from_vpc_attributes() for SSM tokens
+            self._vpc = ec2.Vpc.from_vpc_attributes(self, "VPC", **vpc_attrs)
         elif self.asg_config.vpc_id:
             self._vpc = ec2.Vpc.from_lookup(self, "VPC", vpc_id=self.asg_config.vpc_id)
         elif self.workload.vpc_id:
@@ -120,18 +142,13 @@ class AutoScalingStack(IStack, EnhancedSsmParameterMixin):
         """Get target group ARNs from SSM imports"""
         target_group_arns = []
 
-        # Import target group ARNs using the SSM import pattern
-        imported_values = self.import_resources_from_ssm(
-            scope=self,
-            config=self.asg_config,
-            resource_name=self.asg_config.name,
-            resource_type="auto-scaling",
-        )
-
-        # Look for target group ARN imports
-        for key, value in imported_values.items():
-            if "target_group" in key and "arn" in key:
-                target_group_arns.append(value)
+        # Check if we have SSM imports for target groups
+        if "target_group_arns" in self.ssm_imported_values:
+            imported_tg_arns = self.ssm_imported_values["target_group_arns"]
+            if isinstance(imported_tg_arns, list):
+                target_group_arns.extend(imported_tg_arns)
+            else:
+                target_group_arns.append(imported_tg_arns)
 
         # see if we have any directly defined in the config
         if self.asg_config.target_group_arns:
@@ -562,11 +579,47 @@ class AutoScalingStack(IStack, EnhancedSsmParameterMixin):
                     export_name=f"{self.deployment.build_resource_name(asg_name)}-launch-template-id",
                 )
 
-            # Instance Role ARN
-            if self.instance_role:
-                cdk.CfnOutput(
-                    self,
-                    f"{asg_name}-instance-role-arn",
-                    value=self.instance_role.role_arn,
-                    export_name=f"{self.deployment.build_resource_name(asg_name)}-instance-role-arn",
-                )
+    def _process_ssm_imports(self) -> None:
+        """
+        Process SSM imports from configuration.
+
+        This method handles importing SSM parameters that are specified in the
+        auto_scaling configuration under the 'ssm.imports' section.
+        """
+        logger.info(f"Processing {len(self.asg_config.ssm_imports)} SSM imports for Auto Scaling Group")
+        
+        for param_key, param_value in self.asg_config.ssm_imports.items():
+            try:
+                if isinstance(param_value, list):
+                    # Handle list imports (like security_group_ids)
+                    imported_list = []
+                    for item in param_value:
+                        param_path = item
+                        if not param_path.startswith('/'):
+                            param_path = f"/{self.deployment.environment}/{self.deployment.workload_name}/{item}"
+                        
+                        construct_id = f"ssm-import-{param_key}-{hash(param_path) % 10000}"
+                        param = ssm.StringParameter.from_string_parameter_name(
+                            self, construct_id, param_path
+                        )
+                        imported_list.append(param.string_value)
+                    
+                    self.ssm_imported_values[param_key] = imported_list
+                    logger.info(f"Imported SSM parameter list: {param_key} with {len(imported_list)} items")
+                else:
+                    # Handle string values
+                    param_path = param_value
+                    if not param_path.startswith('/'):
+                        param_path = f"/{self.deployment.environment}/{self.deployment.workload_name}/{param_path}"
+                    
+                    construct_id = f"ssm-import-{param_key}-{hash(param_path) % 10000}"
+                    param = ssm.StringParameter.from_string_parameter_name(
+                        self, construct_id, param_path
+                    )
+                    
+                    self.ssm_imported_values[param_key] = param.string_value
+                    logger.info(f"Imported SSM parameter: {param_key} from {param_path}")
+                    
+            except Exception as e:
+                logger.error(f"Failed to import SSM parameter {param_key}: {e}")
+                raise

{cdk_factory-0.16.3 → cdk_factory-0.16.5}/src/cdk_factory/stack_library/rds/rds_stack.py

@@ -244,9 +244,18 @@ class RdsStack(IStack, EnhancedSsmParameterMixin):
             "backup_retention": Duration.days(self.rds_config.backup_retention),
             "cloudwatch_logs_exports": self.rds_config.cloudwatch_logs_exports,
             "enable_performance_insights": self.rds_config.enable_performance_insights,
+            "allow_major_version_upgrade": self.rds_config.allow_major_version_upgrade,
             "removal_policy": removal_policy,
         }
         
+        # Add storage auto-scaling if max_allocated_storage is configured
+        if self.rds_config.max_allocated_storage:
+            db_props["max_allocated_storage"] = self.rds_config.max_allocated_storage
+            logger.info(
+                f"Storage auto-scaling enabled: {self.rds_config.allocated_storage}GB "
+                f"-> {self.rds_config.max_allocated_storage}GB"
+            )
+        
         # Use either subnet group or vpc_subnets depending on what's available
         if db_subnet_group:
             db_props["subnet_group"] = rds.SubnetGroup.from_subnet_group_name(

cdk_factory-0.16.5/src/cdk_factory/version.py

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

cdk_factory-0.16.3/src/cdk_factory/version.py

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