feat(s3): make enableAutoDeleteObjects method public

packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-auto-delete-objects.js.snapshot/cdk-s3-bucket-auto-delete-objects.template.json

@@ -1,4 +1,4 @@
 {
  "Resources": {
   "Bucket83908E77": {
    "Type": "AWS::S3::Bucket",
@@ -142,6 +142,90 @@
     "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
    ]
   },
+  "BucketViaMethodAF1D9165": {
+   "Type": "AWS::S3::Bucket",
+   "Properties": {
+    "Tags": [
+     {
+      "Key": "aws-cdk:auto-delete-objects",
+      "Value": "true"
+     }
+    ]
+   },
+   "UpdateReplacePolicy": "Delete",
+   "DeletionPolicy": "Delete"
+  },
+  "BucketViaMethodPolicyDC86AE49": {
+   "Type": "AWS::S3::BucketPolicy",
+   "Properties": {
+    "Bucket": {
+     "Ref": "BucketViaMethodAF1D9165"
+    },
+    "PolicyDocument": {
+     "Statement": [
+      {
+       "Action": [
+        "s3:DeleteObject*",
+        "s3:GetBucket*",
+        "s3:List*",
+        "s3:PutBucketPolicy"
+       ],
+       "Effect": "Allow",
+       "Principal": {
+        "AWS": {
+         "Fn::GetAtt": [
+          "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
+          "Arn"
+         ]
+        }
+       },
+       "Resource": [
+        {
+         "Fn::GetAtt": [
+          "BucketViaMethodAF1D9165",
+          "Arn"
+         ]
+        },
+        {
+         "Fn::Join": [
+          "",
+          [
+           {
+            "Fn::GetAtt": [
+             "BucketViaMethodAF1D9165",
+             "Arn"
+            ]
+           },
+           "/*"
+          ]
+         ]
+        }
+       ]
+      }
+     ],
+     "Version": "2012-10-17"
+    }
+   }
+  },
+  "BucketViaMethodAutoDeleteObjectsCustomResource9AB8AF36": {
+   "Type": "Custom::S3AutoDeleteObjects",
+   "Properties": {
+    "ServiceToken": {
+     "Fn::GetAtt": [
+      "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
+      "Arn"
+     ]
+    },
+    "BucketName": {
+     "Ref": "BucketViaMethodAF1D9165"
+    }
+   },
+   "DependsOn": [
+    "BucketViaMethodPolicyDC86AE49"
+   ],
+   "UpdateReplacePolicy": "Delete",
+   "DeletionPolicy": "Delete"
+  },
   "CustomS3PutObjectsCustomResourceProviderRole40D98C91": {
    "Type": "AWS::IAM::Role",
    "Properties": {
@@ -171,20 +255,36 @@
         {
          "Effect": "Allow",
          "Action": "s3:PutObject",
-         "Resource": {
-          "Fn::Join": [
-           "",
-           [
-            {
-             "Fn::GetAtt": [
-              "Bucket83908E77",
-              "Arn"
-             ]
-            },
-            "/*"
+         "Resource": [
+          {
+           "Fn::Join": [
+            "",
+            [
+             {
+              "Fn::GetAtt": [
+               "Bucket83908E77",
+               "Arn"
+              ]
+             },
+             "/*"
+            ]
            ]
-          ]
-         }
+          },
+          {
+           "Fn::Join": [
+            "",
+            [
+             {
+              "Fn::GetAtt": [
+               "BucketViaMethodAF1D9165",
+               "Arn"
+              ]
+             },
+             "/*"
+            ]
+           ]
+          }
+         ]
         }
        ]
       }
@@ -232,6 +332,22 @@
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"
   },
+  "PutObjectsMethodCustomResource": {
+   "Type": "Custom::S3PutObjects",
+   "Properties": {
+    "ServiceToken": {
+     "Fn::GetAtt": [
+      "CustomS3PutObjectsCustomResourceProviderHandler1D33F0A9",
+      "Arn"
+     ]
+    },
+    "BucketName": {
+     "Ref": "BucketViaMethodAF1D9165"
+    }
+   },
+   "UpdateReplacePolicy": "Delete",
+   "DeletionPolicy": "Delete"
+  },
   "RemovedBucket4FCCEBAD": {
    "Type": "AWS::S3::Bucket",
    "Properties": {

packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-auto-delete-objects.ts

@@ -17,16 +17,27 @@ class TestStack extends Stack {
       autoDeleteObjects: true,
     });
 
+    const bucketViaMethod = new s3.Bucket(this, 'BucketViaMethod', {
+      removalPolicy: RemovalPolicy.DESTROY,
+    });
+
+    // Call the public method
+    bucketViaMethod.enableAutoDeleteObjects();
+
     // Put objects in the bucket to ensure auto delete works as expected
     const serviceToken = CustomResourceProvider.getOrCreate(this, PUT_OBJECTS_RESOURCE_TYPE, {
       codeDirectory: path.join(__dirname, 'put-objects-handler'),
       runtime: STANDARD_CUSTOM_RESOURCE_PROVIDER_RUNTIME,
       policyStatements: [{
         Effect: 'Allow',
         Action: 's3:PutObject',
-        Resource: bucket.arnForObjects('*'),
+        Resource: [
+          bucket.arnForObjects('*'),
+          bucketViaMethod.arnForObjects('*'),
+        ],
       }],
     });
+
     new CustomResource(this, 'PutObjectsCustomResource', {
       resourceType: PUT_OBJECTS_RESOURCE_TYPE,
       serviceToken,
@@ -35,6 +46,14 @@ class TestStack extends Stack {
       },
     });
 
+    new CustomResource(this, 'PutObjectsMethodCustomResource', {
+      resourceType: PUT_OBJECTS_RESOURCE_TYPE,
+      serviceToken,
+      properties: {
+        BucketName: bucketViaMethod.bucketName,
+      },
+    });
+
     const bucketThatWillBeRemoved = new s3.Bucket(this, 'RemovedBucket', {
       removalPolicy: RemovalPolicy.DESTROY,
       autoDeleteObjects: true,

packages/aws-cdk-lib/aws-s3/README.md

@@ -792,6 +792,16 @@ const bucket = new s3.Bucket(this, 'MyTempFileBucket', {
 });
 ```
 
+Alternatively, you can enable object auto-deletion after the bucket has been created, allowing for conditional or dynamic configuration:
+
+```ts
+const bucket = new s3.Bucket(this, 'MyTempFileBucket', {
+  removalPolicy: cdk.RemovalPolicy.DESTROY,
+});
+
+bucket.enableAutoDeleteObjects();
+```
+
 **Warning** if you have deployed a bucket with `autoDeleteObjects: true`,
 switching this to `false` in a CDK version _before_ `1.126.0` will lead to
 all objects in the bucket being deleted. Be sure to update your bucket resources