cdk-factory 0.18.12__tar.gz → 0.18.15__tar.gz

{cdk_factory-0.18.12 → cdk_factory-0.18.15}/PKG-INFO

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

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

{cdk_factory-0.18.12 → cdk_factory-0.18.15}/src/cdk_factory/configurations/resources/ecs_service.py

@@ -83,14 +83,27 @@ class EcsServiceConfig:
         """Whether to assign public IP addresses"""
         return self._config.get("assign_public_ip", False)
 
+    @property
+    def load_balancer_config(self) -> Dict[str, Any]:
+        """Load balancer configuration"""
+        return self._config.get("load_balancer", {})
+
     @property
     def target_group_arns(self) -> List[str]:
         """Target group ARNs for load balancing"""
+        # Check if load_balancer config has target_group_arn
+        if self.load_balancer_config and self.load_balancer_config.get("target_group_arn"):
+            arn = self.load_balancer_config["target_group_arn"]
+            if arn and arn != "arn:aws:elasticloadbalancing:placeholder":
+                return [arn]
         return self._config.get("target_group_arns", [])
 
     @property
     def container_port(self) -> int:
         """Container port for load balancer"""
+        # Check load_balancer config first
+        if self.load_balancer_config and self.load_balancer_config.get("container_port"):
+            return self.load_balancer_config["container_port"]
         return self._config.get("container_port", 80)
 
     @property
@@ -138,8 +151,17 @@ class EcsServiceConfig:
         """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.ssm.get("imports", {})
+            imports = self._config["ssm"]["imports"]
+        else:
+            imports = self.ssm.get("imports", {})
+        
+        # Add load_balancer SSM imports if they exist
+        if self.load_balancer_config and "ssm" in self.load_balancer_config:
+            lb_ssm = self.load_balancer_config["ssm"]
+            if "imports" in lb_ssm:
+                imports.update(lb_ssm["imports"])
+        
+        return imports
 
     @property
     def deployment_type(self) -> str:

{cdk_factory-0.18.12 → cdk_factory-0.18.15}/src/cdk_factory/configurations/resources/route53.py

@@ -106,3 +106,8 @@ class Route53Config:
     def tags(self) -> Dict[str, str]:
         """Tags to apply to the Route53 resources"""
         return self.__config.get("tags", {})
+    
+    @property
+    def records(self) -> List[Dict[str, Any]]:
+        """Records to create"""
+        return self.__config.get("records", [])

{cdk_factory-0.18.12 → cdk_factory-0.18.15}/src/cdk_factory/interfaces/standardized_ssm_mixin.py

@@ -269,6 +269,23 @@ class StandardizedSsmMixin:
         
         return exported_params
     
+    def resolve_ssm_value(self, scope: Construct, value: str, unique_id: str)-> str:
+        if isinstance(value, str) and value.startswith("{{ssm:") and value.endswith("}}"):
+            # Extract SSM parameter path
+            ssm_param_path = value[6:-2]  # Remove {{ssm: and }}
+            
+            # Import SSM parameter - this creates a token that resolves at deployment time
+            param = ssm.StringParameter.from_string_parameter_name(
+                scope=scope,
+                id=f"{unique_id}-env-{hash(ssm_param_path) % 10000}",
+                string_parameter_name=ssm_param_path
+            )
+            resolved_value = param.string_value
+            logger.info(f"Resolved SSM parameter {ssm_param_path}")
+            return resolved_value
+        else:
+            return value
+
     def _resolve_ssm_import(self, import_value: Union[str, List[str]], import_key: str) -> Union[str, List[str]]:
         """
         Resolve SSM import value with proper error handling and validation.

{cdk_factory-0.18.12 → cdk_factory-0.18.15}/src/cdk_factory/stack_library/cloudfront/cloudfront_stack.py

@@ -13,6 +13,7 @@ from aws_cdk import (
     aws_cloudfront as cloudfront,
     aws_cloudfront_origins as origins,
     aws_certificatemanager as acm,
+    aws_route53 as route53,
     aws_lambda as _lambda,
     aws_ssm as ssm,
     CfnOutput,
@@ -173,14 +174,18 @@ class CloudFrontStack(IStack):
                 return
             
             # Create the certificate
+            # Get hosted zone from SSM imports
+            hosted_zone_id = cert_config.get("hosted_zone_id")
+            hosted_zone = route53.HostedZone.from_hosted_zone_id(
+                self, "HostedZone", hosted_zone_id
+            )
+            
             self.certificate = acm.Certificate(
                 self,
                 "Certificate",
                 domain_name=domain_name,
                 subject_alternative_names=self.cf_config.aliases,
-                validation_method=acm.ValidationMethod.from_string(
-                    cert_config.get("validation_method", "DNS")
-                ),
+                validation=acm.CertificateValidation.from_dns(hosted_zone=hosted_zone),
             )
             logger.info(f"Created new ACM certificate for domain: {domain_name}")
             return

{cdk_factory-0.18.12 → cdk_factory-0.18.15}/src/cdk_factory/stack_library/ecs/ecs_service_stack.py

@@ -563,7 +563,7 @@ class EcsServiceStack(IStack, VPCProviderMixin, StandardizedSsmMixin):
         for param_key, param_name in ssm_imports.items():
             if 'target_group' in param_key.lower() or 'tg' in param_key.lower():
                 try:
-                    param_value = self.get_ssm_parameter_value(param_name)
+                    param_value = self.get_ssm_imported_value(param_name)
                     if param_value and param_value.startswith('arn:'):
                         target_group_arns.append(param_value)
                 except Exception as e:

cdk_factory-0.18.15/src/cdk_factory/stack_library/route53/route53_stack.py

@@ -0,0 +1,449 @@
+"""
+Route53 Stack Pattern for CDK-Factory
+Maintainers: Eric Wilson
+MIT License.  See Project Root for the license information.
+"""
+
+from typing import Dict, Any, List, Optional
+
+import aws_cdk as cdk
+from aws_cdk import (
+    aws_route53 as route53,
+    aws_route53_targets as targets,
+    aws_certificatemanager as acm,
+    aws_elasticloadbalancingv2 as elbv2,
+    aws_cloudfront as cloudfront,
+    Duration,
+    CfnOutput,
+)
+from aws_lambda_powertools import Logger
+from constructs import Construct
+
+from cdk_factory.configurations.deployment import DeploymentConfig
+from cdk_factory.configurations.stack import StackConfig
+from cdk_factory.configurations.resources.route53 import Route53Config
+from cdk_factory.interfaces.istack import IStack
+from cdk_factory.interfaces.standardized_ssm_mixin import StandardizedSsmMixin
+from cdk_factory.stack.stack_module_registry import register_stack
+from cdk_factory.workload.workload_factory import WorkloadConfig
+
+logger = Logger(service="Route53Stack")
+
+
+@register_stack("route53_library_module")
+@register_stack("route53_stack")
+class Route53Stack(IStack, StandardizedSsmMixin):
+    """
+    Reusable stack for AWS Route53.
+    Supports creating hosted zones, DNS records, and certificate validation.
+    """
+
+    def __init__(self, scope: Construct, id: str, **kwargs) -> None:
+        super().__init__(scope, id, **kwargs)
+        
+        self.route53_config = None
+        self.stack_config = None
+        self.deployment = None
+        self.workload = None
+        self.hosted_zone = None
+        self.certificate = None
+        self.records = {}
+        self._distribution_cache = {}  # Cache for reusing distributions
+
+    def build(self, stack_config: StackConfig, deployment: DeploymentConfig, workload: WorkloadConfig) -> None:
+        """Build the Route53 stack"""
+        self._build(stack_config, deployment, workload)
+
+    def _build(self, stack_config: StackConfig, deployment: DeploymentConfig, workload: WorkloadConfig) -> None:
+        """Internal build method for the Route53 stack"""
+        self.stack_config = stack_config
+        self.deployment = deployment
+        self.workload = workload
+
+        self.route53_config = Route53Config(stack_config.dictionary.get("route53", {}), deployment)
+        
+        # Get or create hosted zone
+        self.hosted_zone = self._get_or_create_hosted_zone()
+        
+        # Create certificate if needed (DEPRECATED - use dedicated ACM stack)
+        if self.route53_config.create_certificate:
+            logger.warning(
+                "Creating certificates in Route53Stack is deprecated. "
+                "Please use the dedicated 'acm_stack' module for certificate management. "
+                "This feature will be maintained for backward compatibility."
+            )
+            self.certificate = self._create_certificate()
+            
+        # Create DNS records
+        self._create_dns_records()
+        
+        # Add outputs
+        self._add_outputs()
+
+    def _get_or_create_hosted_zone(self) -> route53.IHostedZone:
+        """Get an existing hosted zone or create a new one"""
+        if self.route53_config.existing_hosted_zone_id:
+            # Import existing hosted zone
+            return route53.HostedZone.from_hosted_zone_attributes(
+                self,
+                "ImportedHostedZone",
+                hosted_zone_id=self.route53_config.existing_hosted_zone_id,
+                zone_name=self.route53_config.domain_name
+            )
+        elif self.route53_config.create_hosted_zone:
+            # Create new hosted zone
+            return route53.PublicHostedZone(
+                self,
+                "HostedZone",
+                zone_name=self.route53_config.domain_name,
+                comment=f"Hosted zone for {self.route53_config.domain_name}"
+            )
+        else:
+            # Look up hosted zone by name
+            return route53.HostedZone.from_lookup(
+                self,
+                "LookedUpHostedZone",
+                domain_name=self.route53_config.domain_name
+            )
+
+    def _create_certificate(self) -> acm.Certificate:
+        """Create an ACM certificate with DNS validation"""
+        certificate = acm.Certificate(
+            self,
+            "Certificate",
+            domain_name=self.route53_config.domain_name,
+            validation=acm.CertificateValidation.from_dns(self.hosted_zone),
+            subject_alternative_names=self.route53_config.subject_alternative_names
+        )
+        
+        return certificate
+
+    def _create_dns_records(self) -> None:
+        self._create_dns_records_old()
+        self._create_dns_records_new()
+
+    
+    def _get_or_create_cloudfront_distribution(self, distribution_domain: str, distribution_id: str) -> cloudfront.Distribution:
+        """Get or create a CloudFront distribution, reusing if already created"""
+        # Create a unique cache key from distribution domain and ID
+        cache_key = f"{distribution_domain}-{distribution_id}"
+        
+        if cache_key not in self._distribution_cache:
+            # Create the distribution construct with a unique ID
+            unique_id = f"CF-{distribution_domain.replace('.', '-').replace('*', 'wildcard')}-{hash(cache_key) % 10000}"
+            distribution = cloudfront.Distribution.from_distribution_attributes(
+                self, unique_id,
+                domain_name=distribution_domain,
+                distribution_id=distribution_id
+            )
+            self._distribution_cache[cache_key] = distribution
+            logger.info(f"Created CloudFront distribution construct for {distribution_domain}")
+        
+        return self._distribution_cache[cache_key]
+
+    def _create_dns_records_new(self) -> None:
+        """Create DNS records based on configuration - generic implementation"""
+        
+        missing_configurations = []
+
+        for record in self.route53_config.records:
+            record_name = record.get("name", "")
+            record_type = record.get("type", "")
+            
+            if not record_name or not record_type:
+                message = f"Record missing name or type: {record}"
+                logger.warning(message)
+                missing_configurations.append(message)
+                continue
+            
+            # Handle alias records
+            if "alias" in record:
+                alias_config = record["alias"]
+                target_type = alias_config.get("target_type", "")
+                target_value = alias_config.get("target_value", "")
+                hosted_zone_id = alias_config.get("hosted_zone_id", "")
+                
+                unique_id = f"{record_name}-{record_type}"
+                # Handle SSM parameter references in target_value                
+                target_value = self.resolve_ssm_value(self, target_value, unique_id=unique_id)
+                
+                if not target_type or not target_value:
+                    message = f"Alias record missing target_type or target_value: {record}"
+                    logger.warning(message)
+                    missing_configurations.append(message)
+                    continue
+                
+                # Create appropriate target based on type
+                alias_target = None
+                if target_type == "cloudfront":
+                    # CloudFront distribution target
+                    distribution_domain = target_value
+                    distribution_id = alias_config.get("distribution_id", "")
+                    if not distribution_id:
+                        message = f"Alias record missing distribution_id: {record}"
+                        logger.warning(message)
+                        missing_configurations.append(message)
+                        continue
+                    
+                    # Get or create the distribution (reuses if already created)
+                    distribution = self._get_or_create_cloudfront_distribution(distribution_domain, distribution_id)
+                    alias_target = route53.RecordTarget.from_alias(
+                        targets.CloudFrontTarget(distribution)
+                    )
+                elif target_type == "loadbalancer" or target_type == "alb":
+                    # Load Balancer target
+                    alias_target = route53.RecordTarget.from_alias(
+                        targets.LoadBalancerTarget(
+                            elbv2.ApplicationLoadBalancer.from_load_balancer_attributes(
+                                self, f"ALB-{record_name}",
+                                load_balancer_dns_name=target_value,
+                                load_balancer_canonical_hosted_zone_id=hosted_zone_id
+                            )
+                        )
+                    )
+                elif target_type == "elbv2":
+                    # Generic ELBv2 target
+                    alias_target = route53.RecordTarget.from_alias(
+                        targets.LoadBalancerTarget(
+                            elbv2.ApplicationLoadBalancer.from_load_balancer_attributes(
+                                self, f"ELB-{record_name}",
+                                load_balancer_dns_name=target_value,
+                                load_balancer_canonical_hosted_zone_id=hosted_zone_id
+                            )
+                        )
+                    )
+                else:
+                    message = f"Unsupported alias target type: {target_type}"
+                    logger.warning(message)
+                    missing_configurations.append(message)
+                    continue
+                
+                # Create the alias record
+                route53.ARecord(
+                    self,
+                    f"AliasRecord-{record_name}-{record_type}",
+                    zone=self.hosted_zone,
+                    record_name=record_name,
+                    target=alias_target,
+                    ttl=cdk.Duration.seconds(record.get("ttl", 300))
+                ) if record_type == "A" else route53.AaaaRecord(
+                    self,
+                    f"AliasRecord-{record_name}-{record_type}",
+                    zone=self.hosted_zone,
+                    record_name=record_name,
+                    target=alias_target,
+                    ttl=cdk.Duration.seconds(record.get("ttl", 300))
+                )
+                
+            # Handle standard records with values
+            elif "values" in record:
+                values = record["values"]
+                if not isinstance(values, list):
+                    values = [values]
+                
+                # Handle SSM parameter references in values
+                processed_values = []
+                for value in values:
+                    if "{{ssm:" in str(value) and "}}" in str(value):
+                        # Extract SSM parameter path from template like {{ssm:/path/to/parameter}}
+                        ssm_path = str(value).split("{{ssm:")[1].split("}}")[0]
+                        resolved_value = self.get_ssm_imported_value(ssm_path)
+                        processed_values.append(resolved_value)
+                    else:
+                        processed_values.append(value)
+                
+                values = processed_values
+                ttl = record.get("ttl", 300)
+                
+                # Create standard record based on type
+                if record_type == "A":
+                    route53.ARecord(
+                        self,
+                        f"Record-{record_name}",
+                        zone=self.hosted_zone,
+                        record_name=record_name,
+                        target=route53.RecordTarget.from_ip_addresses(*values),
+                        ttl=cdk.Duration.seconds(ttl)
+                    )
+                elif record_type == "AAAA":
+                    route53.AaaaRecord(
+                        self,
+                        f"Record-{record_name}",
+                        zone=self.hosted_zone,
+                        record_name=record_name,
+                        target=route53.RecordTarget.from_ip_addresses(*values),
+                        ttl=cdk.Duration.seconds(ttl)
+                    )
+                elif record_type == "CNAME":
+                    route53.CnameRecord(
+                        self,
+                        f"Record-{record_name}",
+                        zone=self.hosted_zone,
+                        record_name=record_name,
+                        domain_name=values[0],  # CNAME only supports single value
+                        ttl=cdk.Duration.seconds(ttl)
+                    )
+                elif record_type == "MX":
+                    # MX records need special handling for preference values
+                    mx_targets = []
+                    for value in values:
+                        if isinstance(value, str) and " " in value:
+                            preference, domain = value.split(" ", 1)
+                            mx_targets.append(route53.MxRecordValue(
+                                domain_name=domain.strip(),
+                                preference=int(preference.strip())
+                            ))
+                        else:
+                            logger.warning(f"Invalid MX record format: {value}")
+                    
+                    if mx_targets:
+                        route53.MxRecord(
+                            self,
+                            f"Record-{record_name}",
+                            zone=self.hosted_zone,
+                            record_name=record_name,
+                            values=mx_targets,
+                            ttl=cdk.Duration.seconds(ttl)
+                        )
+                elif record_type == "TXT":
+                    route53.TxtRecord(
+                        self,
+                        f"Record-{record_name}",
+                        zone=self.hosted_zone,
+                        record_name=record_name,
+                        values=values,
+                        ttl=cdk.Duration.seconds(ttl)
+                    )
+                elif record_type == "NS":
+                    route53.NsRecord(
+                        self,
+                        f"Record-{record_name}",
+                        zone=self.hosted_zone,
+                        record_name=record_name,
+                        values=values,
+                        ttl=cdk.Duration.seconds(ttl)
+                    )
+                else:
+                    message = f"Unsupported record type: {record_type}"
+                    logger.warning(message)
+                    missing_configurations.append(message)
+                    continue
+            
+            else:
+                message = f"Record missing 'alias' or 'values' configuration: {record}"
+                logger.warning(message)
+                missing_configurations.append(message)
+                continue
+
+        if missing_configurations and len(missing_configurations) > 0:
+            # print all missing configurations
+            print("Missing configurations:")
+            for message in missing_configurations:
+                print(message)
+            
+            messages = "\n".join(missing_configurations)
+            raise ValueError(f"Missing Configurations:\n{messages}")
+
+    def _create_dns_records_old(self) -> None:
+        """Create DNS records based on configuration"""
+        # Create alias records
+        for alias_record in self.route53_config.aliases:
+            record_name = alias_record.get("name", "")
+            target_type = alias_record.get("target_type", "")
+            target_value = alias_record.get("target_value", "")
+            
+            # target value needs to handle SSM parameters
+            if "{{ssm:" in target_value and "}}" in target_value:
+                # Extract SSM parameter path from template like {{ssm:/path/to/parameter}}
+                ssm_path = target_value.split("{{ssm:")[1].split("}}")[0]
+                target_value = self.get_ssm_imported_value(ssm_path)
+
+            if not record_name or not target_type or not target_value:
+                continue
+                
+            # Determine the alias target
+            alias_target = None
+            if target_type == "alb":
+                # Get the ALB from the workload if available
+                if hasattr(self.workload, "load_balancer"):
+                    alb = self.workload.load_balancer
+                    alias_target = route53.RecordTarget.from_alias(targets.LoadBalancerTarget(alb))
+                else:
+                    # Try to get ALB from target value
+                    alb = elbv2.ApplicationLoadBalancer.from_lookup(
+                        self,
+                        f"ALB-{record_name}",
+                        load_balancer_arn=target_value
+                    )
+                    alias_target = route53.RecordTarget.from_alias(targets.LoadBalancerTarget(alb))
+            elif target_type == "cloudfront":
+                # For CloudFront, we would need the distribution
+                # This is a simplified implementation
+                pass
+                
+            if alias_target:
+                record = route53.ARecord(
+                    self,
+                    f"AliasRecord-{record_name}",
+                    zone=self.hosted_zone,
+                    record_name=record_name,
+                    target=alias_target
+                )
+                self.records[record_name] = record
+                
+        # Create CNAME records
+        for cname_record in self.route53_config.cname_records:
+            record_name = cname_record.get("name", "")
+            target_domain = cname_record.get("target_domain", "")
+            ttl = cname_record.get("ttl", 300)
+            
+            if not record_name or not target_domain:
+                continue
+                
+            record = route53.CnameRecord(
+                self,
+                f"CnameRecord-{record_name}",
+                zone=self.hosted_zone,
+                record_name=record_name,
+                domain_name=target_domain,
+                ttl=cdk.Duration.seconds(ttl)
+            )
+            self.records[record_name] = record
+
+    def _add_outputs(self) -> None:
+        """Add CloudFormation outputs for the Route53 resources"""
+        # Hosted Zone ID
+        if self.hosted_zone:
+            cdk.CfnOutput(
+                self,
+                "HostedZoneId",
+                value=self.hosted_zone.hosted_zone_id,
+                export_name=f"{self.deployment.build_resource_name('hosted-zone')}-id"
+            )
+            
+            # Hosted Zone Name Servers
+            if hasattr(self.hosted_zone, "name_servers") and self.hosted_zone.name_servers:
+                cdk.CfnOutput(
+                    self,
+                    "NameServers",
+                    value=",".join(self.hosted_zone.name_servers),
+                    export_name=f"{self.deployment.build_resource_name('hosted-zone')}-name-servers"
+                )
+        
+        # Certificate ARN
+        if self.certificate:
+            cdk.CfnOutput(
+                self,
+                "CertificateArn",
+                value=self.certificate.certificate_arn,
+                export_name=f"{self.deployment.build_resource_name('certificate')}-arn"
+            )
+            
+        # Record names
+        for name, record in self.records.items():
+            cdk.CfnOutput(
+                self,
+                f"Record-{name}",
+                value=name,
+                export_name=f"{self.deployment.build_resource_name('record')}-{name}"
+            )

cdk_factory-0.18.15/src/cdk_factory/version.py

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