cdk-factory 0.13.1__tar.gz → 0.13.4__tar.gz

{cdk_factory-0.13.1 → cdk_factory-0.13.4}/PKG-INFO

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

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

{cdk_factory-0.13.1 → cdk_factory-0.13.4}/src/cdk_factory/constructs/cloudfront/cloudfront_distribution_construct.py

@@ -118,11 +118,17 @@ class CloudFrontDistributionConstruct(Construct):
                 origin_access_identity=self.oai,
             )
 
+        # Get comment from config, or use default
+        comment = "CloudFront Distribution generated via the CDK Factory"
+        if self.stack_config and isinstance(self.stack_config, StackConfig):
+            cloudfront_config = self.stack_config.dictionary.get("cloudfront", {})
+            comment = cloudfront_config.get("comment", comment)
+        
         distribution = cloudfront.Distribution(
             self,
             "cloudfront-dist",
             domain_names=self.aliases,
-            comment="CloudFront Distribution generated via the CDK Factory",
+            comment=comment,
             certificate=self.certificate,
             default_behavior=cloudfront.BehaviorOptions(
                 origin=origin,
@@ -228,6 +234,15 @@ class CloudFrontDistributionConstruct(Construct):
         """
         Get the Lambda@Edge associations for the distribution from config.
         
+        Supports two configuration methods:
+        1. Convenience flag: "enable_ip_gating": true
+           - Automatically adds Lambda@Edge IP gating function
+           - Uses auto-derived SSM parameter path: /{env}/{workload}/lambda-edge/version-arn
+        
+        2. Manual configuration: "lambda_edge_associations": [...]
+           - Full control over Lambda@Edge associations
+           - Can specify custom ARNs, event types, etc.
+        
         Returns:
             List[cloudfront.EdgeLambda] or None: list of Lambda@Edge associations
         """
@@ -235,7 +250,33 @@ class CloudFrontDistributionConstruct(Construct):
         
         if self.stack_config and isinstance(self.stack_config, StackConfig):
             cloudfront_config = self.stack_config.dictionary.get("cloudfront", {})
-            lambda_edge_associations = cloudfront_config.get("lambda_edge_associations", [])
+            
+            # Check for convenience IP gating flag
+            enable_ip_gating = cloudfront_config.get("enable_ip_gating", False)
+            if enable_ip_gating:
+                logger.info("IP gating enabled via convenience flag - adding Lambda@Edge association")
+                
+                # Extract environment and workload name from config
+                # These come from the workload/deployment configuration
+                workload_dict = self.stack_config.workload
+                environment = workload_dict.get("deployment", {}).get("environment", "dev")
+                workload_name = workload_dict.get("name", "workload")
+                
+                # Auto-derive SSM parameter path or use override
+                default_ssm_path = f"/{environment}/{workload_name}/lambda-edge/version-arn"
+                ip_gate_ssm_path = cloudfront_config.get("ip_gate_function_ssm_path", default_ssm_path)
+                
+                logger.info(f"Using IP gate Lambda ARN from SSM: {ip_gate_ssm_path}")
+                
+                # Add the IP gating Lambda@Edge association
+                lambda_edge_associations = [{
+                    "event_type": "origin-request",
+                    "lambda_arn": f"{{{{ssm:{ip_gate_ssm_path}}}}}",
+                    "include_body": False
+                }]
+            else:
+                # Use manual configuration
+                lambda_edge_associations = cloudfront_config.get("lambda_edge_associations", [])
             
             for association in lambda_edge_associations:
                 event_type_str = association.get("event_type", "origin-request")

{cdk_factory-0.13.1 → cdk_factory-0.13.4}/src/cdk_factory/stack_library/lambda_edge/lambda_edge_stack.py

@@ -11,6 +11,7 @@ from pathlib import Path
 import json
 import tempfile
 import shutil
+import importlib.resources
 
 import aws_cdk as cdk
 from aws_cdk import aws_lambda as _lambda
@@ -86,7 +87,10 @@ class LambdaEdgeStack(IStack, EnhancedSsmParameterMixin):
             deployment
         )
         
-        function_name = deployment.build_resource_name(self.edge_config.name)
+        # Use the Lambda function name from config (supports template variables)
+        # e.g., "{{WORKLOAD_NAME}}-{{ENVIRONMENT}}-ip-gate" becomes "tech-talk-dev-ip-gate"
+        function_name = self.edge_config.name
+        logger.info(f"Lambda function name: '{function_name}'")
         
         # Create Lambda function
         self._create_lambda_function(function_name)
@@ -128,11 +132,38 @@ class LambdaEdgeStack(IStack, EnhancedSsmParameterMixin):
     def _create_lambda_function(self, function_name: str) -> None:
         """Create the Lambda function"""
         
-        # Resolve code path (relative to runtime directory or absolute)
-        code_path = Path(self.edge_config.code_path)
-        if not code_path.is_absolute():
-            # Assume relative to the project root
-            code_path = Path.cwd() / code_path
+        # Resolve code path - support package references (e.g., "cdk_factory:lambdas/edge/ip_gate")
+        code_path_str = self.edge_config.code_path
+        
+        if ':' in code_path_str:
+            # Package reference format: "package_name:path/within/package"
+            package_name, package_path = code_path_str.split(':', 1)
+            logger.info(f"Resolving package reference: {package_name}:{package_path}")
+            
+            try:
+                # Get the package's installed location
+                if hasattr(importlib.resources, 'files'):
+                    # Python 3.9+
+                    package_root = importlib.resources.files(package_name)
+                    code_path = Path(str(package_root / package_path))
+                else:
+                    # Fallback for older Python
+                    import pkg_resources
+                    package_root = pkg_resources.resource_filename(package_name, '')
+                    code_path = Path(package_root) / package_path
+                
+                logger.info(f"Resolved package path to: {code_path}")
+            except Exception as e:
+                raise FileNotFoundError(
+                    f"Could not resolve package reference '{code_path_str}': {e}\n"
+                    f"Make sure package '{package_name}' is installed."
+                )
+        else:
+            # Regular file path
+            code_path = Path(code_path_str)
+            if not code_path.is_absolute():
+                # Assume relative to the project root
+                code_path = Path.cwd() / code_path
         
         if not code_path.exists():
             raise FileNotFoundError(
@@ -153,9 +184,10 @@ class LambdaEdgeStack(IStack, EnhancedSsmParameterMixin):
         
         # Create runtime configuration file for Lambda@Edge
         # Since Lambda@Edge doesn't support environment variables, we bundle a config file
+        # Use the full function_name (e.g., "tech-talk-dev-ip-gate") not just the base name
         runtime_config = {
             'environment': self.deployment.environment,
-            'function_name': self.edge_config.name,
+            'function_name': function_name,
             'region': self.deployment.region
         }
         

cdk_factory-0.13.4/src/cdk_factory/version.py

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

cdk_factory-0.13.1/src/cdk_factory/version.py

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