cdk-factory 0.7.30__tar.gz → 0.7.31__tar.gz

{cdk_factory-0.7.30 → cdk_factory-0.7.31}/PKG-INFO

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

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

{cdk_factory-0.7.30 → cdk_factory-0.7.31}/src/cdk_factory/constructs/cloudfront/cloudfront_distribution_construct.py

@@ -190,15 +190,23 @@ class CloudFrontDistributionConstruct(Construct):
             cloudfront_config = self.stack_config.dictionary.get("cloudfront", {})
             enable_url_rewrite = cloudfront_config.get("enable_url_rewrite", False)
         
-        if enable_url_rewrite:
+        # CloudFront only allows ONE function per event type
+        # If both URL rewrite and host restrictions are needed, combine them
+        if enable_url_rewrite and self.restrict_to_known_hosts and self.aliases:
+            function_associations.append(
+                cloudfront.FunctionAssociation(
+                    function=self.__get_combined_function(hosts=self.aliases),
+                    event_type=cloudfront.FunctionEventType.VIEWER_REQUEST,
+                )
+            )
+        elif enable_url_rewrite:
             function_associations.append(
                 cloudfront.FunctionAssociation(
                     function=self.__get_url_rewrite_function(),
                     event_type=cloudfront.FunctionEventType.VIEWER_REQUEST,
                 )
             )
-
-        if self.restrict_to_known_hosts and self.aliases:
+        elif self.restrict_to_known_hosts and self.aliases:
             function_associations.append(
                 cloudfront.FunctionAssociation(
                     function=self.__get_cloudfront_host_restrictions(
@@ -210,6 +218,58 @@ class CloudFrontDistributionConstruct(Construct):
 
         return function_associations
 
+    def __get_combined_function(self, hosts: List[str]) -> cloudfront.Function:
+        """
+        Creates a combined CloudFront function that does both URL rewriting and host restrictions.
+        This is necessary because CloudFront only allows one function per event type.
+        
+        Args:
+            hosts: List of allowed hostnames
+            
+        Returns:
+            cloudfront.Function: Combined function
+        """
+        allowed_hosts = "[" + ", ".join(f"'{host}'" for host in hosts) + "]"
+        
+        function_code = f"""
+        function handler(event) {{
+            var request = event.request;
+            var allowedHosts = {allowed_hosts};
+            var hostHeader = request.headers.host.value;
+            
+            // Check host restrictions first
+            if (allowedHosts.indexOf(hostHeader) === -1) {{
+                return {{ statusCode: 403, statusDescription: 'Forbidden' }};
+            }}
+            
+            // Then do URL rewrite
+            var uri = request.uri;
+            
+            // If URI doesn't have a file extension and doesn't end with /
+            if (!uri.includes('.') && !uri.endsWith('/')) {{
+                request.uri = uri + '/index.html';
+            }}
+            // If URI ends with / but not index.html
+            else if (uri.endsWith('/') && !uri.endsWith('index.html')) {{
+                request.uri = uri + 'index.html';
+            }}
+            // If URI is exactly /
+            else if (uri === '/') {{
+                request.uri = '/index.html';
+            }}
+            
+            return request;
+        }}
+        """
+
+        combined_function = cloudfront.Function(
+            self,
+            "CombinedFunction",
+            comment="Combined URL rewrite and host restrictions for static site routing",
+            code=cloudfront.FunctionCode.from_inline(function_code),
+        )
+        return combined_function
+
     def __get_url_rewrite_function(self) -> cloudfront.Function:
         """
         Creates a CloudFront function that rewrites URLs for SPA/static site routing.

cdk_factory-0.7.31/src/cdk_factory/version.py

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

cdk_factory-0.7.30/src/cdk_factory/version.py

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