cdk-factory 0.7.30__py3-none-any.whl → 0.7.31__py3-none-any.whl

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/version.py

@@ -1 +1 @@
-__version__ = "0.7.30"
+__version__ = "0.7.31"

{cdk_factory-0.7.30.dist-info → cdk_factory-0.7.31.dist-info}/METADATA

@@ -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.dist-info → cdk_factory-0.7.31.dist-info}/RECORD

@@ -1,7 +1,7 @@
 cdk_factory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cdk_factory/app.py,sha256=xv863N7O6HPKznB68_t7O4la9JacrkG87t9TjoDUk7s,2827
 cdk_factory/cdk.json,sha256=SKZKhJ2PBpFH78j-F8S3VDYW-lf76--Q2I3ON-ZIQfw,3106
-cdk_factory/version.py,sha256=4c9Y6kqbBff_PtGI0UeOh2f4HPFaCOvIx0KdnuUqM7c,23
+cdk_factory/version.py,sha256=CtvyqFRtdJwNvYSDVmaT9l1R18bsaIwflR8r696jttk,23
 cdk_factory/builds/README.md,sha256=9BBWd7bXpyKdMU_g2UljhQwrC9i5O_Tvkb6oPvndoZk,90
 cdk_factory/commands/command_loader.py,sha256=QbLquuP_AdxtlxlDy-2IWCQ6D-7qa58aphnDPtp_uTs,3744
 cdk_factory/configurations/base_config.py,sha256=JKjhNsy0RCUZy1s8n5D_aXXI-upR9izaLtCTfKYiV9k,9624
@@ -46,7 +46,7 @@ cdk_factory/configurations/resources/security_group.py,sha256=8kQtaaRVEn2aDm8XoC
 cdk_factory/configurations/resources/security_group_full_stack.py,sha256=x5MIMCa_olO7prFBKx9zVOfvsVdKo-2mWyhrCy27dFw,2031
 cdk_factory/configurations/resources/sqs.py,sha256=fAh2dqttJ6PX46enFRULuiLEu3TEj0Vb2xntAOgUpYE,4346
 cdk_factory/configurations/resources/vpc.py,sha256=sNn6w76bHFwmt6N76gZZhqpsuNB9860C1SZu6tebaXY,3835
-cdk_factory/constructs/cloudfront/cloudfront_distribution_construct.py,sha256=84RF7eH7LW2fkqJIQmH3kI1xTb5vbdZShE-0Xb65Gek,12194
+cdk_factory/constructs/cloudfront/cloudfront_distribution_construct.py,sha256=7uDkDbFigeUOuYgsQ9ghA4dGlx63rUCa6Iiq4RWokEA,14627
 cdk_factory/constructs/ecr/ecr_construct.py,sha256=s0egnh4U7qgCSn_LLq1soRLWSxsFjrTx8P591AjkN84,7025
 cdk_factory/constructs/lambdas/lambda_function_construct.py,sha256=SQ5SEXn4kezVAzXuv_A_JB3o_svyBXOMi-htvfB9HQs,4516
 cdk_factory/constructs/lambdas/lambda_function_docker_construct.py,sha256=aSyn3eh1YnuIahZ7CbZ5WswwPL8u70ZibMoS24QQifc,9907
@@ -112,7 +112,7 @@ cdk_factory/utilities/lambda_function_utilities.py,sha256=j3tBdv_gC2MdEwBINDwAqY
 cdk_factory/utilities/os_execute.py,sha256=5Op0LY_8Y-pUm04y1k8MTpNrmQvcLmQHPQITEP7EuSU,1019
 cdk_factory/utils/api_gateway_utilities.py,sha256=If7Xu5s_UxmuV-kL3JkXxPLBdSVUKoLtohm0IUFoiV8,4378
 cdk_factory/workload/workload_factory.py,sha256=yBUDGIuB8-5p_mGcVFxsD2ZoZIziak3yh3LL3JvS0M4,5903
-cdk_factory-0.7.30.dist-info/METADATA,sha256=DHv28uW3uNKA65mnxlQXO3PQxnoaaYAdtPlTZuaM-9E,2451
-cdk_factory-0.7.30.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cdk_factory-0.7.30.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
-cdk_factory-0.7.30.dist-info/RECORD,,
+cdk_factory-0.7.31.dist-info/METADATA,sha256=4M-frbniUr3CWM1NoNqV5rdJ9vZH_1nZADAJzyOEB78,2451
+cdk_factory-0.7.31.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cdk_factory-0.7.31.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
+cdk_factory-0.7.31.dist-info/RECORD,,