tests + nuget

managedcode · Feb 17, 2025 · 4f6b156 · 4f6b156
1 parent c38c421
commit 4f6b156
Show file tree

Hide file tree

Showing 14 changed files with 302 additions and 106 deletions.
diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
@@ -17,16 +17,16 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '9.0.x'
 
       - name: Restore dependencies
         run: dotnet restore
 
       - name: Build
         run: dotnet build --configuration Release
 
-      - name: Test
-        run: dotnet test --configuration Release
+#      - name: Test
+#        run: dotnet test --configuration Release
 
       - name: NDepend
         uses: ndepend/ndepend-action@v1

diff --git a/ManagedCode.Storage.Core/Extensions/StorageOptionsExtensions.cs b/ManagedCode.Storage.Core/Extensions/StorageOptionsExtensions.cs
@@ -1,52 +1,23 @@
-
-
-using System;
-using System.Reflection;
-
-namespace ManagedCode.Storage.Core.Extensions;
-
-public static class StorageOptionsExtensions
-{
-    public static T DeepCopy<T>(this T? source) where T : class, IStorageOptions
-    {
-        if (source == null)
-            return default;
-
-        // Create new instance of the same type
-        var instance = Activator.CreateInstance<T>();
-
-        // Get all properties of the type
-        var properties = source.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
-
-        foreach (var property in properties)
-        {
-            if (property.CanWrite && property.CanRead)
-            {
-                var value = property.GetValue(source);
-                if (value != null)
-                {
-                    // Handle value types and strings
-                    if (property.PropertyType.IsValueType || property.PropertyType == typeof(string))
-                    {
-                        property.SetValue(instance, value);
-                    }
-                    // Handle reference types by recursive deep copy
-                    else
-                    {
-                        var deepCopyMethod = typeof(StorageOptionsExtensions)
-                            .GetMethod(nameof(DeepCopy))
-                            ?.MakeGenericMethod(property.PropertyType);
-
-                        if (deepCopyMethod != null)
-                        {
-                            var copiedValue = deepCopyMethod.Invoke(null, [value]);
-                            property.SetValue(instance, copiedValue);
-                        }
-                    }
-                }
-            }
-        }
-
-        return instance;
-    }
-}
+// using System;
+// using System.Reflection;
+// using System.Text.Json;
+//
+// namespace ManagedCode.Storage.Core.Extensions;
+//
+// public static class StorageOptionsExtensions
+// {
+//     public static T DeepCopy<T>(this T? source) where T : class, IStorageOptions
+//     {
+//         if (source == null)
+//             return default;
+//
+//         var options = new JsonSerializerOptions
+//         {
+//             WriteIndented = false,
+//             PropertyNameCaseInsensitive = true
+//         };
+//
+//         var json = JsonSerializer.Serialize(source, source.GetType(), options);
+//         return (T)JsonSerializer.Deserialize(json, source.GetType(), options)!;
+//     }
+// }
diff --git a/ManagedCode.Storage.Core/Providers/StorageFactory.cs b/ManagedCode.Storage.Core/Providers/StorageFactory.cs
@@ -8,58 +8,56 @@ public class StorageFactory : IStorageFactory
     {
         public StorageFactory(IEnumerable<IStorageProvider> providers)
         {
-            Providers = providers.ToDictionary(p => p.StorageOptionsType);
+            Providers = providers.ToDictionary(p => p.StorageOptionsType, p => p);
+        }
+
+        private IStorageProvider? GetProvider(Type optionsType)
+        {
+            return Providers
+                .FirstOrDefault(x => x.Key.IsAssignableFrom(optionsType))
+                .Value;
         }
 
         public Dictionary<Type, IStorageProvider> Providers { get; set; }
 
         public IStorage CreateStorage(IStorageOptions options)
         {
-            if (Providers.TryGetValue(options.GetType(), out var provider))
-            {
-                return provider.CreateStorage<IStorage, IStorageOptions>(options);
-            }
-
-            throw new NotSupportedException($"Provider for {options.GetType()} not found");
+            var provider = GetProvider(options.GetType()) 
+                           ?? throw new NotSupportedException($"Provider for {options.GetType()} not found");
+
+            return provider.CreateStorage<IStorage, IStorageOptions>(options);
         }
 
         public IStorage CreateStorage(Action<IStorageOptions> options)
         {
-            if (Providers.TryGetValue(options.GetType(), out var provider))
-            {
-                var storageOptions = provider.GetDefaultOptions();
-                options.Invoke(storageOptions);
-                return CreateStorage(storageOptions);
-            }
-
-            throw new NotSupportedException($"Provider for {options.GetType()} not found");
+            var provider = GetProvider(options.GetType())
+                           ?? throw new NotSupportedException($"Provider for {options.GetType()} not found");
+
+            var storageOptions = provider.GetDefaultOptions();
+            options.Invoke(storageOptions);
+            return CreateStorage(storageOptions);
         }
 
-        public TStorage CreateStorage<TStorage, TOptions>(TOptions options) 
-            where TStorage : class, IStorage 
+        public TStorage CreateStorage<TStorage, TOptions>(TOptions options)
+            where TStorage : class, IStorage
             where TOptions : class, IStorageOptions
         {
-            if (Providers.TryGetValue(typeof(TOptions), out var provider))
-            {
-                return provider.CreateStorage<TStorage, TOptions>(options);
-            }
-
-            throw new NotSupportedException($"Provider for {typeof(TOptions)} not found");
+            var provider = GetProvider(typeof(TOptions))
+                           ?? throw new NotSupportedException($"Provider for {typeof(TOptions)} not found");
+
+            return provider.CreateStorage<TStorage, TOptions>(options);
         }
 
-        public TStorage CreateStorage<TStorage, TOptions>(Action<TOptions> options) 
-            where TStorage : class, IStorage 
+        public TStorage CreateStorage<TStorage, TOptions>(Action<TOptions> options)
+            where TStorage : class, IStorage
             where TOptions : class, IStorageOptions
         {
-            if (Providers.TryGetValue(typeof(TOptions), out var provider))
-            {
-                TOptions storageOptions = (TOptions)provider.GetDefaultOptions();
-                options.Invoke(storageOptions);
-                return provider.CreateStorage<TStorage, TOptions>(storageOptions);
-            }
-
-            throw new NotSupportedException($"Provider for {typeof(TOptions)} not found");
-
+            var provider = GetProvider(typeof(TOptions))
+                           ?? throw new NotSupportedException($"Provider for {typeof(TOptions)} not found");
+
+            TOptions storageOptions = (TOptions)provider.GetDefaultOptions();
+            options.Invoke(storageOptions);
+            return provider.CreateStorage<TStorage, TOptions>(storageOptions);
         }
     }
 }
diff --git a/Storages/ManagedCode.Storage.Aws/AWSStorageProvider.cs b/Storages/ManagedCode.Storage.Aws/AWSStorageProvider.cs
@@ -30,7 +30,16 @@ public TStorage CreateStorage<TStorage, TOptions>(TOptions options)
 
         public IStorageOptions GetDefaultOptions()
         {
-            return defaultOptions.DeepCopy();
+            return new AWSStorageOptions()
+            {
+                PublicKey = defaultOptions.PublicKey,
+                SecretKey = defaultOptions.SecretKey,
+                RoleName = defaultOptions.RoleName,
+                Bucket = defaultOptions.Bucket,
+                OriginalOptions = defaultOptions.OriginalOptions,
+                CreateContainerIfNotExists = defaultOptions.CreateContainerIfNotExists,
+                UseInstanceProfileCredentials = defaultOptions.UseInstanceProfileCredentials
+            };
         }
     }
 }
diff --git a/Storages/ManagedCode.Storage.Aws/Extensions/ServiceCollectionExtensions.cs b/Storages/ManagedCode.Storage.Aws/Extensions/ServiceCollectionExtensions.cs
@@ -34,15 +34,15 @@ public static IServiceCollection AddAWSStorage(this IServiceCollection serviceCo
     {
         CheckConfiguration(options);
         serviceCollection.AddSingleton(options);
-        serviceCollection.TryAddSingleton<IStorageProvider, AWSStorageProvider>();
+        serviceCollection.AddSingleton<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.AddSingleton<IStorageProvider, AWSStorageProvider>();
         serviceCollection.AddScoped<IAWSStorage, AWSStorage>();
         return serviceCollection.AddScoped<IStorage, AWSStorage>();
     }

diff --git a/Storages/ManagedCode.Storage.Azure.DataLake/AzureDataLakeStorageProvider.cs b/Storages/ManagedCode.Storage.Azure.DataLake/AzureDataLakeStorageProvider.cs
@@ -30,7 +30,13 @@ public TStorage CreateStorage<TStorage, TOptions>(TOptions options)
 
         public IStorageOptions GetDefaultOptions()
         {
-            return defaultOptions.DeepCopy();
+            return new AzureDataLakeStorageOptions()
+            {
+                ConnectionString = defaultOptions.ConnectionString,
+                FileSystem = defaultOptions.FileSystem,
+                PublicAccessType = defaultOptions.PublicAccessType,
+                CreateContainerIfNotExists = defaultOptions.CreateContainerIfNotExists
+            };
         }
     }
-}
+}
diff --git a/Storages/ManagedCode.Storage.Azure.DataLake/Extensions/ServiceCollectionExtensions.cs b/Storages/ManagedCode.Storage.Azure.DataLake/Extensions/ServiceCollectionExtensions.cs
@@ -35,15 +35,15 @@ public static IServiceCollection AddAzureDataLakeStorage(this IServiceCollection
     {
         CheckConfiguration(options);
         serviceCollection.AddSingleton(options);
-        serviceCollection.TryAddSingleton<IStorageProvider, AzureDataLakeStorageProvider>();
+        serviceCollection.AddSingleton<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.AddSingleton<IStorageProvider, AzureDataLakeStorageProvider>();
         serviceCollection.AddScoped<IAzureDataLakeStorage, AzureDataLakeStorage>();
         return serviceCollection.AddScoped<IStorage, AzureDataLakeStorage>();
     }

diff --git a/Storages/ManagedCode.Storage.Azure/AzureStorageProvider.cs b/Storages/ManagedCode.Storage.Azure/AzureStorageProvider.cs
@@ -8,7 +8,7 @@
 
 namespace ManagedCode.Storage.Azure
 {
-    public class AzureStorageProvider(IServiceProvider serviceProvider, AzureStorageOptions defaultOptions) : IStorageProvider
+    public class AzureStorageProvider(IServiceProvider serviceProvider, IAzureStorageOptions defaultOptions) : IStorageProvider
     {
         public Type StorageOptionsType => typeof(IAzureStorageOptions);
 
@@ -30,7 +30,28 @@ public TStorage CreateStorage<TStorage, TOptions>(TOptions options)
 
         public IStorageOptions GetDefaultOptions()
         {
-            return defaultOptions.DeepCopy();
+            return defaultOptions switch
+            {
+                AzureStorageCredentialsOptions credentialsOptions => new AzureStorageCredentialsOptions
+                {
+                    AccountName = credentialsOptions.AccountName,
+                    ContainerName = credentialsOptions.ContainerName,
+                    Credentials = credentialsOptions.Credentials,
+                    Container = credentialsOptions.Container,
+                    PublicAccessType = credentialsOptions.PublicAccessType,
+                    OriginalOptions = credentialsOptions.OriginalOptions,
+                    CreateContainerIfNotExists = credentialsOptions.CreateContainerIfNotExists
+                },
+                AzureStorageOptions storageOptions => new AzureStorageOptions
+                {
+                    ConnectionString = storageOptions.ConnectionString,
+                    Container = storageOptions.Container,
+                    PublicAccessType = storageOptions.PublicAccessType,
+                    OriginalOptions = storageOptions.OriginalOptions,
+                    CreateContainerIfNotExists = storageOptions.CreateContainerIfNotExists
+                },
+                _ => throw new ArgumentException($"Unknown options type: {defaultOptions.GetType()}")
+            };
         }
     }
 }
diff --git a/Storages/ManagedCode.Storage.Azure/Extensions/ServiceCollectionExtensions.cs b/Storages/ManagedCode.Storage.Azure/Extensions/ServiceCollectionExtensions.cs
@@ -55,15 +55,15 @@ public static IServiceCollection AddAzureStorage(this IServiceCollection service
     {
         CheckConfiguration(options);
         serviceCollection.AddSingleton(options);
-        serviceCollection.TryAddSingleton<IStorageProvider, AzureStorageProvider>();
+        serviceCollection.AddSingleton<IStorageProvider, AzureStorageProvider>();
         return serviceCollection.AddScoped<IAzureStorage, AzureStorage>();
     }
 
     public static IServiceCollection AddAzureStorageAsDefault(this IServiceCollection serviceCollection, IAzureStorageOptions options)
     {
         CheckConfiguration(options);
         serviceCollection.AddSingleton(options);
-        serviceCollection.TryAddSingleton<IStorageProvider, AzureStorageProvider>();
+        serviceCollection.AddSingleton<IStorageProvider, AzureStorageProvider>();
         serviceCollection.AddScoped<IAzureStorage, AzureStorage>();
         return serviceCollection.AddScoped<IStorage, AzureStorage>();
     }

diff --git a/Storages/ManagedCode.Storage.FileSystem/Extensions/ServiceCollectionExtensions.cs b/Storages/ManagedCode.Storage.FileSystem/Extensions/ServiceCollectionExtensions.cs
@@ -27,14 +27,14 @@ public static IServiceCollection AddFileSystemStorageAsDefault(this IServiceColl
     public static IServiceCollection AddFileSystemStorage(this IServiceCollection serviceCollection, FileSystemStorageOptions options)
     {
         serviceCollection.AddSingleton(options);
-        serviceCollection.TryAddSingleton<IStorageProvider, FileSystemStorageProvider>();
+        serviceCollection.AddSingleton<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.AddSingleton<IStorageProvider, FileSystemStorageProvider>();
         serviceCollection.AddScoped<IFileSystemStorage>(sp => new FileSystemStorage(options));
         return serviceCollection.AddScoped<IStorage>(sp => new FileSystemStorage(options));
     }

diff --git a/Storages/ManagedCode.Storage.FileSystem/FileSystemStorageProvider.cs b/Storages/ManagedCode.Storage.FileSystem/FileSystemStorageProvider.cs
@@ -28,7 +28,11 @@ public TStorage CreateStorage<TStorage, TOptions>(TOptions options)
 
         public IStorageOptions GetDefaultOptions()
         {
-            return defaultOptions.DeepCopy();
+            return new FileSystemStorageOptions
+            {
+                BaseFolder = defaultOptions.BaseFolder,
+                CreateContainerIfNotExists = defaultOptions.CreateContainerIfNotExists
+            };
         }
     }
 }
diff --git a/Storages/ManagedCode.Storage.Google/Extensions/ServiceCollectionExtensions.cs b/Storages/ManagedCode.Storage.Google/Extensions/ServiceCollectionExtensions.cs
@@ -34,7 +34,7 @@ public static IServiceCollection AddGCPStorage(this IServiceCollection serviceCo
     {
         CheckConfiguration(options);
         serviceCollection.AddSingleton(options);
-        serviceCollection.TryAddSingleton<IStorageProvider, GCPStorageProvider>();
+        serviceCollection.AddSingleton<IStorageProvider, GCPStorageProvider>();
         return serviceCollection.AddScoped<IGCPStorage, GCPStorage>();
     }
 
@@ -43,7 +43,7 @@ public static IServiceCollection AddGCPStorageAsDefault(this IServiceCollection
         CheckConfiguration(options);
 
         serviceCollection.AddSingleton(options);
-        serviceCollection.TryAddSingleton<IStorageProvider, GCPStorageProvider>();
+        serviceCollection.AddSingleton<IStorageProvider, GCPStorageProvider>();
         serviceCollection.AddScoped<IGCPStorage, GCPStorage>();
         return serviceCollection.AddScoped<IStorage, GCPStorage>();
     }

diff --git a/Storages/ManagedCode.Storage.Google/GCPStorageProvider.cs b/Storages/ManagedCode.Storage.Google/GCPStorageProvider.cs
@@ -30,7 +30,19 @@ public TStorage CreateStorage<TStorage, TOptions>(TOptions options)
 
         public IStorageOptions GetDefaultOptions()
         {
-            return defaultOptions.DeepCopy();
+            return new GCPStorageOptions()
+            {
+                AuthFileName = defaultOptions.AuthFileName,
+                BucketOptions = new BucketOptions
+                {
+                    Bucket  = defaultOptions.BucketOptions.Bucket,
+                    ProjectId = defaultOptions.BucketOptions.ProjectId
+                },
+                GoogleCredential = defaultOptions.GoogleCredential,
+                OriginalOptions = defaultOptions.OriginalOptions,
+                StorageClientBuilder = defaultOptions.StorageClientBuilder,
+                CreateContainerIfNotExists = defaultOptions.CreateContainerIfNotExists
+            };
         }
     }
 }