feat: Aspire (#80)

alex289 · Nov 22, 2024 · 5e8d6ad · 5e8d6ad
2 parents a265ff7 + f909b61
commit 5e8d6ad
Show file tree

Hide file tree

Showing 24 changed files with 401 additions and 59 deletions.
diff --git a/CleanArchitecture.Api/CleanArchitecture.Api.csproj b/CleanArchitecture.Api/CleanArchitecture.Api.csproj
@@ -32,6 +32,7 @@
         <ProjectReference Include="..\CleanArchitecture.Domain\CleanArchitecture.Domain.csproj" />
         <ProjectReference Include="..\CleanArchitecture.gRPC\CleanArchitecture.gRPC.csproj" />
         <ProjectReference Include="..\CleanArchitecture.Infrastructure\CleanArchitecture.Infrastructure.csproj" />
+        <ProjectReference Include="..\CleanArchitecture.ServiceDefaults\CleanArchitecture.ServiceDefaults.csproj" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/CleanArchitecture.Api/Extensions/ConfigurationExtensions.cs b/CleanArchitecture.Api/Extensions/ConfigurationExtensions.cs
@@ -0,0 +1,41 @@
+using System;
+using CleanArchitecture.Domain.Rabbitmq;
+using Microsoft.Extensions.Configuration;
+
+namespace CleanArchitecture.Api.Extensions;
+
+public static class ConfigurationExtensions
+{
+    public static RabbitMqConfiguration GetRabbitMqConfiguration(
+        this IConfiguration configuration)
+    {
+        var isAspire = configuration["ASPIRE_ENABLED"] == "true";
+
+        var rabbitEnabled = configuration["RabbitMQ:Enabled"];
+        var rabbitHost = configuration["RabbitMQ:Host"];
+        var rabbitPort = configuration["RabbitMQ:Port"];
+        var rabbitUser = configuration["RabbitMQ:Username"];
+        var rabbitPass = configuration["RabbitMQ:Password"];
+
+        if (isAspire)
+        {
+            rabbitEnabled = "true";
+            var connectionString = configuration["ConnectionStrings:RabbitMq"];
+
+            var rabbitUri = new Uri(connectionString!);
+            rabbitHost = rabbitUri.Host;
+            rabbitPort = rabbitUri.Port.ToString();
+            rabbitUser = rabbitUri.UserInfo.Split(':')[0];
+            rabbitPass = rabbitUri.UserInfo.Split(':')[1];
+        }
+
+        return new RabbitMqConfiguration()
+        {
+            Host = rabbitHost ?? "",
+            Port = int.Parse(rabbitPort ?? "0"),
+            Enabled = bool.Parse(rabbitEnabled ?? "false"),
+            Username = rabbitUser ?? "",
+            Password = rabbitPass ?? ""
+        };
+    }
+}
diff --git a/CleanArchitecture.Api/Program.cs b/CleanArchitecture.Api/Program.cs
@@ -6,18 +6,20 @@
 using CleanArchitecture.Domain.Rabbitmq.Extensions;
 using CleanArchitecture.Infrastructure.Database;
 using CleanArchitecture.Infrastructure.Extensions;
+using CleanArchitecture.ServiceDefaults;
 using HealthChecks.ApplicationStatus.DependencyInjection;
 using HealthChecks.UI.Client;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 var builder = WebApplication.CreateBuilder(args);
 
+builder.AddServiceDefaults();
+
 builder.Services.AddControllers();
 builder.Services.AddGrpc();
 builder.Services.AddGrpcReflection();
@@ -28,40 +30,44 @@
     .AddDbContextCheck<ApplicationDbContext>()
     .AddApplicationStatus();
 
+var isAspire = builder.Configuration["ASPIRE_ENABLED"] == "true";
+
+var rabbitConfiguration = builder.Configuration.GetRabbitMqConfiguration();
+var redisConnectionString =
+    isAspire ? builder.Configuration["ConnectionStrings:Redis"] : builder.Configuration["RedisHostName"];
+var dbConnectionString = isAspire
+    ? builder.Configuration["ConnectionStrings:Database"]
+    : builder.Configuration["ConnectionStrings:DefaultConnection"];
+
 if (builder.Environment.IsProduction())
 {
-    var rabbitHost = builder.Configuration["RabbitMQ:Host"];
-    var rabbitPort = builder.Configuration["RabbitMQ:Port"];
-    var rabbitUser = builder.Configuration["RabbitMQ:Username"];
-    var rabbitPass = builder.Configuration["RabbitMQ:Password"];
-
     builder.Services
         .AddHealthChecks()
-        .AddSqlServer(builder.Configuration.GetConnectionString("DefaultConnection")!)
-        .AddRedis(builder.Configuration["RedisHostName"]!, "Redis")
+        .AddSqlServer(dbConnectionString!)
+        .AddRedis(redisConnectionString!, "Redis")
         .AddRabbitMQ(
-            $"amqp://{rabbitUser}:{rabbitPass}@{rabbitHost}:{rabbitPort}",
+            rabbitConfiguration.ConnectionString,
             name: "RabbitMQ");
 }
 
 builder.Services.AddDbContext<ApplicationDbContext>(options =>
 {
     options.UseLazyLoadingProxies();
-    options.UseSqlServer(builder.Configuration.GetConnectionString("DefaultConnection"),
+    options.UseSqlServer(dbConnectionString,
         b => b.MigrationsAssembly("CleanArchitecture.Infrastructure"));
 });
 
 builder.Services.AddSwagger();
 builder.Services.AddAuth(builder.Configuration);
-builder.Services.AddInfrastructure(builder.Configuration, "CleanArchitecture.Infrastructure");
+builder.Services.AddInfrastructure("CleanArchitecture.Infrastructure", dbConnectionString!);
 builder.Services.AddQueryHandlers();
 builder.Services.AddServices();
 builder.Services.AddSortProviders();
 builder.Services.AddCommandHandlers();
 builder.Services.AddNotificationHandlers();
 builder.Services.AddApiUser();
 
-builder.Services.AddRabbitMqHandler(builder.Configuration, "RabbitMQ");
+builder.Services.AddRabbitMqHandler(rabbitConfiguration);
 
 builder.Services.AddHostedService<SetInactiveUsersService>();
 
@@ -73,11 +79,11 @@
     console.IncludeScopes = true;
 }));
 
-if (builder.Environment.IsProduction() || !string.IsNullOrWhiteSpace(builder.Configuration["RedisHostName"]))
+if (builder.Environment.IsProduction() || !string.IsNullOrWhiteSpace(redisConnectionString))
 {
     builder.Services.AddStackExchangeRedisCache(options =>
     {
-        options.Configuration = builder.Configuration["RedisHostName"];
+        options.Configuration = redisConnectionString;
         options.InstanceName = "clean-architecture";
     });
 }
@@ -88,6 +94,8 @@
 
 var app = builder.Build();
 
+app.MapDefaultEndpoints();
+
 using (var scope = app.Services.CreateScope())
 {
     var services = scope.ServiceProvider;

diff --git a/CleanArchitecture.Api/Properties/launchSettings.json b/CleanArchitecture.Api/Properties/launchSettings.json
@@ -1,13 +1,5 @@
 {
   "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:38452",
-      "sslPort": 44309
-    }
-  },
   "profiles": {
     "CleanArchitecture.Api": {
       "commandName": "Project",
@@ -18,14 +10,6 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
     }
   }
 }
diff --git a/CleanArchitecture.AppHost/CleanArchitecture.AppHost.csproj b/CleanArchitecture.AppHost/CleanArchitecture.AppHost.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsAspireHost>true</IsAspireHost>
+    <UserSecretsId>e7ec3788-69e9-4631-b350-d59657ddd747</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.0.0" />
+    <PackageReference Include="Aspire.Hosting.RabbitMQ" Version="9.0.0" />
+    <PackageReference Include="Aspire.Hosting.Redis" Version="9.0.0" />
+    <PackageReference Include="Aspire.Hosting.SqlServer" Version="9.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\CleanArchitecture.Api\CleanArchitecture.Api.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/CleanArchitecture.AppHost/Program.cs b/CleanArchitecture.AppHost/Program.cs
@@ -0,0 +1,26 @@
+var builder = DistributedApplication.CreateBuilder(args);
+
+var redis = builder.AddRedis("Redis").WithRedisInsight();
+
+var rabbitPasswordRessource = new ParameterResource("password", _ => "guest");
+var rabbitPasswordParameter =
+    builder.AddParameter("username", rabbitPasswordRessource.Value);
+
+var rabbitMq = builder
+    .AddRabbitMQ("RabbitMq", null, rabbitPasswordParameter, 5672)
+    .WithManagementPlugin();
+
+var sqlServer = builder.AddSqlServer("SqlServer");
+var db = sqlServer.AddDatabase("Database", "clean-architecture");
+
+builder.AddProject<Projects.CleanArchitecture_Api>("CleanArchitecture-Api")
+    .WithOtlpExporter()
+    .WithHttpHealthCheck("/health")
+    .WithReference(redis)
+    .WaitFor(redis)
+    .WithReference(rabbitMq)
+    .WaitFor(rabbitMq)
+    .WithReference(db)
+    .WaitFor(sqlServer);
+
+builder.Build().Run();
diff --git a/CleanArchitecture.AppHost/Properties/launchSettings.json b/CleanArchitecture.AppHost/Properties/launchSettings.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "Aspire": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:17270;http://localhost:15188",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21200",
+        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22111",
+        "ASPIRE_ENABLED": "true"
+      }
+    }
+  }
+}
diff --git a/CleanArchitecture.AppHost/appsettings.Development.json b/CleanArchitecture.AppHost/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}
diff --git a/CleanArchitecture.AppHost/appsettings.json b/CleanArchitecture.AppHost/appsettings.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Aspire.Hosting.Dcp": "Warning"
+    }
+  }
+}
diff --git a/CleanArchitecture.Domain/Rabbitmq/Extensions/ServiceCollectionExtensions.cs b/CleanArchitecture.Domain/Rabbitmq/Extensions/ServiceCollectionExtensions.cs
@@ -1,4 +1,3 @@
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace CleanArchitecture.Domain.Rabbitmq.Extensions;
@@ -7,12 +6,9 @@ public static class ServiceCollectionExtensions
 {
     public static IServiceCollection AddRabbitMqHandler(
         this IServiceCollection services,
-        IConfiguration configuration,
-        string rabbitMqConfigSection)
+        RabbitMqConfiguration configuration)
     {
-        var rabbitMq = new RabbitMqConfiguration();
-        configuration.Bind(rabbitMqConfigSection, rabbitMq);
-        services.AddSingleton(rabbitMq);
+        services.AddSingleton(configuration);
 
         services.AddSingleton<RabbitMqHandler>();
         services.AddHostedService(serviceProvider => serviceProvider.GetService<RabbitMqHandler>()!);

diff --git a/CleanArchitecture.Domain/Rabbitmq/RabbitMqConfiguration.cs b/CleanArchitecture.Domain/Rabbitmq/RabbitMqConfiguration.cs
@@ -7,4 +7,6 @@ public sealed class RabbitMqConfiguration
     public bool Enabled { get; set; }
     public string Username { get; set; } = string.Empty;
     public string Password { get; set; } = string.Empty;
+
+    public string ConnectionString => $"amqp://{Username}:{Password}@{Host}:{Port}";
 }
diff --git a/CleanArchitecture.Domain/Rabbitmq/RabbitMqHandler.cs b/CleanArchitecture.Domain/Rabbitmq/RabbitMqHandler.cs
@@ -13,14 +13,14 @@ namespace CleanArchitecture.Domain.Rabbitmq;
 
 public sealed class RabbitMqHandler : BackgroundService
 {
-    private IChannel? _channel;
     private readonly RabbitMqConfiguration _configuration;
 
     private readonly ConcurrentDictionary<string, List<ConsumeEventHandler>> _consumers = new();
 
     private readonly ILogger<RabbitMqHandler> _logger;
 
     private readonly ConcurrentQueue<IRabbitMqAction> _pendingActions = new();
+    private IChannel? _channel;
 
     public RabbitMqHandler(
         RabbitMqConfiguration configuration,
@@ -38,17 +38,21 @@ public override async Task StartAsync(CancellationToken cancellationToken)
             return;
         }
 
+        _logger.LogInformation("Starting RabbitMQ connection");
+
         var factory = new ConnectionFactory
         {
             AutomaticRecoveryEnabled = true,
             HostName = _configuration.Host,
             Port = _configuration.Port,
             UserName = _configuration.Username,
-            Password = _configuration.Password,
+            Password = _configuration.Password
         };
 
         var connection = await factory.CreateConnectionAsync(cancellationToken);
         _channel = await connection.CreateChannelAsync(null, cancellationToken);
+
+        await base.StartAsync(cancellationToken);
     }
 
 
@@ -129,14 +133,15 @@ public void AddExchangeConsumer(string exchange, string queue, ConsumeEventHandl
         AddExchangeConsumer(exchange, string.Empty, queue, consumer);
     }
 
-    private async Task AddEventConsumer(string exchange, string queueName, string routingKey, ConsumeEventHandler consumer)
+    private async Task AddEventConsumer(string exchange, string queueName, string routingKey,
+        ConsumeEventHandler consumer)
     {
         if (!_configuration.Enabled)
         {
             _logger.LogInformation("RabbitMQ is disabled. Event consumer will not be added.");
             return;
         }
-        
+
         var key = $"{exchange}-{routingKey}";
 
         if (!_consumers.TryGetValue(key, out var consumers))

diff --git a/CleanArchitecture.Infrastructure/Extensions/ServiceCollectionExtensions.cs b/CleanArchitecture.Infrastructure/Extensions/ServiceCollectionExtensions.cs
@@ -7,7 +7,6 @@
 using CleanArchitecture.Infrastructure.Repositories;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace CleanArchitecture.Infrastructure.Extensions;
@@ -16,24 +15,23 @@ public static class ServiceCollectionExtensions
 {
     public static IServiceCollection AddInfrastructure(
         this IServiceCollection services,
-        IConfiguration configuration,
         string migrationsAssemblyName,
-        string connectionStringName = "DefaultConnection")
+        string connectionString)
     {
         // Add event store db context
         services.AddDbContext<EventStoreDbContext>(
             options =>
             {
                 options.UseSqlServer(
-                    configuration.GetConnectionString(connectionStringName),
+                    connectionString,
                     b => b.MigrationsAssembly(migrationsAssemblyName));
             });
 
         services.AddDbContext<DomainNotificationStoreDbContext>(
             options =>
             {
                 options.UseSqlServer(
-                    configuration.GetConnectionString(connectionStringName),
+                    connectionString,
                     b => b.MigrationsAssembly(migrationsAssemblyName));
             });