remove buckets

Author: kai-ion

tests/aws-cpp-sdk-s3-crt-integration-tests/BucketAndObjectOperationTest.cpp

@@ -50,6 +50,7 @@
 #include <aws/s3-crt/model/PutBucketVersioningRequest.h>
 #include <aws/s3-crt/model/VersioningConfiguration.h>
 #include <aws/s3-crt/model/BucketVersioningStatus.h>
+#include <aws/s3-crt/model/ListObjectVersionsRequest.h>
 #include <aws/s3-crt/ClientConfiguration.h>
 #include <aws/testing/ProxyConfig.h>
 #include <aws/testing/platform/PlatformTesting.h>
@@ -92,6 +93,7 @@ namespace
     static std::string BASE_EVENT_STREAM_ERRORS_IN_EVENT_TEST_BUCKET_NAME = "errorsinevent";
     static std::string BASE_CHECKSUMS_BUCKET_NAME = "checksums-crt";
     static std::string BASE_CRT_CREDENTIALS_TEST_BUCKET_NAME = "crt-credentials-test";
+    static std::string BASE_VERSIONED_COPY_BUCKET_NAME = "versionedcopytest";
     static const char* ALLOCATION_TAG = "BucketAndObjectOperationTest";
     static const char* TEST_OBJ_KEY = "TestObjectKey";
     static const char* TEST_NOT_MODIFIED_OBJ_KEY = "TestNotModifiedObjectKey";
@@ -132,7 +134,8 @@ namespace
               std::ref(BASE_EVENT_STREAM_LARGE_FILE_TEST_BUCKET_NAME),
               std::ref(BASE_EVENT_STREAM_ERRORS_IN_EVENT_TEST_BUCKET_NAME),
               std::ref(BASE_CHECKSUMS_BUCKET_NAME),
-              std::ref(BASE_CRT_CREDENTIALS_TEST_BUCKET_NAME)
+              std::ref(BASE_CRT_CREDENTIALS_TEST_BUCKET_NAME),
+              std::ref(BASE_VERSIONED_COPY_BUCKET_NAME)
             };
 
         for (auto& testBucketName : TEST_BUCKETS)
@@ -1082,7 +1085,7 @@ namespace
 
     TEST_F(BucketAndObjectOperationTest, TestMultipartCopyOnVersionedBucketDoesNotRequireGetObjectVersion)
     {
-        Aws::String fullBucketName = CalculateBucketName(BASE_PUT_MULTIPART_BUCKET_NAME.c_str());
+        Aws::String fullBucketName = CalculateBucketName(BASE_VERSIONED_COPY_BUCKET_NAME.c_str());
         SCOPED_TRACE(Aws::String("FullBucketName ") + fullBucketName);
         CreateBucketRequest createBucketRequest;
         createBucketRequest.SetBucket(fullBucketName);
@@ -1126,6 +1129,26 @@ namespace
             .WithCopySource(fullBucketName + "/" + sourceKey);
         auto copyOutcome = Client->CopyObject(copyRequest);
         AWS_ASSERT_SUCCESS(copyOutcome);
+
+        // Clean up: delete all object versions so the bucket can be deleted
+        ListObjectVersionsRequest listVersionsRequest;
+        listVersionsRequest.SetBucket(fullBucketName);
+        auto listVersionsOutcome = Client->ListObjectVersions(listVersionsRequest);
+        if (listVersionsOutcome.IsSuccess())
+        {
+            for (const auto& version : listVersionsOutcome.GetResult().GetVersions())
+            {
+                DeleteObjectRequest deleteRequest;
+                deleteRequest.SetBucket(fullBucketName);
+                deleteRequest.SetKey(version.GetKey());
+                deleteRequest.SetVersionId(version.GetVersionId());
+                Client->DeleteObject(deleteRequest);
+            }
+        }
+
+        DeleteBucketRequest deleteBucketRequest;
+        deleteBucketRequest.SetBucket(fullBucketName);
+        Client->DeleteBucket(deleteBucketRequest);
     }
 
     TEST_F(BucketAndObjectOperationTest, TestObjectOperationWithEventStream)