cdk-factory 0.15.10__tar.gz → 0.15.12__tar.gz

{cdk_factory-0.15.10 → cdk_factory-0.15.12}/PKG-INFO

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

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

{cdk_factory-0.15.10 → cdk_factory-0.15.12}/src/cdk_factory/configurations/resources/rds.py

@@ -4,9 +4,13 @@ Maintainers: Eric Wilson
 MIT License. See Project Root for license information.
 """
 
+import re
 from typing import Any, Dict, List, Optional
+from aws_lambda_powertools import Logger
 from cdk_factory.configurations.enhanced_base_config import EnhancedBaseConfig
 
+logger = Logger(service="RdsConfig")
+
 
 class RdsConfig(EnhancedBaseConfig):
     """
@@ -44,13 +48,15 @@ class RdsConfig(EnhancedBaseConfig):
 
     @property
     def database_name(self) -> str:
-        """Name of the database to create"""
-        return self.__config.get("database_name", "appdb")
+        """Name of the database to create (sanitized for RDS requirements)"""
+        raw_name = self.__config.get("database_name", "appdb")
+        return self._sanitize_database_name(raw_name)
 
     @property
     def username(self) -> str:
-        """Master username for the database"""
-        return self.__config.get("username", "appuser")
+        """Master username for the database (sanitized for RDS requirements)"""
+        raw_username = self.__config.get("username", "appuser") 
+        return self._sanitize_username(raw_username)
 
     @property
     def secret_name(self) -> str:
@@ -146,3 +152,89 @@ class RdsConfig(EnhancedBaseConfig):
         if "ssm" in self.__config and "exports" in self.__config["ssm"]:
             return self.__config["ssm"]["exports"]
         return self.__config.get("ssm_exports", {})
+    
+    def _sanitize_database_name(self, name: str) -> str:
+        """
+        Sanitize database name to meet RDS requirements:
+        - Must begin with a letter (a-z, A-Z)
+        - Can contain alphanumeric characters and underscores
+        - Max 64 characters
+        
+        Args:
+            name: Raw database name from config
+            
+        Returns:
+            Sanitized database name
+            
+        Raises:
+            ValueError: If name starts with a number or is empty after sanitization
+        """
+        if not name:
+            raise ValueError("Database name cannot be empty")
+        
+        # Replace hyphens with underscores, remove other invalid chars
+        sanitized = name.replace('-', '_')
+        sanitized = re.sub(r'[^a-zA-Z0-9_]', '', sanitized)
+        
+        if not sanitized:
+            raise ValueError(f"Database name '{name}' contains no valid characters")
+        
+        # Check if it starts with a number
+        if sanitized[0].isdigit():
+            raise ValueError(
+                f"Database name '{name}' (sanitized to '{sanitized}') cannot start with a number. "
+                f"Please ensure the database name begins with a letter."
+            )
+        
+        # Truncate to 64 characters if needed
+        if len(sanitized) > 64:
+            sanitized = sanitized[:64]
+        
+        # Log if sanitization changed the name
+        if sanitized != name:
+            logger.info(f"Sanitized database name from '{name}' to '{sanitized}'")
+        
+        return sanitized
+    
+    def _sanitize_username(self, username: str) -> str:
+        """
+        Sanitize username to meet RDS requirements:
+        - Must begin with a letter (a-z, A-Z)
+        - Can contain alphanumeric characters and underscores
+        - Max 16 characters for MySQL
+        
+        Args:
+            username: Raw username from config
+            
+        Returns:
+            Sanitized username
+            
+        Raises:
+            ValueError: If username is invalid
+        """
+        if not username:
+            raise ValueError("Username cannot be empty")
+        
+        # Replace hyphens with underscores, remove other invalid chars
+        sanitized = username.replace('-', '_')
+        sanitized = re.sub(r'[^a-zA-Z0-9_]', '', sanitized)
+        
+        if not sanitized:
+            raise ValueError(f"Username '{username}' contains no valid characters")
+        
+        # Check if it starts with a number
+        if sanitized[0].isdigit():
+            raise ValueError(
+                f"Username '{username}' (sanitized to '{sanitized}') cannot start with a number. "
+                f"Please ensure the username begins with a letter."
+            )
+        
+        # Truncate to 16 characters for MySQL (other engines may vary)
+        if len(sanitized) > 16:
+            sanitized = sanitized[:16]
+        
+        # Log if sanitization changed the username
+        if sanitized != username:
+            logger.info(f"Sanitized username from '{username}' to '{sanitized}'")
+        
+        return sanitized

{cdk_factory-0.15.10 → cdk_factory-0.15.12}/src/cdk_factory/pipeline/pipeline_factory.py

@@ -305,6 +305,7 @@ class PipelineFactoryStack(IStack):
                     scope=pipeline_stage,
                     id=stack_config.name,
                     deployment=deployment,
+                    stack_config=stack_config,
                     add_env_context=self.add_env_context,
                     **kwargs,
                 )

cdk_factory-0.15.12/src/cdk_factory/stack/stack_factory.py

@@ -0,0 +1,88 @@
+"""
+Geek Cafe, LLC
+Maintainers: Eric Wilson
+MIT License.  See Project Root for the license information.
+"""
+
+from typing import Type, Dict, Any, Optional
+
+from aws_cdk import Environment
+from cdk_factory.interfaces.istack import IStack
+from cdk_factory.stack.stack_module_loader import ModuleLoader
+from cdk_factory.stack.stack_module_registry import modules
+from cdk_factory.configurations.deployment import DeploymentConfig
+from cdk_factory.configurations.stack import StackConfig
+
+
+class StackFactory:
+    """Stack Factory"""
+    
+    # Default descriptions by module type
+    DEFAULT_DESCRIPTIONS = {
+        "vpc_stack": "VPC infrastructure with public and private subnets across multiple availability zones",
+        "security_group_stack": "Security groups for network access control",
+        "security_group_full_stack": "Security groups for ALB, ECS, RDS, and monitoring",
+        "rds_stack": "Managed relational database instance with automated backups",
+        "s3_bucket_stack": "S3 bucket for object storage",
+        "media_bucket_stack": "S3 bucket for media asset storage with CDN integration",
+        "static_website_stack": "Static website hosted on S3 with CloudFront distribution",
+        "ecs_service_stack": "ECS service with auto-scaling and load balancing",
+        "lambda_stack": "Lambda function for serverless compute",
+        "api_gateway_stack": "API Gateway for REST API endpoints",
+        "cloudfront_stack": "CloudFront CDN distribution",
+        "monitoring_stack": "CloudWatch monitoring, alarms, and dashboards",
+        "ecr_stack": "Elastic Container Registry for Docker images",
+    }
+
+    def __init__(self):
+        ml: ModuleLoader = ModuleLoader()
+
+        ml.load_known_modules()
+
+    def load_module(
+        self,
+        module_name: str,
+        scope,
+        id: str,  # pylint: disable=redefined-builtin
+        deployment: Optional[DeploymentConfig] = None,
+        stack_config: Optional[StackConfig] = None,
+        add_env_context: bool = True,
+        **kwargs,
+    ) -> IStack:
+        """Loads a particular module"""
+        # print(f"loading module: {module_name}")
+        stack_class: Type[IStack] = modules.get(module_name)
+        if not stack_class:
+            raise ValueError(f"Failed to load module: {module_name}")
+
+        # Add environment information if deployment is provided and add_env_context is True
+        if deployment and add_env_context:
+            env_kwargs = self._get_environment_kwargs(deployment)
+            kwargs.update(env_kwargs)
+        
+        # Add description if not already provided in kwargs
+        if "description" not in kwargs:
+            description = self._get_stack_description(module_name, stack_config)
+            if description:
+                kwargs["description"] = description
+
+        module = stack_class(scope=scope, id=id, **kwargs)
+
+        return module
+        
+    def _get_environment_kwargs(self, deployment: DeploymentConfig) -> Dict[str, Any]:
+        """Get environment kwargs from deployment config"""
+        env = Environment(
+            account=deployment.account,
+            region=deployment.region
+        )
+        return {"env": env}
+    
+    def _get_stack_description(self, module_name: str, stack_config: Optional[StackConfig] = None) -> Optional[str]:
+        """Get stack description from config or default"""
+        # First check if stack_config has a description
+        if stack_config and stack_config.description:
+            return stack_config.description
+        
+        # Otherwise use default description based on module type
+        return self.DEFAULT_DESCRIPTIONS.get(module_name)

{cdk_factory-0.15.10 → cdk_factory-0.15.12}/src/cdk_factory/stack_library/rds/rds_stack.py

@@ -211,8 +211,10 @@ class RdsStack(IStack, EnhancedSsmParameterMixin):
             raise ValueError(f"Unsupported database engine: {self.rds_config.engine}")
 
         # Configure instance type
+        # Strip 'db.' prefix if present since ec2.InstanceType expects just the instance family/size
         instance_class = self.rds_config.instance_class
-        instance_type = ec2.InstanceType(instance_class)
+        instance_class_name = instance_class.replace("db.", "") if instance_class.startswith("db.") else instance_class
+        instance_type = ec2.InstanceType(instance_class_name)
 
         # Configure removal policy
         removal_policy = None

cdk_factory-0.15.12/src/cdk_factory/version.py

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

{cdk_factory-0.15.10 → cdk_factory-0.15.12}/src/cdk_factory/workload/workload_factory.py

@@ -124,6 +124,7 @@ class WorkloadFactory:
                     scope=self.app,
                     id=stack.name,
                     deployment=deployment,
+                    stack_config=stack,
                     add_env_context=self.add_env_context,
                     **kwargs,
                 )

cdk_factory-0.15.10/src/cdk_factory/stack/stack_factory.py

@@ -1,54 +0,0 @@
-"""
-Geek Cafe, LLC
-Maintainers: Eric Wilson
-MIT License.  See Project Root for the license information.
-"""
-
-from typing import Type, Dict, Any, Optional
-
-from aws_cdk import Environment
-from cdk_factory.interfaces.istack import IStack
-from cdk_factory.stack.stack_module_loader import ModuleLoader
-from cdk_factory.stack.stack_module_registry import modules
-from cdk_factory.configurations.deployment import DeploymentConfig
-
-
-class StackFactory:
-    """Stack Factory"""
-
-    def __init__(self):
-        ml: ModuleLoader = ModuleLoader()
-
-        ml.load_known_modules()
-
-    def load_module(
-        self,
-        module_name: str,
-        scope,
-        id: str,  # pylint: disable=redefined-builtin
-        deployment: Optional[DeploymentConfig] = None,
-        add_env_context: bool = True,
-        **kwargs,
-    ) -> IStack:
-        """Loads a particular module"""
-        # print(f"loading module: {module_name}")
-        stack_class: Type[IStack] = modules.get(module_name)
-        if not stack_class:
-            raise ValueError(f"Failed to load module: {module_name}")
-
-        # Add environment information if deployment is provided and add_env_context is True
-        if deployment and add_env_context:
-            env_kwargs = self._get_environment_kwargs(deployment)
-            kwargs.update(env_kwargs)
-
-        module = stack_class(scope=scope, id=id, **kwargs)
-
-        return module
-        
-    def _get_environment_kwargs(self, deployment: DeploymentConfig) -> Dict[str, Any]:
-        """Get environment kwargs from deployment config"""
-        env = Environment(
-            account=deployment.account,
-            region=deployment.region
-        )
-        return {"env": env}

cdk_factory-0.15.10/src/cdk_factory/version.py

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