Merge pull request #3 from SergioMatias94/feature/adapt-to-connect-to-local-mongo

Adapt the RegisterBlueprint to connect with local mongodb
This commit is contained in:
OscarMmtz 2025-06-10 23:16:04 -06:00 committed by GitHub
commit 73f9d8550f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 49 additions and 27 deletions

View File

@ -4,6 +4,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using MongoDB.Driver; using MongoDB.Driver;
using static MongoDB.Driver.WriteConcern;
namespace Core.Blueprint.DAL.Mongo.Configuration namespace Core.Blueprint.DAL.Mongo.Configuration
{ {
@ -25,40 +26,48 @@ namespace Core.Blueprint.DAL.Mongo.Configuration
var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? string.Empty; var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? string.Empty;
services.AddSingleton<IMongoContext, MongoContext>(); services.AddSingleton<IMongoContext, MongoContext>();
string ConnectionString = configuration.GetSection("ConnectionStrings:MongoDB").Value ?? string.Empty;
string Databasename = configuration.GetSection("MongoDb:DatabaseName").Value ?? string.Empty;
string Audience = string.Empty;
var ConnectionString = configuration.GetSection("ConnectionStrings:MongoDB").Value ?? string.Empty; if (!environment.Equals("Local", StringComparison.OrdinalIgnoreCase))
var Databasename = configuration.GetSection("MongoDb:DatabaseName").Value ?? string.Empty; {
var Audience = (environment == "Local") Audience = configuration.GetSection("MongoDb:Audience").Value ?? string.Empty;
? configuration.GetSection("MongoDb:LocalAudience").Value }
: configuration.GetSection("MongoDb:Audience").Value;
if (string.IsNullOrEmpty(ConnectionString) || string.IsNullOrEmpty(Databasename) || string.IsNullOrEmpty(Audience)) if (string.IsNullOrEmpty(ConnectionString) || string.IsNullOrEmpty(Databasename))
{
throw new InvalidOperationException("Mongo connection is not configured correctly."); throw new InvalidOperationException("Mongo connection is not configured correctly.");
}
services.Configure<MongoDbSettings>(options => services.Configure(delegate (MongoDbSettings options)
{ {
options.ConnectionString = ConnectionString; options.ConnectionString = ConnectionString;
options.Databasename = Databasename; options.Databasename = Databasename;
options.Audience = Audience;
});
services.AddSingleton<IMongoClient>(serviceProvider => if (!environment.Equals("Local", StringComparison.OrdinalIgnoreCase))
{ {
var settings = serviceProvider.GetRequiredService<IOptions<MongoDbSettings>>().Value; options.Audience = Audience;
var mongoClientSettings = MongoClientSettings.FromConnectionString(settings.ConnectionString); }
mongoClientSettings.Credential = MongoCredential.CreateOidcCredential(new AzureIdentityProvider(settings.Audience)); });
services.AddSingleton((Func<IServiceProvider, IMongoClient>)delegate (IServiceProvider serviceProvider)
{
MongoDbSettings value2 = serviceProvider.GetRequiredService<IOptions<MongoDbSettings>>().Value;
MongoClientSettings mongoClientSettings = MongoClientSettings.FromConnectionString(value2.ConnectionString);
if (!environment.Equals("Local", StringComparison.OrdinalIgnoreCase))
{
mongoClientSettings.Credential = MongoCredential.CreateOidcCredential(new AzureIdentityProvider(value2.Audience));
}
return new MongoClient(mongoClientSettings); return new MongoClient(mongoClientSettings);
}); });
services.AddSingleton(delegate (IServiceProvider serviceProvider)
services.AddSingleton<IMongoDatabase>(serviceProvider =>
{ {
var settings = serviceProvider.GetRequiredService<IOptions<MongoDbSettings>>().Value; MongoDbSettings value = serviceProvider.GetRequiredService<IOptions<MongoDbSettings>>().Value;
var client = serviceProvider.GetRequiredService<IMongoClient>(); return serviceProvider.GetRequiredService<IMongoClient>().GetDatabase(value.Databasename);
return client.GetDatabase(settings.Databasename);
}); });
services.AddSingleton((Func<IServiceProvider, IMongoDbSettings>)((IServiceProvider serviceProvider) => serviceProvider.GetRequiredService<IOptions<MongoDbSettings>>().Value));
services.AddSingleton<IMongoDbSettings>(serviceProvider => serviceProvider.GetRequiredService<IOptions<MongoDbSettings>>().Value);
return services; return services;
} }
} }

View File

@ -21,8 +21,6 @@ namespace Core.Blueprint.Caching.Configuration
{ {
// TODO for the following variable we'll need to add in the appsettings.json the following config: "UseRedisCache": true, // TODO for the following variable we'll need to add in the appsettings.json the following config: "UseRedisCache": true,
bool useRedis = configuration.GetValue<bool>("UseRedisCache"); bool useRedis = configuration.GetValue<bool>("UseRedisCache");
//TODO decide wheter to use appsettings or the following ENV variable
useRedis = Environment.GetEnvironmentVariable("CORE_BLUEPRINT_PACKAGES_USE_REDIS")?.ToLower() == "true";
if (useRedis) if (useRedis)
{ {

View File

@ -35,14 +35,29 @@ namespace Core.Blueprint.Caching
/// <param name="connectionString">The Redis connection string.</param> /// <param name="connectionString">The Redis connection string.</param>
/// <returns>An <see cref="IDatabase"/> instance representing the Redis cache database.</returns> /// <returns>An <see cref="IDatabase"/> instance representing the Redis cache database.</returns>
/// <exception cref="Exception">Thrown when the connection to Redis fails.</exce /// <exception cref="Exception">Thrown when the connection to Redis fails.</exce
async Task<IDatabase> InitializeRedisAsync(string connectionString) public async Task<IDatabase> InitializeRedisAsync(string connectionString)
{ {
try try
{ {
var configurationOptions = await ConfigurationOptions.Parse($"{connectionString}") var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? string.Empty;
ConfigurationOptions configurationOptions;
if (environment.Equals("Local", StringComparison.OrdinalIgnoreCase))
{
// Use simple local Redis config
configurationOptions = ConfigurationOptions.Parse(connectionString);
}
else
{
// Use Azure Redis config
configurationOptions = await ConfigurationOptions
.Parse(connectionString)
.ConfigureForAzureWithTokenCredentialAsync(new DefaultAzureCredential()); .ConfigureForAzureWithTokenCredentialAsync(new DefaultAzureCredential());
}
configurationOptions.AbortOnConnectFail = false; configurationOptions.AbortOnConnectFail = false;
var connectionMultiplexer = await ConnectionMultiplexer.ConnectAsync(configurationOptions); var connectionMultiplexer = await ConnectionMultiplexer.ConnectAsync(configurationOptions);
_logger.LogInformation("Successfully connected to Redis."); _logger.LogInformation("Successfully connected to Redis.");