Skip to content

Fix AddMinio registration lifetime #1340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix AddMinio registration lifetime #1340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Minio/MinioConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
using System.Net;
using Microsoft.Extensions.DependencyInjection;
using Minio.Credentials;
using Minio.Handlers;

namespace Minio;

public class MinioConfig
{
internal ServiceProvider ServiceProvider { get; set; }
internal IServiceProvider ServiceProvider { get; set; }

// Cache holding bucket to region mapping for buckets seen so far.
public BucketRegionCache RegionCache { get; internal set; }
Expand Down
19 changes: 12 additions & 7 deletions Minio/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,29 @@ public static IServiceCollection AddMinio(
if (services is null) throw new ArgumentNullException(nameof(services));
if (configureClient == null) throw new ArgumentNullException(nameof(configureClient));

var minioClientFactory = new MinioClientFactory(configureClient);
services.TryAddSingleton<IMinioClientFactory>(minioClientFactory);
services.TryAddSingleton<IMinioClientFactory>(_ => new MinioClientFactory(configureClient));

var client = minioClientFactory.CreateClient();
client.Config.ServiceProvider = services.BuildServiceProvider();
switch (lifetime)
{
case ServiceLifetime.Singleton:
services.TryAddSingleton(_ => client);
services.TryAddSingleton(CreateClient);
break;
case ServiceLifetime.Scoped:
services.TryAddScoped(_ => client);
services.TryAddScoped(CreateClient);
break;
case ServiceLifetime.Transient:
services.TryAddTransient(_ => client);
services.TryAddTransient(CreateClient);
break;
}

return services;

static IMinioClient CreateClient(IServiceProvider serviceProvider)
{
var factory = serviceProvider.GetRequiredService<IMinioClientFactory>();
var client = factory.CreateClient();
client.Config.ServiceProvider = serviceProvider;
return client;
}
}
}