Merge remote-tracking branch 'origin/main'

Author: KSemenenko

ManagedCode.Storage.Aws/AWSStorage.cs

@@ -316,4 +316,14 @@ private async Task UploadStreamInternalAsync(string blobName, Stream dataStream,
     }
 
     #endregion
+
+    #region CreateContainer
+
+    public async Task CreateContainerAsync()
+    {
+        await _s3Client.EnsureBucketExistsAsync(_bucket);
+    }
+    
+    #endregion
+
 }

ManagedCode.Storage.Azure/AzureStorage.cs

@@ -15,22 +15,25 @@ namespace ManagedCode.Storage.Azure;
 
 public class AzureStorage : IAzureStorage
 {
-    private readonly BlobContainerClient _blobContainerClient;
+    private BlobContainerClient _blobContainerClient;
+    private readonly AzureStorageOptions _options;
 
     public AzureStorage(AzureStorageOptions options)
     {
+        _options = options;
         _blobContainerClient = new BlobContainerClient(
             options.ConnectionString,
             options.Container,
             options.OriginalOptions
         );
 
-        if (options.ShouldCreateIfNotExists)
+
+        if (_options.ShouldCreateIfNotExists)
         {
             _blobContainerClient.CreateIfNotExists(PublicAccessType.BlobContainer);
         }
 
-        _blobContainerClient.SetAccessPolicy(options.PublicAccessType);
+        _blobContainerClient.SetAccessPolicy(_options.PublicAccessType);
     }
 
     public void Dispose()
@@ -246,4 +249,20 @@ public async Task<string> UploadAsync(Stream dataStream, CancellationToken cance
     }
 
     #endregion
+
+    #region CreateContainer
+
+    public async Task CreateContainerAsync()
+    {
+
+        if (_options.ShouldCreateIfNotExists)
+        {
+            await _blobContainerClient.CreateIfNotExistsAsync(PublicAccessType.BlobContainer);
+        }
+
+        await _blobContainerClient.SetAccessPolicyAsync(_options.PublicAccessType);
+    }
+    
+    #endregion
+
 }

ManagedCode.Storage.Core/IStorage.cs

@@ -37,4 +37,6 @@ public interface IStorage : IDisposable
     Task<bool> ExistsAsync(BlobMetadata blobMetadata, CancellationToken cancellationToken = default);
     IAsyncEnumerable<bool> ExistsAsync(IEnumerable<string> blobNames, CancellationToken cancellationToken = default);
     IAsyncEnumerable<bool> ExistsAsync(IEnumerable<BlobMetadata> blobs, CancellationToken cancellationToken = default);
+
+    Task CreateContainerAsync();
 }

ManagedCode.Storage.FileSystem/FileSystemStorage.cs

@@ -256,4 +256,19 @@ public async Task<string> UploadAsync(Stream dataStream, CancellationToken cance
     }
 
     #endregion
+
+    #region CreateContainer
+
+    public async Task CreateContainerAsync()
+    {
+        await Task.Yield();
+
+        if (!Directory.Exists(_path))
+        {
+            Directory.CreateDirectory(_path);
+        }
+    }
+
+    #endregion
+
 }

ManagedCode.Storage.Gcp/GCPStorage.cs

@@ -18,29 +18,32 @@ public class GCPStorage : IGCPStorage
 {
     private readonly string _bucket;
     private readonly StorageClient _storageClient;
+    private readonly GCPStorageOptions _gcpStorageOptions;
 
     public GCPStorage(GCPStorageOptions gcpStorageOptions)
     {
-        _bucket = gcpStorageOptions.BucketOptions.Bucket;
+        _gcpStorageOptions = gcpStorageOptions;
 
-        if (gcpStorageOptions.StorageClientBuilder != null)
+        _bucket = _gcpStorageOptions.BucketOptions.Bucket;
+
+        if (_gcpStorageOptions.StorageClientBuilder != null)
         {
-            _storageClient = gcpStorageOptions.StorageClientBuilder.Build();
+            _storageClient = _gcpStorageOptions.StorageClientBuilder.Build();
         }
-        else if (gcpStorageOptions.GoogleCredential != null)
+        else if (_gcpStorageOptions.GoogleCredential != null)
         {
             _storageClient = StorageClient.Create(gcpStorageOptions.GoogleCredential);
         }
 
         try
         {
-            if (gcpStorageOptions.OriginalOptions != null)
+            if (_gcpStorageOptions.OriginalOptions != null)
             {
-                _storageClient.CreateBucket(gcpStorageOptions.BucketOptions.ProjectId, _bucket, gcpStorageOptions.OriginalOptions);
+                _storageClient.CreateBucket(_gcpStorageOptions.BucketOptions.ProjectId, _bucket, _gcpStorageOptions.OriginalOptions);
             }
             else
             {
-                _storageClient.CreateBucket(gcpStorageOptions.BucketOptions.ProjectId, _bucket);
+                _storageClient.CreateBucket(_gcpStorageOptions.BucketOptions.ProjectId, _bucket);
             }
         }
         catch
@@ -263,4 +266,24 @@ private async Task UploadStreamInternalAsync(string blobName, Stream dataStream,
     }
 
     #endregion
+
+    #region CreateContainer
+        public async Task CreateContainerAsync()
+    {
+        try
+        {
+            if (_gcpStorageOptions.OriginalOptions != null)
+            {
+                await _storageClient.CreateBucketAsync(_gcpStorageOptions.BucketOptions.ProjectId, _bucket, _gcpStorageOptions.OriginalOptions);
+            }
+            else
+            {
+                await _storageClient.CreateBucketAsync(_gcpStorageOptions.BucketOptions.ProjectId, _bucket);
+            }
+        }
+        catch
+        {
+        }
+    }
+    #endregion
 }