PyPI - aws-cdk-constructs - Versions diffs - 2.30.6.post3__tar.gz → 2.31.2__tar.gz - Mend

@@ -11,6 +11,7 @@ from aws_cdk import (
     aws_cloudfront as _cloudfront,
     aws_cloudfront_origins as _cloudfront_origins,
     aws_certificatemanager as _certificate,
+    aws_ec2 as _ec2,
 )
 from aws_cdk_constructs.bucket.edge_function import EdgeFunction
 import boto3
@@ -639,30 +640,39 @@ class Bucket(Construct):
         if include_cdn:
             # Cloudflare doc https://support.cloudflare.com/hc/en-us/articles/360037983412-Configuring-an-Amazon-Web-Services-static-site-to-use-Cloudflare
             cloudflare_ips = [
-                '2400:cb00::/32',
-                '2405:8100::/32',
-                '2405:b500::/32',
-                '2606:4700::/32',
-                '2803:f800::/32',
-                '2c0f:f248::/32',
-                '2a06:98c0::/29',
+                '173.245.48.0/20',
                 '103.21.244.0/22',
                 '103.22.200.0/22',
                 '103.31.4.0/22',
-                '104.16.0.0/13',
-                '104.24.0.0/14',
-                '108.162.192.0/18',
-                '131.0.72.0/22',
                 '141.101.64.0/18',
-                '162.158.0.0/15',
-                '172.64.0.0/13',
-                '173.245.48.0/20',
-                '188.114.96.0/20',
+                '108.162.192.0/18',
                 '190.93.240.0/20',
+                '188.114.96.0/20',
                 '197.234.240.0/22',
                 '198.41.128.0/17',
+                '162.158.0.0/15',
+                '104.16.0.0/13',
+                '104.24.0.0/14',
+                '172.64.0.0/13',
+                '131.0.72.0/22',
+                '2400:cb00::/32',
+                '2606:4700::/32',
+                '2803:f800::/32',
+                '2405:b500::/32',
+                '2405:8100::/32',
+                '2a06:98c0::/29',
+                '2c0f:f248::/32',
             ]
+            # Retrieve VPC CIDR from ID
+            vpc_id = self.aws_account['vpc']
+            self._vpc = _ec2.Vpc.from_lookup(
+                self,
+                'VPC',
+                vpc_id=vpc_id,
+            )
+            vpc_cidr = self._vpc.vpc_cidr_block
             # Only allow access from Cloudflare IPs
             self._bucket.add_to_resource_policy(
                 _iam.PolicyStatement(
@@ -673,21 +683,14 @@ class Bucket(Construct):
                         'arn:aws:s3:::' + bucket_name + '/*',
                     ],
                     conditions={
-                        'NotIpAddress': {'aws:SourceIp': cloudflare_ips}
+                        'NotIpAddress': {
+                            'aws:VpcSourceIp': vpc_cidr,
+                            'aws:SourceIp': cloudflare_ips,
+                        },
+                        'StringNotEquals': {'aws:SourceVpc': vpc_id},
                     },
                 )
             )
-            self._bucket.add_to_resource_policy(
-                _iam.PolicyStatement(
-                    effect=_iam.Effect.ALLOW,
-                    principals=[_iam.AnyPrincipal()],
-                    actions=['s3:GetObject'],
-                    resources=[
-                        'arn:aws:s3:::' + bucket_name + '/*',
-                    ],
-                    conditions={'IpAddress': {'aws:SourceIp': cloudflare_ips}},
-                )
-            )
             # To be refactored. You want to include only once the CORS configuration.
             # if public_read_access and include_cdn are both "true"

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aws_cdk_constructs
-Version: 2.30.6.post3
+Version: 2.31.2
 Summary: AWS CDK constructs
 Home-page: https://bitbucket.org/cioapps/aws-cdk-constructs
 Author: author

@@ -15,4 +15,4 @@ from .load_balancer import Alb, Nlb
 from .security_group import SecurityGroup
 from .windows_server import WindowsServer
-__version__ = '2.30.6-3'
+__version__ = '2.31.2'

@@ -1,6 +1,6 @@
 import enum
-from pydantic import BaseModel, validator
+from pydantic import BaseModel, field_validator
 class FargateTypes(enum.Enum):
@@ -65,19 +65,19 @@ class FargateValidator(BaseModel):
     cpu: int
     mem: int
-    @validator('cpu')
+    @field_validator('cpu')
     def cpu_must_be_valid(cls, v, values, **kwargs):
         allowed_cpus = [x.get('cpu') for x in FargateTypes.valid_values.value]
         if v not in allowed_cpus:
             raise ValueError(f'Fargate task cpu must be one of {allowed_cpus}')
         return v
-    @validator('mem')
+    @field_validator('mem')
     def memory_must_be_valid_for_cpu_setting(cls, v, values, **kwargs):
         allowed_mems = next(
             x.get('mem')
             for x in FargateTypes.valid_values.value
-            if x.get('cpu') == values.get('cpu')
+            if x.get('cpu') == values.data.get('cpu')
         )
         if type(allowed_mems) is dict:
@@ -91,6 +91,6 @@ class FargateValidator(BaseModel):
         if v not in allowed_mems:
             raise ValueError(
-                f"Fargate task memory must be one of {allowed_mems} when cpu is {values.get('cpu')}"
+                f"Fargate task memory must be one of {allowed_mems} when cpu is {values.data.get('cpu')}"
             )
         return v

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aws-cdk-constructs
-Version: 2.30.6.post3
+Version: 2.31.2
 Summary: AWS CDK constructs
 Home-page: https://bitbucket.org/cioapps/aws-cdk-constructs
 Author: author

@@ -2,4 +2,4 @@ aws-cdk-lib==2.123.0
 aws-cdk.aws-neptune-alpha==2.123.0a0
 constructs<11.0.0,>=10.0.0
 boto3==1.26.59
-pydantic==1.10.15
+pydantic==2.7.3

@@ -25,7 +25,7 @@ setuptools.setup(
         f"aws-cdk.aws-neptune-alpha=={AWS_CDK_VERSION}a0",  # Including "a0" postfix as its an alpha version
         "constructs>=10.0.0,<11.0.0",
         "boto3==1.26.59",
-        "pydantic==1.10.15",
+        "pydantic==2.7.3",
     ],
     python_requires=">=3.6",
     classifiers=[

aws-cdk-constructs 2.30.6.post3__tar.gz → 2.31.2__tar.gz

aws-cdk-constructs 2.30.6.post3tar.gz → 2.31.2tar.gz