Refactoring and fixed tests (#17)

dtymakhov · web-flow · commit cc8e9144f75e · 2022-03-23T00:10:18.000+02:00
* Fixed most of the warnings

* Clean up test project

* Fixed and refactored StorageBaseTests

* Upgraded package version
diff --git a/Directory.Build.props b/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>
diff --git a/ManagedCode.Storage.Azure/AzureStorage.cs b/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
 }
diff --git a/ManagedCode.Storage.Core/LocalFile.cs b/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)))
diff --git a/ManagedCode.Storage.FileSystem/FileSystemStorage.cs b/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))
         {
diff --git a/ManagedCode.Storage.FileSystem/Options/FileSystemStorageOptions.cs b/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!;
 }
diff --git a/ManagedCode.Storage.Gcp/Extensions/ServiceCollectionExtensions.cs b/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;
diff --git a/ManagedCode.Storage.Gcp/GCPStorage.cs b/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
         {
diff --git a/ManagedCode.Storage.Gcp/Options/GCPStorageOptions.cs b/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; }
 }
diff --git a/ManagedCode.Storage.Tests/AWS/AWSStorageTests.cs b/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);
     }
 }
diff --git a/ManagedCode.Storage.Tests/Azure/AzureStorageTests.cs b/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);
     }
     
 }
diff --git a/ManagedCode.Storage.Tests/FileSystem/FileSystemTests.cs b/ManagedCode.Storage.Tests/FileSystem/FileSystemTests.cs
@@ -35,6 +35,6 @@ public void StorageAsDefaultTest()
     {
         var storage = ServiceProvider.GetService<IFileSystemStorage>();
         var defaultStorage = ServiceProvider.GetService<IStorage>();
-        storage.GetType().FullName.Should().Be(defaultStorage.GetType().FullName);
+        storage?.GetType().FullName.Should().Be(defaultStorage?.GetType().FullName);
     }
 }
diff --git a/ManagedCode.Storage.Tests/GCP/GoogleStorageTests.cs b/ManagedCode.Storage.Tests/GCP/GoogleStorageTests.cs
@@ -1,10 +1,4 @@
-﻿using System;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-using Amazon.Runtime.Documents;
-using FluentAssertions;
-using Google.Apis.Auth.OAuth2;
+﻿using FluentAssertions;
 using Google.Cloud.Storage.V1;
 using ManagedCode.Storage.Core;
 using ManagedCode.Storage.Gcp;
@@ -23,7 +17,6 @@ protected override ServiceProvider ConfigureServices()
 
         services.AddGCPStorageAsDefault(opt =>
         {
-            //opt.GoogleCredential = GoogleCredential.FromFile("google_auth.json");
             opt.BucketOptions = new BucketOptions()
             {
                 ProjectId = "api-project-0000000000000",
@@ -35,7 +28,7 @@ protected override ServiceProvider ConfigureServices()
                 BaseUri = "http://localhost:4443/storage/v1/",
             };
         });
-        
+
         services.AddGCPStorage(new GCPStorageOptions
         {
             BucketOptions = new BucketOptions()
@@ -46,12 +39,12 @@ protected override ServiceProvider ConfigureServices()
         });
         return services.BuildServiceProvider();
     }
-    
+
     [Fact]
     public void StorageAsDefaultTest()
     {
         var storage = ServiceProvider.GetService<IGCPStorage>();
         var defaultStorage = ServiceProvider.GetService<IStorage>();
-        storage.GetType().FullName.Should().Be(defaultStorage.GetType().FullName);
+        storage?.GetType().FullName.Should().Be(defaultStorage?.GetType().FullName);
     }
-}
+}
diff --git a/ManagedCode.Storage.Tests/StorageBaseTests.cs b/ManagedCode.Storage.Tests/StorageBaseTests.cs
diff --git a/ManagedCode.Storage.Tests/xunit.runner.json b/ManagedCode.Storage.Tests/xunit.runner.json

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.IO;`
`4`	`4`	`using System.Runtime.CompilerServices;`
`5`		`-using System.Text;`
`6`	`5`	`using System.Threading;`
`7`	`6`	`using System.Threading.Tasks;`
`8`	`7`	`using Azure;`
`@@ -16,7 +15,7 @@ namespace ManagedCode.Storage.Azure;`
`16`	`15`
`17`	`16`	`public class AzureStorage : IAzureStorage`
`18`	`17`	`{`
`19`		`- private BlobContainerClient _blobContainerClient;`
	`18`	`+ private readonly BlobContainerClient _blobContainerClient;`
`20`	`19`	`private readonly AzureStorageOptions _options;`
`21`	`20`
`22`	`21`	`public AzureStorage(AzureStorageOptions options)`
`@@ -150,17 +149,18 @@ public async Task<BlobMetadata> GetBlobAsync(string blobName, CancellationToken`
`150`	`149`	`};`
`151`	`150`	`}`
`152`	`151`
`153`		`- public async IAsyncEnumerable<BlobMetadata> GetBlobsAsync(IEnumerable<string> blobNames, CancellationToken cancellationToken = default)`
	`152`	`+ public async IAsyncEnumerable<BlobMetadata> GetBlobsAsync(IEnumerable<string> blobNames,`
	`153`	`+ [EnumeratorCancellation] CancellationToken cancellationToken = default)`
`154`	`154`	`{`
`155`	`155`	`foreach (var blob in blobNames)`
`156`	`156`	`{`
`157`	`157`	`yield return await GetBlobAsync(blob, cancellationToken);`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`
`161`		`- public async IAsyncEnumerable<BlobMetadata> GetBlobListAsync(CancellationToken cancellationToken = default)`
	`161`	`+ public async IAsyncEnumerable<BlobMetadata> GetBlobListAsync([EnumeratorCancellation] CancellationToken cancellationToken = default)`
`162`	`162`	`{`
`163`		`- var blobs = _blobContainerClient.GetBlobsAsync();`
	`163`	`+ var blobs = _blobContainerClient.GetBlobsAsync(cancellationToken: cancellationToken);`
`164`	`164`
`165`	`165`	`await foreach (var item in blobs.AsPages())`
`166`	`166`	`{`
`@@ -181,14 +181,14 @@ public async IAsyncEnumerable<BlobMetadata> GetBlobListAsync(CancellationToken c`
`181`	`181`	`public async Task UploadStreamAsync(string blobName, Stream dataStream, CancellationToken cancellationToken = default)`
`182`	`182`	`{`
`183`	`183`	`var blobClient = _blobContainerClient.GetBlobClient(blobName);`
`184`		`-`
	`184`	`+`
`185`	`185`	`try`
`186`	`186`	`{`
`187`	`187`	`await blobClient.UploadAsync(dataStream, cancellationToken);`
`188`	`188`	`}`
`189`	`189`	`catch (RequestFailedException)`
`190`	`190`	`{`
`191`		`- await CreateContainerAsync();`
	`191`	`+ await CreateContainerAsync(cancellationToken);`
`192`	`192`	`await blobClient.UploadAsync(dataStream, cancellationToken);`
`193`	`193`	`}`
`194`	`194`	`}`
`@@ -203,7 +203,7 @@ public async Task UploadAsync(string blobName, string content, CancellationToken`
`203`	`203`	`}`
`204`	`204`	`catch (RequestFailedException)`
`205`	`205`	`{`
`206`		`- await CreateContainerAsync();`
	`206`	`+ await CreateContainerAsync(cancellationToken);`
`207`	`207`	`await blobClient.UploadAsync(BinaryData.FromString(content), cancellationToken);`
`208`	`208`	`}`
`209`	`209`	`}`
`@@ -220,7 +220,7 @@ public async Task UploadFileAsync(string blobName, string pathToFile, Cancellati`
`220`	`220`	`}`
`221`	`221`	`catch (RequestFailedException)`
`222`	`222`	`{`
`223`		`- await CreateContainerAsync();`
	`223`	`+ await CreateContainerAsync(cancellationToken);`
`224`	`224`	`await blobClient.UploadAsync(fs, cancellationToken);`
`225`	`225`	`}`
`226`	`226`	`}`
`@@ -251,7 +251,7 @@ public async Task UploadAsync(BlobMetadata blobMetadata, byte[] data, Cancellati`
`251`	`251`	`}`
`252`	`252`	`catch (RequestFailedException)`
`253`	`253`	`{`
`254`		`- await CreateContainerAsync();`
	`254`	`+ await CreateContainerAsync(cancellationToken);`
`255`	`255`	`await blobClient.UploadAsync(BinaryData.FromBytes(data), cancellationToken);`
`256`	`256`	`}`
`257`	`257`	`}`
`@@ -268,10 +268,10 @@ public async Task<string> UploadAsync(string content, CancellationToken cancella`
`268`	`268`	`}`
`269`	`269`	`catch (RequestFailedException)`
`270`	`270`	`{`
`271`		`- await CreateContainerAsync();`
	`271`	`+ await CreateContainerAsync(cancellationToken);`
`272`	`272`	`await blobClient.UploadAsync(BinaryData.FromString(content), cancellationToken);`
`273`	`273`	`}`
`274`		`-`
	`274`	`+`
`275`	`275`	`return fileName;`
`276`	`276`	`}`
`277`	`277`
`@@ -286,7 +286,7 @@ public async Task<string> UploadAsync(Stream dataStream, CancellationToken cance`
`286`	`286`	`}`
`287`	`287`	`catch (RequestFailedException)`
`288`	`288`	`{`
`289`		`- await CreateContainerAsync();`
	`289`	`+ await CreateContainerAsync(cancellationToken);`
`290`	`290`	`await blobClient.UploadAsync(dataStream, cancellationToken);`
`291`	`291`	`}`
`292`	`292`
`@@ -304,8 +304,8 @@ public async Task CreateContainerAsync(CancellationToken cancellationToken = def`
`304`	`304`	`await _blobContainerClient.CreateIfNotExistsAsync(PublicAccessType.BlobContainer, cancellationToken: cancellationToken);`
`305`	`305`	`}`
`306`	`306`
`307`		`- await _blobContainerClient.SetAccessPolicyAsync(_options.PublicAccessType);`
	`307`	`+ await _blobContainerClient.SetAccessPolicyAsync(_options.PublicAccessType, cancellationToken: cancellationToken);`
`308`	`308`	`}`
`309`		`-`
	`309`	`+`
`310`	`310`	`#endregion`
`311`	`311`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public LocalFile(bool keepAlive = false) : this(Path.GetTempFileName(), keepAliv`
`16`	`16`
`17`	`17`	`public LocalFile(string path, bool keepAlive = false)`
`18`	`18`	`{`
`19`		`- string directory;`
	`19`	`+ string? directory;`
`20`	`20`	`KeepAlive = keepAlive;`
`21`	`21`
`22`	`22`	`if (string.IsNullOrEmpty(Path.GetExtension(path)))`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ public async Task UploadStreamAsync(string blobName, Stream dataStream, Cancella`
`198`	`198`	`}`
`199`	`199`	`}`
`200`	`200`
`201`		`- public async Task UploadFileAsync(string blobName, string pathToFile = null, CancellationToken cancellationToken = default)`
	`201`	`+ public async Task UploadFileAsync(string blobName, string pathToFile, CancellationToken cancellationToken = default)`
`202`	`202`	`{`
`203`	`203`	`using (var fs = new FileStream(pathToFile, FileMode.Open, FileAccess.Read))`
`204`	`204`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`
`3`	`3`	`public class FileSystemStorageOptions`
`4`	`4`	`{`
`5`		`- public string CommonPath { get; set; }`
`6`		`- public string Path { get; set; }`
	`5`	`+ public string CommonPath { get; set; } = null!;`
	`6`	`+ public string Path { get; set; } = null!;`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ private async Task UploadStreamInternalAsync(string blobName, Stream dataStream,`
`254`	`254`	`}`
`255`	`255`	`catch`
`256`	`256`	`{`
`257`		`- await CreateContainerAsync();`
	`257`	`+ await CreateContainerAsync(cancellationToken);`
`258`	`258`	`await _storageClient.UploadObjectAsync(_bucket, blobName, contentType, dataStream, null, cancellationToken);`
`259`	`259`	`}`
`260`	`260`	`}`
`@@ -267,7 +267,8 @@ public async Task CreateContainerAsync(CancellationToken cancellationToken = def`
`267`	`267`	`{`
`268`	`268`	`if (_gcpStorageOptions.OriginalOptions != null)`
`269`	`269`	`{`
`270`		`- await _storageClient.CreateBucketAsync(_gcpStorageOptions.BucketOptions.ProjectId, _bucket, _gcpStorageOptions.OriginalOptions, cancellationToken);`
	`270`	`+ await _storageClient.CreateBucketAsync(_gcpStorageOptions.BucketOptions.ProjectId, _bucket, _gcpStorageOptions.OriginalOptions,`
	`271`	`+ cancellationToken);`
`271`	`272`	`}`
`272`	`273`	`else`
`273`	`274`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class GCPStorageOptions`
`7`	`7`	`{`
`8`	`8`	`public string AuthFileName { get; set; } = null!;`
`9`	`9`	`public BucketOptions BucketOptions { get; set; } = null!;`
`10`		`- public GoogleCredential? GoogleCredential { get; set; } = null!;`
	`10`	`+ public GoogleCredential? GoogleCredential { get; set; }`
`11`	`11`	`public CreateBucketOptions? OriginalOptions { get; set; }`
`12`	`12`	`public StorageClientBuilder? StorageClientBuilder { get; set; }`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,4 @@`
`1`		`-using System.IO;`
`2`		`-using System.Text;`
`3`		`-using System.Threading.Tasks;`
`4`		`-using Azure.Storage.Blobs;`
`5`		`-using Azure.Storage.Blobs.Models;`
`6`		`-using FluentAssertions;`
	`1`	`+using FluentAssertions;`
`7`	`2`	`using ManagedCode.Storage.Azure;`
`8`	`3`	`using ManagedCode.Storage.Azure.Extensions;`
`9`	`4`	`using ManagedCode.Storage.Azure.Options;`
`@@ -42,7 +37,7 @@ public void StorageAsDefaultTest()`
`42`	`37`	`{`
`43`	`38`	`var storage = ServiceProvider.GetService<IAzureStorage>();`
`44`	`39`	`var defaultStorage = ServiceProvider.GetService<IStorage>();`
`45`		`- storage.GetType().FullName.Should().Be(defaultStorage.GetType().FullName);`
	`40`	`+ storage?.GetType().FullName.Should().Be(defaultStorage?.GetType().FullName);`
`46`	`41`	`}`
`47`	`42`
`48`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ public void StorageAsDefaultTest()`
`35`	`35`	`{`
`36`	`36`	`var storage = ServiceProvider.GetService<IFileSystemStorage>();`
`37`	`37`	`var defaultStorage = ServiceProvider.GetService<IStorage>();`
`38`		`- storage.GetType().FullName.Should().Be(defaultStorage.GetType().FullName);`
	`38`	`+ storage?.GetType().FullName.Should().Be(defaultStorage?.GetType().FullName);`
`39`	`39`	`}`
`40`	`40`	`}`