feat(s3storage): bucket deletion should be optional

sitkoru · Feb 9, 2024 · cba18f7 · cba18f7
1 parent 29909a9
commit cba18f7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/Sitko.Core.Storage.S3/S3Storage.cs b/src/Sitko.Core.Storage.S3/S3Storage.cs
@@ -160,16 +160,23 @@ protected override async Task DoDeleteAllAsync(CancellationToken cancellationTok
             if (string.IsNullOrEmpty(Options.Prefix))
             {
                 using var s3Client = s3ClientProvider.S3Client;
-                try
+                if (Options.DeleteBucketOnCleanup)
                 {
-                    await AmazonS3Util.DeleteS3BucketWithObjectsAsync(s3Client, Options.Bucket,
-                        cancellationToken);
+                    try
+                    {
+                        await AmazonS3Util.DeleteS3BucketWithObjectsAsync(s3Client, Options.Bucket,
+                            cancellationToken);
+                    }
+                    catch (AmazonS3Exception ex) when (ex.Message.Contains(
+                                                           "A header you provided implies functionality that is not implemented"))
+                    {
+                        await DeleteAllObjectsInBucket(cancellationToken);
+                        await s3Client.DeleteBucketAsync(Options.Bucket, cancellationToken);
+                    }
                 }
-                catch (AmazonS3Exception ex) when (ex.Message.Contains(
-                                                       "A header you provided implies functionality that is not implemented"))
+                else
                 {
                     await DeleteAllObjectsInBucket(cancellationToken);
-                    await s3Client.DeleteBucketAsync(Options.Bucket, cancellationToken);
                 }
             }
             else
@@ -273,4 +280,3 @@ protected override async Task<IEnumerable<StorageItemInfo>> GetAllItemsAsync(str
         return items;
     }
 }
-
diff --git a/src/Sitko.Core.Storage.S3/S3StorageModule.cs b/src/Sitko.Core.Storage.S3/S3StorageModule.cs
@@ -54,6 +54,7 @@ public class S3StorageOptions : StorageOptions, IModuleOptionsWithValidation
     public bool GeneratePreSignedUrls { get; set; }
     public int PreSignedUrlsExpirationInHours { get; set; } = 1;
     public Policy? BucketPolicy { get; set; }
+    public bool DeleteBucketOnCleanup { get; set; }
 
     public Policy AnonymousReadPolicy => new()
     {