aws-cdk-constructs 2.45.0__tar.gz → 2.46.1__tar.gz

{aws_cdk_constructs-2.45.0/aws_cdk_constructs.egg-info → aws_cdk_constructs-2.46.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws_cdk_constructs
-Version: 2.45.0
+Version: 2.46.1
 Summary: AWS CDK constructs
 Home-page: https://bitbucket.org/cioapps/aws-cdk-constructs
 Author: author

{aws_cdk_constructs-2.45.0 → aws_cdk_constructs-2.46.1}/aws_cdk_constructs/__init__.py

@@ -15,4 +15,4 @@ from .load_balancer import Alb, Nlb
 from .security_group import SecurityGroup
 from .windows_server import WindowsServer
 
-__version__ = '2.45.0'
+__version__ = '2.46.1'

{aws_cdk_constructs-2.45.0 → aws_cdk_constructs-2.46.1}/aws_cdk_constructs/bucket/bucket.py

@@ -107,6 +107,8 @@ class Bucket(Construct):
         cdn_ssl_certificate_arn (str): If "will_implement_cdn" is "True" and you want to enable HTTPS for your CloudFront distribution, specify the SSL certificate ARN to use. NB: this certificate must be in North Virginia
 
         bucket_policy_statements: List[_iam.PolicyStatement]: List of policy statements to be added to the Bucket policy. Default: []
+
+        bucket_static_website_origin (str): Whether or not the S3 Bucket should be configured as Static Website Origin on CloudFront. It cannot be combined with bucket_has_authentication='True'. Default: false
     """
 
     @property
@@ -459,6 +461,7 @@ class Bucket(Construct):
             _cloudfront.ResponseHeadersPolicy, None
         ] = None,
         user_pool_client: Union[None, _cognito.UserPoolClient] = None,
+        bucket_static_website_origin: str = 'false',
         **kwargs,
     ) -> None:
         super().__init__(scope, id, **kwargs)
@@ -521,6 +524,23 @@ class Bucket(Construct):
             and will_implement_cdn.lower() == 'true'
         )
 
+        if (
+            bucket_static_website_origin
+            and bucket_static_website_origin.lower() == 'true'
+            and bucket_has_authentication
+            and bucket_has_authentication.lower() == 'true'
+        ):
+            raise ValueError(
+                'bucket_static_website_origin and bucket_has_authentication cannot both be enabled. '
+                'Static website origin requires public bucket access, which conflicts with authenticated access.'
+            )
+
+        static_website_origin = (
+            bucket_static_website_origin
+            and isinstance(bucket_static_website_origin, str)
+            and bucket_static_website_origin.lower() == 'true'
+        )
+
         # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ CloudFormation outputs
         if not omit_cloudformation_template_outputs:
             cdk.CfnOutput(
@@ -707,12 +727,20 @@ class Bucket(Construct):
                     allowed_headers=['*'],
                 )
 
+        # Define origin type
+        if static_website_origin:
+            origin = _cloudfront_origins.S3StaticWebsiteOrigin(self.bucket)
+        else:
+            origin = (
+                _cloudfront_origins.S3BucketOrigin.with_origin_access_control(
+                    self.bucket
+                )
+            )
+
         # Create CloudFront distribution
         if create_cdn:
             default_behavior = _cloudfront.BehaviorOptions(
-                origin=_cloudfront_origins.S3BucketOrigin.with_origin_access_control(
-                    self.bucket
-                ),
+                origin=origin,
                 compress=True,
                 # viewer_protocol_policy=_cloudfront.ViewerProtocolPolicy.HTTPS_ONLY,
                 allowed_methods=_cloudfront.AllowedMethods.ALLOW_GET_HEAD_OPTIONS,
@@ -805,10 +833,6 @@ class Bucket(Construct):
                 )
             )
 
-            origin = origins.S3BucketOrigin.with_origin_access_control(
-                self.bucket
-            )
-
             redirect_paths = RedirectPaths(
                 sign_in='/parseauth',
                 auth_refresh='/refreshauth',

{aws_cdk_constructs-2.45.0 → aws_cdk_constructs-2.46.1/aws_cdk_constructs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws_cdk_constructs
-Version: 2.45.0
+Version: 2.46.1
 Summary: AWS CDK constructs
 Home-page: https://bitbucket.org/cioapps/aws-cdk-constructs
 Author: author

{aws_cdk_constructs-2.45.0 → aws_cdk_constructs-2.46.1}/tests/test_bucket.py

@@ -725,6 +725,47 @@ def test_bucket_includes_cloudfront(app, stack, environment_parameters):
     )
 
 
+def test_bucket_static_website_origin(app, stack, environment_parameters):
+    cdn_domain = 'test.dev.fao.org'
+    cdn_ssl_certificate_arn = 'arn:aws:acm:us-east-1:test:certificate/test'
+    Bucket(
+        scope=stack,
+        id='test-bucket-id',
+        app_name='test-app',
+        environment='Development',
+        environments_parameters=environment_parameters,
+        bucket_name='test-bucket-name',
+        will_implement_cdn='True',
+        cdn_domain_names=[cdn_domain],
+        cdn_ssl_certificate_arn=cdn_ssl_certificate_arn,
+        bucket_static_website_origin='True',
+    )
+
+    template = Template.from_stack(stack)
+    template.has_resource_properties(
+        'AWS::CloudFront::Distribution',
+        {
+            'DistributionConfig': {
+                'Aliases': [cdn_domain],
+                'PriceClass': 'PriceClass_100',
+                'ViewerCertificate': {
+                    'AcmCertificateArn': cdn_ssl_certificate_arn,
+                    'MinimumProtocolVersion': 'TLSv1.2_2021',
+                    'SslSupportMethod': 'sni-only',
+                },
+                'Origins': [
+                    {
+                        'CustomOriginConfig': {
+                            'OriginProtocolPolicy': 'http-only',
+                            'OriginSSLProtocols': ['TLSv1.2'],
+                        },
+                    },
+                ],
+            },
+        },
+    )
+
+
 def test_bucket_with_object_ownership_when_no_public_read_access(
     app, stack, environment_parameters
 ):