Also delete delete markers when deleting buckets

Author: reweeden

destroy-cumulus/destroy_cumulus.py

@@ -549,21 +549,33 @@ def delete(self, get_client):
         version_paginator = client.get_paginator("list_object_versions")
 
         for response in version_paginator.paginate(Bucket=self.name):
-            if "Versions" not in response:
-                continue
+            if "Versions" in response:
+                client.delete_objects(
+                    Bucket=self.name,
+                    Delete=dict(
+                        Objects=[
+                            {
+                                "Key": entry["Key"],
+                                "VersionId": entry["VersionId"],
+                            }
+                            for entry in response["Versions"]
+                        ],
+                    ),
+                )
 
-            client.delete_objects(
-                Bucket=self.name,
-                Delete=dict(
-                    Objects=[
-                        {
-                            "Key": entry["Key"],
-                            "VersionId": entry["VersionId"],
-                        }
-                        for entry in response["Versions"]
-                    ],
-                ),
-            )
+            if "DeleteMarkers" in response:
+                client.delete_objects(
+                    Bucket=self.name,
+                    Delete=dict(
+                        Objects=[
+                            {
+                                "Key": entry["Key"],
+                                "VersionId": entry["VersionId"],
+                            }
+                            for entry in response["DeleteMarkers"]
+                        ],
+                    ),
+                )
 
         for response in object_paginator.paginate(Bucket=self.name):
             if "Contents" not in response:

destroy-cumulus/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "destroy-cumulus"
-version = "0.3.0"
+version = "0.3.1"
 description = ""
 authors = ["Rohan Weeden <reweeden@alaska.edu>"]
 readme = "README.md"

destroy-cumulus/tests/conftest.py

@@ -24,3 +24,9 @@ def aws_credentials():
 def get_client():
     with mock_aws():
         yield boto3.client
+
+
+@pytest.fixture
+def s3_resource():
+    with mock_aws():
+        yield boto3.resource("s3")

destroy-cumulus/tests/test_delete.py

@@ -1,12 +1,48 @@
+import contextlib
+
 import pytest
-from destroy_cumulus import Arn, CloudWatchEventRule
+from destroy_cumulus import Arn, Bucket, CloudWatchEventRule
 
 
 @pytest.fixture
 def client_events(get_client):
     yield get_client("events")
 
 
+@pytest.fixture
+def client_s3(get_client):
+    yield get_client("s3")
+
+
+@pytest.fixture
+def test_bucket(s3_resource):
+    bucket_name = "test-bucket"
+
+    bucket = s3_resource.Bucket(bucket_name)
+    bucket.create()
+    bucket.Versioning().enable()
+
+    foo = bucket.Object("foo.txt")
+    bar = bucket.Object("bar.txt")
+    foo.put(Body=b"foo")
+    bar.put(Body=b"bar")
+    # create a new version of foo.txt
+    foo.put(Body=b"foo 2")
+    # Create a delete marker for bar.txt
+    bar.delete()
+
+    yield bucket
+
+    with contextlib.suppress(s3_resource.meta.client.exceptions.NoSuchBucket):
+        bucket.object_versions.delete()
+        bucket.delete()
+
+
+def test_delete_bucket(get_client, test_bucket):
+    bucket = Bucket.from_arn(Arn(f"arn:aws:s3:::{test_bucket.name}"))
+    bucket.delete(get_client)
+
+
 def test_delete_rule_targets(get_client, client_events):
     rule_arn = client_events.put_rule(
         Name="test-rule",