fix(s3): clarifying blockPublicAccess behavior with v2

packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-custom-s3.ts

@@ -10,7 +10,7 @@ class TestStack extends Stack {
 
     const bucket = new s3.Bucket(this, 'Bucket', {
       publicReadAccess: true,
-      blockPublicAccess: {
+      blockPublicAccessV2: {
         blockPublicPolicy: false,
         blockPublicAcls: false,
         ignorePublicAcls: false,

packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/ec2/integ.environment-file.ts

@@ -18,7 +18,7 @@ const stack = new cdk.Stack(app, 'aws-ecs-integ');
 
 // S3 bucket to host envfile without public access
 const bucket = new s3.Bucket(stack, 'Bucket', {
-  blockPublicAccess: s3.BlockPublicAccess.BLOCK_ALL,
+  blockPublicAccessV2: s3.BlockPublicAccessV2.BLOCK_ALL,
   removalPolicy: cdk.RemovalPolicy.DESTROY,
   autoDeleteObjects: true,
 });

packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/integ.task-definition-container-credentialspecs.ts

@@ -10,7 +10,7 @@ const stack = new cdk.Stack(app, 'aws-ecs-task-definition-container-credentialsp
 
 const bucket = new s3.Bucket(stack, 'bucket', {
   encryption: s3.BucketEncryption.S3_MANAGED,
-  blockPublicAccess: s3.BlockPublicAccess.BLOCK_ALL,
+  blockPublicAccessV2: s3.BlockPublicAccessV2.BLOCK_ALL,
   removalPolicy: cdk.RemovalPolicy.DESTROY,
   enforceSSL: true,
 });

packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.alb.extended.log.ts

@@ -12,7 +12,7 @@ class ExtendedLB extends elbv2.ApplicationLoadBalancer {
     super(scope, id, props);
 
     const accessLogsBucket = new s3.Bucket(this, 'ALBAccessLogsBucket', {
-      blockPublicAccess: s3.BlockPublicAccess.BLOCK_ALL,
+      blockPublicAccessV2: s3.BlockPublicAccessV2.BLOCK_ALL,
       encryption: s3.BucketEncryption.S3_MANAGED,
       versioned: true,
       serverAccessLogsPrefix: 'selflog/',
@@ -21,7 +21,7 @@ class ExtendedLB extends elbv2.ApplicationLoadBalancer {
     this.logAccessLogs(accessLogsBucket);
 
     const connectionLogsBucket = new s3.Bucket(this, 'ALBConnectionLogsBucket', {
-      blockPublicAccess: s3.BlockPublicAccess.BLOCK_ALL,
+      blockPublicAccessV2: s3.BlockPublicAccessV2.BLOCK_ALL,
       encryption: s3.BucketEncryption.S3_MANAGED,
       versioned: true,
       serverAccessLogsPrefix: 'selflog/',

packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-block-access.js.snapshot/aws-s3-block-access.template.json

@@ -0,0 +1,85 @@
+{
+ "Resources": {
+  "deprecatedBlockAcl87AAB8DE": {
+   "Type": "AWS::S3::Bucket",
+   "Properties": {
+    "PublicAccessBlockConfiguration": {
+     "BlockPublicAcls": true,
+     "IgnorePublicAcls": true
+    }
+   },
+   "UpdateReplacePolicy": "Retain",
+   "DeletionPolicy": "Retain"
+  },
+  "deprecatedBlock27E0F9B2": {
+   "Type": "AWS::S3::Bucket",
+   "Properties": {
+    "PublicAccessBlockConfiguration": {
+     "BlockPublicAcls": false
+    }
+   },
+   "UpdateReplacePolicy": "Retain",
+   "DeletionPolicy": "Retain"
+  },
+  "newBlockAclA8214FCC": {
+   "Type": "AWS::S3::Bucket",
+   "Properties": {
+    "PublicAccessBlockConfiguration": {
+     "BlockPublicAcls": true,
+     "BlockPublicPolicy": false,
+     "IgnorePublicAcls": true,
+     "RestrictPublicBuckets": false
+    }
+   },
+   "UpdateReplacePolicy": "Retain",
+   "DeletionPolicy": "Retain"
+  },
+  "newBlockEE5E5E1C": {
+   "Type": "AWS::S3::Bucket",
+   "Properties": {
+    "PublicAccessBlockConfiguration": {
+     "BlockPublicAcls": false,
+     "BlockPublicPolicy": true,
+     "IgnorePublicAcls": true,
+     "RestrictPublicBuckets": true
+    }
+   },
+   "UpdateReplacePolicy": "Retain",
+   "DeletionPolicy": "Retain"
+  }
+ },
+ "Parameters": {
+  "BootstrapVersion": {
+   "Type": "AWS::SSM::Parameter::Value<String>",
+   "Default": "/cdk-bootstrap/hnb659fds/version",
+   "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+  }
+ },
+ "Rules": {
+  "CheckBootstrapVersion": {
+   "Assertions": [
+    {
+     "Assert": {
+      "Fn::Not": [
+       {
+        "Fn::Contains": [
+         [
+          "1",
+          "2",
+          "3",
+          "4",
+          "5"
+         ],
+         {
+          "Ref": "BootstrapVersion"
+         }
+        ]
+       }
+      ]
+     },
+     "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+    }
+   ]
+  }
+ }
+}