From b347753f1a7c81dc45656b5078a2064de7cabc2f Mon Sep 17 00:00:00 2001 From: THE_KONDRAT Date: Sun, 29 Dec 2024 20:16:52 +0300 Subject: [PATCH] minio config moved to secrets --- Modules.Library.WebApi/Program.cs | 2 +- .../ServiceCollectionExtensions.cs | 30 +++++++++++-------- .../ServiceCollectionExtensions.cs | 12 ++++---- .../ServiceCollectionExtensions.cs | 4 --- Modules.User.WebApi/Program.cs | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Modules.Library.WebApi/Program.cs b/Modules.Library.WebApi/Program.cs index 0481d93..be79e66 100644 --- a/Modules.Library.WebApi/Program.cs +++ b/Modules.Library.WebApi/Program.cs @@ -23,7 +23,7 @@ builder.Services.AddRates(builder.Configuration.GetConnectionString("PostgreSQL" builder.Services.AddApplicationServices(); builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); -builder.Services.AddAccount(builder.Configuration, "JwtSettings", builder.Configuration.GetConnectionString("PostgreSQL")); +builder.Services.AddAccount(builder.Configuration, "JwtSettings", builder.Configuration.GetConnectionString("PostgreSQL"), "MinIO"); builder.Services.AddControllers(); // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle diff --git a/Modules.Media.Api/ServiceCollectionExtensions.cs b/Modules.Media.Api/ServiceCollectionExtensions.cs index f6aafe4..f780a61 100644 --- a/Modules.Media.Api/ServiceCollectionExtensions.cs +++ b/Modules.Media.Api/ServiceCollectionExtensions.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; //using Minio; using Minio.AspNetCore; @@ -6,20 +7,25 @@ namespace Modules.Media.Api; public static class ServiceCollectionExtensions { - //public static IServiceCollection AddMediaStorage(this IServiceCollection services, IConfigurationManager configuration, string jwtSettingsSection) - public static IServiceCollection AddMediaStorage(this IServiceCollection services) + public static IServiceCollection AddMediaStorage(this IServiceCollection services, IConfigurationManager configuration, string fileStorageSettingsSection) { - //Configuration - //services.AddOptions().Bind(configuration.GetSection(jwtSettingsSection)); + var endpoint = configuration.GetValue(string.Concat(fileStorageSettingsSection, ":Endpoint")); + if (string.IsNullOrWhiteSpace(endpoint)) + { + throw new Exception("Data store [Endpoint] is not specified"); + } - //var endpoint = "play.min.io"; - //var endpoint = "quay.io"; - var endpoint = "192.168.0.3:9000"; - //var accessKey = "ROOTUSER"; - //var secretKey = "CHANGEME123"; - var accessKey = "4aA6tfkVpJIZtmzvtf5r"; - var secretKey = "ZoJanpZZLcgl9CPKF0Hum3pWYNjZ1nTxjCO3GzIf"; + var accessKey = configuration.GetValue(string.Concat(fileStorageSettingsSection, ":AccessKey")); + if (string.IsNullOrWhiteSpace(accessKey)) + { + throw new Exception("Data store [AccessKey] is not specified"); + } + var secretKey = configuration.GetValue(string.Concat(fileStorageSettingsSection, ":SecretKey")); + if (string.IsNullOrWhiteSpace(secretKey)) + { + throw new Exception("Data store [SecretKey] is not specified"); + } services.AddMinio(options => { diff --git a/Modules.User.Api/ServiceCollectionExtensions.cs b/Modules.User.Api/ServiceCollectionExtensions.cs index cacde9c..acf8753 100644 --- a/Modules.User.Api/ServiceCollectionExtensions.cs +++ b/Modules.User.Api/ServiceCollectionExtensions.cs @@ -1,22 +1,20 @@ -using Microsoft.AspNetCore.Authentication.JwtBearer; -using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.IdentityModel.Tokens; using Modules.User.Application; -using Modules.User.Application.Models; using Modules.User.Database; -using Modules.User.Domain.Gateways; -using System.Text; +using Modules.Media.Api; namespace Modules.User.Api; public static class ServiceCollectionExtensions { - public static IServiceCollection AddAccount(this IServiceCollection services, IConfigurationManager configuration, string jwtSettingsSection, string? connectionString) + public static IServiceCollection AddAccount(this IServiceCollection services, IConfigurationManager configuration, + string jwtSettingsSection, string? connectionString, string fileStorageSettingsSection) { if (string.IsNullOrWhiteSpace(connectionString)) throw new ArgumentNullException(nameof(connectionString)); services.AddDatabase(connectionString); services.AddTokens(configuration, jwtSettingsSection); + services.AddMediaStorage(configuration, fileStorageSettingsSection); return services; } } \ No newline at end of file diff --git a/Modules.User.Application/ServiceCollectionExtensions.cs b/Modules.User.Application/ServiceCollectionExtensions.cs index b8689b6..a49ef5a 100644 --- a/Modules.User.Application/ServiceCollectionExtensions.cs +++ b/Modules.User.Application/ServiceCollectionExtensions.cs @@ -4,10 +4,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Tokens; using Modules.User.Application.Settings; using Modules.User.Domain.Gateways; -using Modules.Media.Api; using System.Text; -using MyCSharp.HttpUserAgentParser.AspNetCore.DependencyInjection; -using MyCSharp.HttpUserAgentParser.DependencyInjection; using MyCSharp.HttpUserAgentParser.MemoryCache.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; @@ -52,7 +49,6 @@ namespace Modules.User.Application }; }); services.AddAuthorization(); - services.AddMediaStorage(); return services; } diff --git a/Modules.User.WebApi/Program.cs b/Modules.User.WebApi/Program.cs index efaa364..c47bdd4 100644 --- a/Modules.User.WebApi/Program.cs +++ b/Modules.User.WebApi/Program.cs @@ -9,7 +9,7 @@ var builder = WebApplication.CreateBuilder(args); builder.AddServiceDefaults(); // Add services to the container. -builder.Services.AddAccount(builder.Configuration, "JwtSettings", builder.Configuration.GetConnectionString("PostgreSQL")); +builder.Services.AddAccount(builder.Configuration, "JwtSettings", builder.Configuration.GetConnectionString("PostgreSQL"), "MinIO"); builder.Services.AddMediatR(q => q.RegisterServicesFromAssemblies(AppDomain.CurrentDomain.GetAssemblies())); builder.Services.AddControllers();