diff --git a/samtranslator/model/s3.py b/samtranslator/model/s3.py index 4109c07dee..79846e75e2 100644 --- a/samtranslator/model/s3.py +++ b/samtranslator/model/s3.py @@ -16,6 +16,7 @@ class S3Bucket(Resource): 'LoggingConfiguration': PropertyType(False, any_type()), 'MetricsConfigurations': PropertyType(False, any_type()), 'NotificationConfiguration': PropertyType(False, is_type(dict)), + 'PublicAccessBlockConfiguration': PropertyType(False, is_type(dict)), 'ReplicationConfiguration': PropertyType(False, any_type()), 'Tags': PropertyType(False, is_type(list)), 'VersioningConfiguration': PropertyType(False, any_type()), diff --git a/tests/translator/input/s3_multiple_functions.yaml b/tests/translator/input/s3_multiple_functions.yaml index c2001e8645..f452f8fb9f 100644 --- a/tests/translator/input/s3_multiple_functions.yaml +++ b/tests/translator/input/s3_multiple_functions.yaml @@ -29,3 +29,9 @@ Resources: Images: Type: AWS::S3::Bucket + Properties: + PublicAccessBlockConfiguration: + BlockPublicAcls: true + BlockPublicPolicy: true + IgnorePublicAcls: true + RestrictPublicBuckets: true diff --git a/tests/translator/output/aws-cn/s3_multiple_functions.json b/tests/translator/output/aws-cn/s3_multiple_functions.json index 222d51d994..de4c96d187 100644 --- a/tests/translator/output/aws-cn/s3_multiple_functions.json +++ b/tests/translator/output/aws-cn/s3_multiple_functions.json @@ -61,6 +61,12 @@ "Event": "s3:ObjectCreated:*" } ] + }, + "PublicAccessBlockConfiguration": { + "BlockPublicAcls": true, + "BlockPublicPolicy": true, + "IgnorePublicAcls": true, + "RestrictPublicBuckets": true } }, "DependsOn": [ diff --git a/tests/translator/output/aws-us-gov/s3_multiple_functions.json b/tests/translator/output/aws-us-gov/s3_multiple_functions.json index 48bdf80e66..7dd7f0f970 100644 --- a/tests/translator/output/aws-us-gov/s3_multiple_functions.json +++ b/tests/translator/output/aws-us-gov/s3_multiple_functions.json @@ -61,6 +61,12 @@ "Event": "s3:ObjectCreated:*" } ] + }, + "PublicAccessBlockConfiguration": { + "BlockPublicAcls": true, + "BlockPublicPolicy": true, + "IgnorePublicAcls": true, + "RestrictPublicBuckets": true } }, "DependsOn": [ diff --git a/tests/translator/output/s3_multiple_functions.json b/tests/translator/output/s3_multiple_functions.json index e256ca7073..9ede10c748 100644 --- a/tests/translator/output/s3_multiple_functions.json +++ b/tests/translator/output/s3_multiple_functions.json @@ -61,6 +61,12 @@ "Event": "s3:ObjectCreated:*" } ] + }, + "PublicAccessBlockConfiguration": { + "BlockPublicAcls": true, + "BlockPublicPolicy": true, + "IgnorePublicAcls": true, + "RestrictPublicBuckets": true } }, "DependsOn": [