Storage providers

KSemenenko · KSemenenko · commit e47dbe723a5c · 2025-02-16T13:09:27.000+01:00
diff --git a/Integraions/ManagedCode.Storage.Server/Extensions/Controller/ControllerDownloadExtensions.cs b/Integraions/ManagedCode.Storage.Server/Extensions/Controller/ControllerDownloadExtensions.cs
@@ -7,7 +7,7 @@
 using Microsoft.AspNetCore.Mvc;
 using IResult = Microsoft.AspNetCore.Http.IResult;
 
-namespace ManagedCode.Storage.Server.Extensions;
+namespace ManagedCode.Storage.Server.Extensions.Controller;
 
 public static class ControllerDownloadExtensions
 {
diff --git a/Integraions/ManagedCode.Storage.Server/Extensions/Controller/ControllerUploadExtensions.cs b/Integraions/ManagedCode.Storage.Server/Extensions/Controller/ControllerUploadExtensions.cs
@@ -1,19 +1,18 @@
 using System;
 using System.IO;
-using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using ManagedCode.Communication;
 using ManagedCode.Storage.Core;
 using ManagedCode.Storage.Core.Models;
+using ManagedCode.Storage.Server.Extensions.File;
 using ManagedCode.Storage.Server.Helpers;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Net.Http.Headers;
 
-namespace ManagedCode.Storage.Server.Extensions;
+namespace ManagedCode.Storage.Server.Extensions.Controller;
 
 public static class ControllerUploadExtensions
 {
diff --git a/Integraions/ManagedCode.Storage.Server/Extensions/DependencyInjection/StorageServiceCollectionExtensions.cs b/Integraions/ManagedCode.Storage.Server/Extensions/DependencyInjection/StorageServiceCollectionExtensions.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 
-namespace ManagedCode.Storage.Server;
+namespace ManagedCode.Storage.Server.Extensions.DependencyInjection;
 
 public static class StorageServiceCollectionExtensions
 {
diff --git a/Integraions/ManagedCode.Storage.Server/Extensions/File/BrowserFileExtensions.cs b/Integraions/ManagedCode.Storage.Server/Extensions/File/BrowserFileExtensions.cs
@@ -3,7 +3,7 @@
 using ManagedCode.Storage.Core.Models;
 using Microsoft.AspNetCore.Components.Forms;
 
-namespace ManagedCode.Storage.Server;
+namespace ManagedCode.Storage.Server.Extensions.File;
 
 public static class BrowserFileExtensions
 {
diff --git a/Integraions/ManagedCode.Storage.Server/Extensions/File/FormFileExtensions.cs b/Integraions/ManagedCode.Storage.Server/Extensions/File/FormFileExtensions.cs
@@ -5,7 +5,7 @@
 using ManagedCode.Storage.Core.Models;
 using Microsoft.AspNetCore.Http;
 
-namespace ManagedCode.Storage.Server;
+namespace ManagedCode.Storage.Server.Extensions.File;
 
 public static class FormFileExtensions
 {
diff --git a/Integraions/ManagedCode.Storage.Server/Extensions/Storage/StorageBrowserFileExtensions.cs b/Integraions/ManagedCode.Storage.Server/Extensions/Storage/StorageBrowserFileExtensions.cs
@@ -4,9 +4,10 @@
 using ManagedCode.Communication;
 using ManagedCode.Storage.Core;
 using ManagedCode.Storage.Core.Models;
+using ManagedCode.Storage.Server.Extensions.File;
 using Microsoft.AspNetCore.Components.Forms;
 
-namespace ManagedCode.Storage.Server;
+namespace ManagedCode.Storage.Server.Extensions.Storage;
 
 public static class StorageBrowserFileExtensions
 {
diff --git a/Integraions/ManagedCode.Storage.Server/Extensions/Storage/StorageExtensions.cs b/Integraions/ManagedCode.Storage.Server/Extensions/Storage/StorageExtensions.cs
@@ -6,7 +6,7 @@
 using ManagedCode.Storage.Core.Models;
 using Microsoft.AspNetCore.Mvc;
 
-namespace ManagedCode.Storage.Server;
+namespace ManagedCode.Storage.Server.Extensions.Storage;
 
 public static class StorageExtensions
 {
diff --git a/Integraions/ManagedCode.Storage.Server/Extensions/Storage/StorageFromFileExtensions.cs b/Integraions/ManagedCode.Storage.Server/Extensions/Storage/StorageFromFileExtensions.cs
@@ -6,9 +6,10 @@
 using ManagedCode.Communication;
 using ManagedCode.Storage.Core;
 using ManagedCode.Storage.Core.Models;
+using ManagedCode.Storage.Server.Extensions.File;
 using Microsoft.AspNetCore.Http;
 
-namespace ManagedCode.Storage.Server;
+namespace ManagedCode.Storage.Server.Extensions.Storage;
 
 public static class StorageFromFileExtensions
 {
diff --git a/Integraions/ManagedCode.Storage.Server/Models/FilePayload.cs b/Integraions/ManagedCode.Storage.Server/Models/FilePayload.cs
@@ -1,4 +1,4 @@
-namespace ManagedCode.Storage.Server;
+namespace ManagedCode.Storage.Server.Models;
 
 public class FilePayload
 {
diff --git a/Integraions/ManagedCode.Storage.Server/Models/FileUploadPayload.cs b/Integraions/ManagedCode.Storage.Server/Models/FileUploadPayload.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.AspNetCore.Http;
 
-namespace ManagedCode.Storage.Server;
+namespace ManagedCode.Storage.Server.Models;
 
 public class FileUploadPayload
 {
diff --git a/ManagedCode.Storage.Core/Extensions/ServiceCollectionExtensions.cs b/ManagedCode.Storage.Core/Extensions/ServiceCollectionExtensions.cs
@@ -1,6 +1,6 @@
-﻿using Microsoft.Extensions.DependencyInjection;
+﻿using ManagedCode.Storage.Core.Providers;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using Storage;
 
 namespace ManagedCode.Storage.Core.Extensions;
 
diff --git a/ManagedCode.Storage.Core/Providers/IStorageFactory.cs b/ManagedCode.Storage.Core/Providers/IStorageFactory.cs
@@ -1,7 +1,6 @@
 using System;
-using ManagedCode.Storage.Core;
 
-namespace Storage
+namespace ManagedCode.Storage.Core.Providers
 {
     public interface IStorageFactory
     {
diff --git a/ManagedCode.Storage.Core/Providers/IStorageProvider.cs b/ManagedCode.Storage.Core/Providers/IStorageProvider.cs
@@ -1,7 +1,6 @@
 using System;
-using ManagedCode.Storage.Core;
 
-namespace Storage
+namespace ManagedCode.Storage.Core.Providers
 {
     public interface IStorageProvider
     {
diff --git a/ManagedCode.Storage.Core/Providers/StorageFactory.cs b/ManagedCode.Storage.Core/Providers/StorageFactory.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using ManagedCode.Storage.Core;
 
-namespace Storage
+namespace ManagedCode.Storage.Core.Providers
 {
     public class StorageFactory : IStorageFactory
     {
diff --git a/Storages/ManagedCode.Storage.Aws/AWSStorageProvider.cs b/Storages/ManagedCode.Storage.Aws/AWSStorageProvider.cs
@@ -0,0 +1,36 @@
+using System;
+using ManagedCode.Storage.Aws.Options;
+using ManagedCode.Storage.Core;
+using ManagedCode.Storage.Core.Extensions;
+using ManagedCode.Storage.Core.Providers;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace ManagedCode.Storage.Aws
+{
+    public class AWSStorageProvider(IServiceProvider serviceProvider, AWSStorageOptions defaultOptions) : IStorageProvider
+    {
+        public Type StorageOptionsType => typeof(AWSStorageOptions);
+        
+        public TStorage CreateStorage<TStorage, TOptions>(TOptions options) 
+            where TStorage : class, IStorage 
+            where TOptions : class, IStorageOptions
+        {
+            if (options is not AWSStorageOptions azureOptions)
+            {
+                throw new ArgumentException($"Options must be of type {typeof(AWSStorageOptions)}", nameof(options));
+            }
+
+            var logger = serviceProvider.GetService<ILogger<AWSStorage>>();
+            var storage = new AWSStorage(azureOptions, logger);
+
+            return storage as TStorage 
+                   ?? throw new InvalidOperationException($"Cannot create storage of type {typeof(TStorage)}");
+        }
+
+        public IStorageOptions GetDefaultOptions()
+        {
+            return defaultOptions.DeepCopy();
+        }
+    }
+}
diff --git a/Storages/ManagedCode.Storage.Aws/Extensions/ServiceCollectionExtensions.cs b/Storages/ManagedCode.Storage.Aws/Extensions/ServiceCollectionExtensions.cs
@@ -2,7 +2,9 @@
 using ManagedCode.Storage.Aws.Options;
 using ManagedCode.Storage.Core;
 using ManagedCode.Storage.Core.Exceptions;
+using ManagedCode.Storage.Core.Providers;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace ManagedCode.Storage.Aws.Extensions;
 
@@ -32,13 +34,15 @@ public static IServiceCollection AddAWSStorage(this IServiceCollection serviceCo
     {
         CheckConfiguration(options);
         serviceCollection.AddSingleton(options);
+        serviceCollection.TryAddSingleton<IStorageProvider, AWSStorageProvider>();
         return serviceCollection.AddScoped<IAWSStorage, AWSStorage>();
     }
 
     public static IServiceCollection AddAWSStorageAsDefault(this IServiceCollection serviceCollection, AWSStorageOptions options)
     {
         CheckConfiguration(options);
         serviceCollection.AddSingleton(options);
+        serviceCollection.TryAddSingleton<IStorageProvider, AWSStorageProvider>();
         serviceCollection.AddScoped<IAWSStorage, AWSStorage>();
         return serviceCollection.AddScoped<IStorage, AWSStorage>();
     }
diff --git a/Storages/ManagedCode.Storage.Aws/Extensions/StorageFactoryExtensions.cs b/Storages/ManagedCode.Storage.Aws/Extensions/StorageFactoryExtensions.cs
@@ -0,0 +1,24 @@
+using System;
+using ManagedCode.Storage.Aws.Options;
+using ManagedCode.Storage.Core.Providers;
+
+namespace ManagedCode.Storage.Aws.Extensions;
+
+public static class StorageFactoryExtensions
+{
+    public static IAWSStorage CreateAWSStorage(this IStorageFactory factory, string bucketName)
+    {
+        return factory.CreateStorage<IAWSStorage,AWSStorageOptions>(options => options.Bucket = bucketName);
+    }
+    
+    public static IAWSStorage CreateAWSStorage(this IStorageFactory factory, AWSStorageOptions options)
+    {
+        return factory.CreateStorage<IAWSStorage,AWSStorageOptions>(options);
+    }
+    
+    
+    public static IAWSStorage CreateAWSStorage(this IStorageFactory factory, Action<AWSStorageOptions> options)
+    {
+        return factory.CreateStorage<IAWSStorage,AWSStorageOptions>(options);
+    }
+}
diff --git a/Storages/ManagedCode.Storage.Azure.DataLake/AzureDataLakeStorageProvider.cs b/Storages/ManagedCode.Storage.Azure.DataLake/AzureDataLakeStorageProvider.cs
@@ -0,0 +1,36 @@
+using System;
+using ManagedCode.Storage.Azure.DataLake.Options;
+using ManagedCode.Storage.Core;
+using ManagedCode.Storage.Core.Extensions;
+using ManagedCode.Storage.Core.Providers;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace ManagedCode.Storage.Azure.DataLake
+{
+    public class AzureDataLakeStorageProvider(IServiceProvider serviceProvider, AzureDataLakeStorageOptions defaultOptions) : IStorageProvider
+    {
+        public Type StorageOptionsType => typeof(AzureDataLakeStorageOptions);
+        
+        public TStorage CreateStorage<TStorage, TOptions>(TOptions options) 
+            where TStorage : class, IStorage 
+            where TOptions : class, IStorageOptions
+        {
+            if (options is not AzureDataLakeStorageOptions azureOptions)
+            {
+                throw new ArgumentException($"Options must be of type {typeof(AzureDataLakeStorageOptions)}", nameof(options));
+            }
+
+            var logger = serviceProvider.GetService<ILogger<AzureDataLakeStorage>>();
+            var storage = new AzureDataLakeStorage(azureOptions, logger);
+
+            return storage as TStorage 
+                   ?? throw new InvalidOperationException($"Cannot create storage of type {typeof(TStorage)}");
+        }
+
+        public IStorageOptions GetDefaultOptions()
+        {
+            return defaultOptions.DeepCopy();
+        }
+    }
+}
diff --git a/Storages/ManagedCode.Storage.Azure.DataLake/Extensions/ServiceCollectionExtensions.cs b/Storages/ManagedCode.Storage.Azure.DataLake/Extensions/ServiceCollectionExtensions.cs
@@ -2,7 +2,9 @@
 using ManagedCode.Storage.Azure.DataLake.Options;
 using ManagedCode.Storage.Core;
 using ManagedCode.Storage.Core.Exceptions;
+using ManagedCode.Storage.Core.Providers;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace ManagedCode.Storage.Azure.DataLake.Extensions;
 
@@ -33,13 +35,15 @@ public static IServiceCollection AddAzureDataLakeStorage(this IServiceCollection
     {
         CheckConfiguration(options);
         serviceCollection.AddSingleton(options);
+        serviceCollection.TryAddSingleton<IStorageProvider, AzureDataLakeStorageProvider>();
         return serviceCollection.AddScoped<IAzureDataLakeStorage, AzureDataLakeStorage>();
     }
 
     public static IServiceCollection AddAzureDataLakeStorageAsDefault(this IServiceCollection serviceCollection, AzureDataLakeStorageOptions options)
     {
         CheckConfiguration(options);
         serviceCollection.AddSingleton(options);
+        serviceCollection.TryAddSingleton<IStorageProvider, AzureDataLakeStorageProvider>();
         serviceCollection.AddScoped<IAzureDataLakeStorage, AzureDataLakeStorage>();
         return serviceCollection.AddScoped<IStorage, AzureDataLakeStorage>();
     }
diff --git a/Storages/ManagedCode.Storage.Azure.DataLake/Extensions/StorageFactoryExtensions.cs b/Storages/ManagedCode.Storage.Azure.DataLake/Extensions/StorageFactoryExtensions.cs
@@ -0,0 +1,24 @@
+using System;
+using ManagedCode.Storage.Azure.DataLake.Options;
+using ManagedCode.Storage.Core.Providers;
+
+namespace ManagedCode.Storage.Azure.DataLake.Extensions;
+
+public static class StorageFactoryExtensions
+{
+    public static IAzureDataLakeStorage CreateAzureDataLakeStorage(this IStorageFactory factory, string fileSystemName)
+    {
+        return factory.CreateStorage<IAzureDataLakeStorage,AzureDataLakeStorageOptions>(options => options.FileSystem = fileSystemName);
+    }
+    
+    public static IAzureDataLakeStorage CreateAzureDataLakeStorage(this IStorageFactory factory, AzureDataLakeStorageOptions options)
+    {
+        return factory.CreateStorage<IAzureDataLakeStorage,AzureDataLakeStorageOptions>(options);
+    }
+    
+    
+    public static IAzureDataLakeStorage CreateAzureDataLakeStorage(this IStorageFactory factory, Action<AzureDataLakeStorageOptions> options)
+    {
+        return factory.CreateStorage<IAzureDataLakeStorage,AzureDataLakeStorageOptions>(options);
+    }
+}
diff --git a/Storages/ManagedCode.Storage.Azure/AzureStorageProvider.cs b/Storages/ManagedCode.Storage.Azure/AzureStorageProvider.cs
@@ -1,13 +1,12 @@
 using System;
-using System.Collections.Generic;
-using ManagedCode.Storage.Azure;
 using ManagedCode.Storage.Azure.Options;
 using ManagedCode.Storage.Core;
 using ManagedCode.Storage.Core.Extensions;
+using ManagedCode.Storage.Core.Providers;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace Storage.Providers
+namespace ManagedCode.Storage.Azure
 {
     public class AzureStorageProvider(IServiceProvider serviceProvider, AzureStorageOptions defaultOptions) : IStorageProvider
     {
diff --git a/Storages/ManagedCode.Storage.Azure/Extensions/ServiceCollectionExtensions.cs b/Storages/ManagedCode.Storage.Azure/Extensions/ServiceCollectionExtensions.cs
@@ -2,10 +2,9 @@
 using ManagedCode.Storage.Azure.Options;
 using ManagedCode.Storage.Core;
 using ManagedCode.Storage.Core.Exceptions;
+using ManagedCode.Storage.Core.Providers;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using Storage;
-using Storage.Providers;
 
 namespace ManagedCode.Storage.Azure.Extensions;
 
diff --git a/Storages/ManagedCode.Storage.Azure/Extensions/StorageFactoryExtensions.cs b/Storages/ManagedCode.Storage.Azure/Extensions/StorageFactoryExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 using ManagedCode.Storage.Azure.Options;
-using Storage;
+using ManagedCode.Storage.Core.Providers;
 
 namespace ManagedCode.Storage.Azure.Extensions;
 
diff --git a/Storages/ManagedCode.Storage.FileSystem/Extensions/ServiceCollectionExtensions.cs b/Storages/ManagedCode.Storage.FileSystem/Extensions/ServiceCollectionExtensions.cs
@@ -1,7 +1,9 @@
 ﻿using System;
 using ManagedCode.Storage.Core;
+using ManagedCode.Storage.Core.Providers;
 using ManagedCode.Storage.FileSystem.Options;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace ManagedCode.Storage.FileSystem.Extensions;
 
@@ -25,12 +27,14 @@ public static IServiceCollection AddFileSystemStorageAsDefault(this IServiceColl
     public static IServiceCollection AddFileSystemStorage(this IServiceCollection serviceCollection, FileSystemStorageOptions options)
     {
         serviceCollection.AddSingleton(options);
+        serviceCollection.TryAddSingleton<IStorageProvider, FileSystemStorageProvider>();
         return serviceCollection.AddScoped<IFileSystemStorage>(sp => new FileSystemStorage(options));
     }
 
     public static IServiceCollection AddFileSystemStorageAsDefault(this IServiceCollection serviceCollection, FileSystemStorageOptions options)
     {
         serviceCollection.AddSingleton(options);
+        serviceCollection.TryAddSingleton<IStorageProvider, FileSystemStorageProvider>();
         serviceCollection.AddScoped<IFileSystemStorage>(sp => new FileSystemStorage(options));
         return serviceCollection.AddScoped<IStorage>(sp => new FileSystemStorage(options));
     }
diff --git a/Storages/ManagedCode.Storage.FileSystem/Extensions/StorageFactoryExtensions.cs b/Storages/ManagedCode.Storage.FileSystem/Extensions/StorageFactoryExtensions.cs
diff --git a/Storages/ManagedCode.Storage.FileSystem/FileSystemStorageProvider.cs b/Storages/ManagedCode.Storage.FileSystem/FileSystemStorageProvider.cs
diff --git a/Storages/ManagedCode.Storage.Google/Extensions/ServiceCollectionExtensions.cs b/Storages/ManagedCode.Storage.Google/Extensions/ServiceCollectionExtensions.cs
diff --git a/Storages/ManagedCode.Storage.Google/Extensions/StorageFactoryExtensions.cs b/Storages/ManagedCode.Storage.Google/Extensions/StorageFactoryExtensions.cs
diff --git a/Storages/ManagedCode.Storage.Google/GCPStorageProvider.cs b/Storages/ManagedCode.Storage.Google/GCPStorageProvider.cs
diff --git a/Tests/ManagedCode.Storage.Tests/Common/TestApp/Controllers/Base/BaseTestController.cs b/Tests/ManagedCode.Storage.Tests/Common/TestApp/Controllers/Base/BaseTestController.cs
diff --git a/Tests/ManagedCode.Storage.Tests/ExtensionsTests/FormFileExtensionsTests.cs b/Tests/ManagedCode.Storage.Tests/ExtensionsTests/FormFileExtensionsTests.cs
diff --git a/Tests/ManagedCode.Storage.Tests/ExtensionsTests/StorageExtensionsTests.cs b/Tests/ManagedCode.Storage.Tests/ExtensionsTests/StorageExtensionsTests.cs

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using Microsoft.AspNetCore.Mvc;`
`8`	`8`	`using IResult = Microsoft.AspNetCore.Http.IResult;`
`9`	`9`
`10`		`-namespace ManagedCode.Storage.Server.Extensions;`
	`10`	`+namespace ManagedCode.Storage.Server.Extensions.Controller;`
`11`	`11`
`12`	`12`	`public static class ControllerDownloadExtensions`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Microsoft.Extensions.DependencyInjection;`
`2`	`2`
`3`		`-namespace ManagedCode.Storage.Server;`
	`3`	`+namespace ManagedCode.Storage.Server.Extensions.DependencyInjection;`
`4`	`4`
`5`	`5`	`public static class StorageServiceCollectionExtensions`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using ManagedCode.Storage.Core.Models;`
`4`	`4`	`using Microsoft.AspNetCore.Components.Forms;`
`5`	`5`
`6`		`-namespace ManagedCode.Storage.Server;`
	`6`	`+namespace ManagedCode.Storage.Server.Extensions.File;`
`7`	`7`
`8`	`8`	`public static class BrowserFileExtensions`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using ManagedCode.Storage.Core.Models;`
`6`	`6`	`using Microsoft.AspNetCore.Http;`
`7`	`7`
`8`		`-namespace ManagedCode.Storage.Server;`
	`8`	`+namespace ManagedCode.Storage.Server.Extensions.File;`
`9`	`9`
`10`	`10`	`public static class FormFileExtensions`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using ManagedCode.Storage.Core.Models;`
`7`	`7`	`using Microsoft.AspNetCore.Mvc;`
`8`	`8`
`9`		`-namespace ManagedCode.Storage.Server;`
	`9`	`+namespace ManagedCode.Storage.Server.Extensions.Storage;`
`10`	`10`
`11`	`11`	`public static class StorageExtensions`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace ManagedCode.Storage.Server;`
	`1`	`+namespace ManagedCode.Storage.Server.Models;`
`2`	`2`
`3`	`3`	`public class FilePayload`
`4`	`4`	`{`