Refactoring and fixed tests (#17)

* Fixed most of the warnings

* Clean up test project

* Fixed and refactored StorageBaseTests

* Upgraded package version

Author: dtymakhov

Directory.Build.props

@@ -13,8 +13,8 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <Product>Managed Code - Storage</Product>
-        <Version>0.0.1</Version>
-        <PackageVersion>0.0.1</PackageVersion>
+        <Version>0.1.0</Version>
+        <PackageVersion>0.1.0</PackageVersion>
     </PropertyGroup>
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
         <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>

ManagedCode.Storage.Azure/AzureStorage.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.CompilerServices;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure;
@@ -16,7 +15,7 @@ namespace ManagedCode.Storage.Azure;
 
 public class AzureStorage : IAzureStorage
 {
-    private BlobContainerClient _blobContainerClient;
+    private readonly BlobContainerClient _blobContainerClient;
     private readonly AzureStorageOptions _options;
 
     public AzureStorage(AzureStorageOptions options)
@@ -150,17 +149,18 @@ public async Task<BlobMetadata> GetBlobAsync(string blobName, CancellationToken
         };
     }
 
-    public async IAsyncEnumerable<BlobMetadata> GetBlobsAsync(IEnumerable<string> blobNames, CancellationToken cancellationToken = default)
+    public async IAsyncEnumerable<BlobMetadata> GetBlobsAsync(IEnumerable<string> blobNames,
+        [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
         foreach (var blob in blobNames)
         {
             yield return await GetBlobAsync(blob, cancellationToken);
         }
     }
 
-    public async IAsyncEnumerable<BlobMetadata> GetBlobListAsync(CancellationToken cancellationToken = default)
+    public async IAsyncEnumerable<BlobMetadata> GetBlobListAsync([EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
-        var blobs = _blobContainerClient.GetBlobsAsync();
+        var blobs = _blobContainerClient.GetBlobsAsync(cancellationToken: cancellationToken);
 
         await foreach (var item in blobs.AsPages())
         {
@@ -181,14 +181,14 @@ public async IAsyncEnumerable<BlobMetadata> GetBlobListAsync(CancellationToken c
     public async Task UploadStreamAsync(string blobName, Stream dataStream, CancellationToken cancellationToken = default)
     {
         var blobClient = _blobContainerClient.GetBlobClient(blobName);
-        
+
         try
         {
             await blobClient.UploadAsync(dataStream, cancellationToken);
         }
         catch (RequestFailedException)
         {
-            await CreateContainerAsync();
+            await CreateContainerAsync(cancellationToken);
             await blobClient.UploadAsync(dataStream, cancellationToken);
         }
     }
@@ -203,7 +203,7 @@ public async Task UploadAsync(string blobName, string content, CancellationToken
         }
         catch (RequestFailedException)
         {
-            await CreateContainerAsync();
+            await CreateContainerAsync(cancellationToken);
             await blobClient.UploadAsync(BinaryData.FromString(content), cancellationToken);
         }
     }
@@ -220,7 +220,7 @@ public async Task UploadFileAsync(string blobName, string pathToFile, Cancellati
             }
             catch (RequestFailedException)
             {
-                await CreateContainerAsync();
+                await CreateContainerAsync(cancellationToken);
                 await blobClient.UploadAsync(fs, cancellationToken);
             }
         }
@@ -251,7 +251,7 @@ public async Task UploadAsync(BlobMetadata blobMetadata, byte[] data, Cancellati
         }
         catch (RequestFailedException)
         {
-            await CreateContainerAsync();
+            await CreateContainerAsync(cancellationToken);
             await blobClient.UploadAsync(BinaryData.FromBytes(data), cancellationToken);
         }
     }
@@ -268,10 +268,10 @@ public async Task<string> UploadAsync(string content, CancellationToken cancella
         }
         catch (RequestFailedException)
         {
-            await CreateContainerAsync();
+            await CreateContainerAsync(cancellationToken);
             await blobClient.UploadAsync(BinaryData.FromString(content), cancellationToken);
         }
-        
+
         return fileName;
     }
 
@@ -286,7 +286,7 @@ public async Task<string> UploadAsync(Stream dataStream, CancellationToken cance
         }
         catch (RequestFailedException)
         {
-            await CreateContainerAsync();
+            await CreateContainerAsync(cancellationToken);
             await blobClient.UploadAsync(dataStream, cancellationToken);
         }
 
@@ -304,8 +304,8 @@ public async Task CreateContainerAsync(CancellationToken cancellationToken = def
             await _blobContainerClient.CreateIfNotExistsAsync(PublicAccessType.BlobContainer, cancellationToken: cancellationToken);
         }
 
-        await _blobContainerClient.SetAccessPolicyAsync(_options.PublicAccessType);
+        await _blobContainerClient.SetAccessPolicyAsync(_options.PublicAccessType, cancellationToken: cancellationToken);
     }
-    
+
     #endregion
 }

ManagedCode.Storage.Core/LocalFile.cs

@@ -16,7 +16,7 @@ public LocalFile(bool keepAlive = false) : this(Path.GetTempFileName(), keepAliv
 
     public LocalFile(string path, bool keepAlive = false)
     {
-        string directory;
+        string? directory;
         KeepAlive = keepAlive;
 
         if (string.IsNullOrEmpty(Path.GetExtension(path)))

ManagedCode.Storage.FileSystem/FileSystemStorage.cs

@@ -198,7 +198,7 @@ public async Task UploadStreamAsync(string blobName, Stream dataStream, Cancella
         }
     }
 
-    public async Task UploadFileAsync(string blobName, string pathToFile = null, CancellationToken cancellationToken = default)
+    public async Task UploadFileAsync(string blobName, string pathToFile, CancellationToken cancellationToken = default)
     {
         using (var fs = new FileStream(pathToFile, FileMode.Open, FileAccess.Read))
         {

ManagedCode.Storage.FileSystem/Options/FileSystemStorageOptions.cs

@@ -2,6 +2,6 @@
 
 public class FileSystemStorageOptions
 {
-    public string CommonPath { get; set; }
-    public string Path { get; set; }
+    public string CommonPath { get; set; } = null!;
+    public string Path { get; set; } = null!;
 }

ManagedCode.Storage.Gcp/Extensions/ServiceCollectionExtensions.cs

@@ -1,7 +1,4 @@
 using System;
-using System.IO;
-using System.Reflection;
-using Google.Apis.Auth.OAuth2;
 using ManagedCode.Storage.Core;
 using ManagedCode.Storage.Gcp.Options;
 using Microsoft.Extensions.DependencyInjection;

ManagedCode.Storage.Gcp/GCPStorage.cs

@@ -254,7 +254,7 @@ private async Task UploadStreamInternalAsync(string blobName, Stream dataStream,
         }
         catch
         {
-            await CreateContainerAsync();
+            await CreateContainerAsync(cancellationToken);
             await _storageClient.UploadObjectAsync(_bucket, blobName, contentType, dataStream, null, cancellationToken);
         }
     }
@@ -267,7 +267,8 @@ public async Task CreateContainerAsync(CancellationToken cancellationToken = def
     {
         if (_gcpStorageOptions.OriginalOptions != null)
         {
-            await _storageClient.CreateBucketAsync(_gcpStorageOptions.BucketOptions.ProjectId, _bucket, _gcpStorageOptions.OriginalOptions, cancellationToken);
+            await _storageClient.CreateBucketAsync(_gcpStorageOptions.BucketOptions.ProjectId, _bucket, _gcpStorageOptions.OriginalOptions,
+                cancellationToken);
         }
         else
         {

ManagedCode.Storage.Gcp/Options/GCPStorageOptions.cs

@@ -7,7 +7,7 @@ public class GCPStorageOptions
 {
     public string AuthFileName { get; set; } = null!;
     public BucketOptions BucketOptions { get; set; } = null!;
-    public GoogleCredential? GoogleCredential { get; set; } = null!;
+    public GoogleCredential? GoogleCredential { get; set; }
     public CreateBucketOptions? OriginalOptions { get; set; }
     public StorageClientBuilder? StorageClientBuilder { get; set; }
 }

ManagedCode.Storage.Tests/AWS/AWSStorageTests.cs

@@ -1,8 +1,4 @@
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-using Amazon;
-using Amazon.Runtime;
+using Amazon;
 using Amazon.S3;
 using FluentAssertions;
 using ManagedCode.Storage.Aws;
@@ -21,12 +17,14 @@ protected override ServiceProvider ConfigureServices()
         var services = new ServiceCollection();
 
         //aws libarary overwrites property values. you should only create configurations this way. 
-        var awsConfig = new AmazonS3Config();
-        awsConfig.RegionEndpoint = RegionEndpoint.EUWest1;
-        awsConfig.ForcePathStyle = true;
-        awsConfig.UseHttp = true;
-        awsConfig.ServiceURL = "http://localhost:4566"; //this is the default port for the aws s3 emulator, must be last in the list
-        
+        var awsConfig = new AmazonS3Config
+        {
+            RegionEndpoint = RegionEndpoint.EUWest1,
+            ForcePathStyle = true,
+            UseHttp = true,
+            ServiceURL = "http://localhost:4566" //this is the default port for the aws s3 emulator, must be last in the list
+        };
+
         services.AddAWSStorageAsDefault(opt =>
         {
             opt.PublicKey = "localkey";
@@ -44,12 +42,12 @@ protected override ServiceProvider ConfigureServices()
         });
         return services.BuildServiceProvider();
     }
-    
+
     [Fact]
     public void StorageAsDefaultTest()
     {
         var storage = ServiceProvider.GetService<IAWSStorage>();
         var defaultStorage = ServiceProvider.GetService<IStorage>();
-        storage.GetType().FullName.Should().Be(defaultStorage.GetType().FullName);
+        storage?.GetType().FullName.Should().Be(defaultStorage?.GetType().FullName);
     }
 }

ManagedCode.Storage.Tests/Azure/AzureStorageTests.cs

@@ -1,9 +1,4 @@
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-using Azure.Storage.Blobs;
-using Azure.Storage.Blobs.Models;
-using FluentAssertions;
+using FluentAssertions;
 using ManagedCode.Storage.Azure;
 using ManagedCode.Storage.Azure.Extensions;
 using ManagedCode.Storage.Azure.Options;
@@ -42,7 +37,7 @@ public void StorageAsDefaultTest()
     {
         var storage = ServiceProvider.GetService<IAzureStorage>();
         var defaultStorage = ServiceProvider.GetService<IStorage>();
-        storage.GetType().FullName.Should().Be(defaultStorage.GetType().FullName);
+        storage?.GetType().FullName.Should().Be(defaultStorage?.GetType().FullName);
     }
 
 }