Add EventStore Hosting and Client integrations

CommunityToolkit.Aspire.sln

@@ -161,6 +161,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hos
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.EventStore.Tests", "tests\CommunityToolkit.Aspire.EventStore.Tests\CommunityToolkit.Aspire.EventStore.Tests.csproj", "{C696480B-C2E0-4ACA-BD5E-A62BF8558024}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.ActiveMQ", "src\CommunityToolkit.Aspire.Hosting.ActiveMQ\CommunityToolkit.Aspire.Hosting.ActiveMQ.csproj", "{56C3C409-10FF-4CA5-99AD-0D35C5418B2A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "activemq", "activemq", "{BF4C4E57-DAAF-4EE5-B330-1923106BAE69}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.ActiveMQ.AppHost", "examples\activemq\CommunityToolkit.Aspire.Hosting.ActiveMQ.AppHost\CommunityToolkit.Aspire.Hosting.ActiveMQ.AppHost.csproj", "{CF6CF1C3-EBE1-41CE-9B34-0C2F931AEA12}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.ActiveMQ.ServiceDefaults", "examples\activemq\CommunityToolkit.Aspire.Hosting.ActiveMQ.ServiceDefaults\CommunityToolkit.Aspire.Hosting.ActiveMQ.ServiceDefaults.csproj", "{978EED2A-43BB-4DE6-8563-3A9972869661}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit", "examples\activemq\CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit\CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit.csproj", "{A87F7800-BD24-4577-8F15-50D33C8DACF1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests", "tests\CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests\CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests.csproj", "{1200FB2E-F476-4151-BDFD-1DAEE3E99FF5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -415,6 +427,26 @@ Global
 		{C696480B-C2E0-4ACA-BD5E-A62BF8558024}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C696480B-C2E0-4ACA-BD5E-A62BF8558024}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C696480B-C2E0-4ACA-BD5E-A62BF8558024}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56C3C409-10FF-4CA5-99AD-0D35C5418B2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56C3C409-10FF-4CA5-99AD-0D35C5418B2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56C3C409-10FF-4CA5-99AD-0D35C5418B2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56C3C409-10FF-4CA5-99AD-0D35C5418B2A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF6CF1C3-EBE1-41CE-9B34-0C2F931AEA12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF6CF1C3-EBE1-41CE-9B34-0C2F931AEA12}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF6CF1C3-EBE1-41CE-9B34-0C2F931AEA12}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF6CF1C3-EBE1-41CE-9B34-0C2F931AEA12}.Release|Any CPU.Build.0 = Release|Any CPU
+		{978EED2A-43BB-4DE6-8563-3A9972869661}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{978EED2A-43BB-4DE6-8563-3A9972869661}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{978EED2A-43BB-4DE6-8563-3A9972869661}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{978EED2A-43BB-4DE6-8563-3A9972869661}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A87F7800-BD24-4577-8F15-50D33C8DACF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A87F7800-BD24-4577-8F15-50D33C8DACF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A87F7800-BD24-4577-8F15-50D33C8DACF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A87F7800-BD24-4577-8F15-50D33C8DACF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1200FB2E-F476-4151-BDFD-1DAEE3E99FF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1200FB2E-F476-4151-BDFD-1DAEE3E99FF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1200FB2E-F476-4151-BDFD-1DAEE3E99FF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1200FB2E-F476-4151-BDFD-1DAEE3E99FF5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -496,6 +528,12 @@ Global
 		{0A4E5B43-155A-4FDA-A50F-0B86CF1705E7} = {114DDF07-489A-419B-BE76-E5A289F12791}
 		{019D6506-9D68-41AD-A7A1-A27B2FFE1253} = {114DDF07-489A-419B-BE76-E5A289F12791}
 		{C696480B-C2E0-4ACA-BD5E-A62BF8558024} = {899F0713-7FC6-4750-BAFC-AC650B35B453}
+		{56C3C409-10FF-4CA5-99AD-0D35C5418B2A} = {414151D4-7009-4E78-A5C6-D99EBD1E67D1}
+		{BF4C4E57-DAAF-4EE5-B330-1923106BAE69} = {8519CC01-1370-47C8-AD94-B0F326B1563F}
+		{CF6CF1C3-EBE1-41CE-9B34-0C2F931AEA12} = {BF4C4E57-DAAF-4EE5-B330-1923106BAE69}
+		{978EED2A-43BB-4DE6-8563-3A9972869661} = {BF4C4E57-DAAF-4EE5-B330-1923106BAE69}
+		{A87F7800-BD24-4577-8F15-50D33C8DACF1} = {BF4C4E57-DAAF-4EE5-B330-1923106BAE69}
+		{1200FB2E-F476-4151-BDFD-1DAEE3E99FF5} = {899F0713-7FC6-4750-BAFC-AC650B35B453}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {08B1D4B8-D2C5-4A64-BB8B-E1A2B29525F0}

src/CommunityToolkit.Aspire.Hosting.EventStore/EventStoreBuilderExtensions.cs

@@ -16,7 +16,6 @@ namespace Aspire.Hosting;
 public static class EventStoreBuilderExtensions
 {
     private const string DataTargetFolder = "/var/lib/eventstore";
-    private const string LogTargetFolder = "/var/log/eventstore";
 
     /// <summary>
     /// Adds an EventStore resource to the application model. A container is used for local development.

tests/CommunityToolkit.Aspire.Hosting.EventStore.Tests/EventStoreFunctionalTests.cs

@@ -1,7 +1,6 @@
 using Aspire.Components.Common.Tests;
 using Aspire.Hosting;
 using Aspire.Hosting.Utils;
-using CommunityToolkit.Aspire.Testing;
 using EventStore.Client;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Hosting;
@@ -20,17 +19,17 @@ public class EventStoreFunctionalTests(ITestOutputHelper testOutputHelper)
     [Fact]
     public async Task VerifyEventStoreResource()
     {
-        using var builder = TestDistributedApplicationBuilder.Create(testOutputHelper);
+        using var builder = TestDistributedApplicationBuilder.Create().WithTestAndResourceLogging(testOutputHelper);
 
         var eventstore = builder.AddEventStore("eventstore");
 
         using var app = builder.Build();
 
         await app.StartAsync();
 
-#pragma warning disable CTASPIRE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-        await app.WaitForTextAsync("Processor ConnectorsStreamSupervisor Running", "eventstore");
-#pragma warning restore CTASPIRE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+        var rns = app.Services.GetRequiredService<ResourceNotificationService>();
+
+        await rns.WaitForResourceHealthyAsync(eventstore.Resource.Name, default);
 
         var hostBuilder = Host.CreateApplicationBuilder();
 
@@ -44,7 +43,8 @@ public async Task VerifyEventStoreResource()
 
         var eventStoreClient = host.Services.GetRequiredService<EventStoreClient>();
 
-        await CreateTestData(eventStoreClient);
+        var id = await CreateTestDataAsync(eventStoreClient);
+        await VerifyTestDataAsync(eventStoreClient, id);
     }
 
     [Theory]
@@ -58,8 +58,7 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
 
         try
         {
-            using var builder1 = TestDistributedApplicationBuilder.Create(testOutputHelper);
-
+            using var builder1 = TestDistributedApplicationBuilder.Create().WithTestAndResourceLogging(testOutputHelper);
             var eventstore1 = builder1.AddEventStore("eventstore");
 
             if (useVolume)
@@ -76,16 +75,28 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
             else
             {
                 bindMountPath = Directory.CreateTempSubdirectory().FullName;
+
+                if (!OperatingSystem.IsWindows())
+                {
+                    // Change permissions for non-root accounts (container user account)
+                    const UnixFileMode OwnershipPermissions =
+                       UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute |
+                       UnixFileMode.GroupRead | UnixFileMode.GroupWrite | UnixFileMode.GroupExecute |
+                       UnixFileMode.OtherRead | UnixFileMode.OtherWrite | UnixFileMode.OtherExecute;
+
+                    File.SetUnixFileMode(bindMountPath, OwnershipPermissions);
+                }
+
                 eventstore1.WithDataBindMount(bindMountPath);
             }
 
             using (var app = builder1.Build())
             {
                 await app.StartAsync();
 
-#pragma warning disable CTASPIRE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-                await app.WaitForTextAsync("Processor ConnectorsStreamSupervisor Running", eventstore1.Resource.Name);
-#pragma warning restore CTASPIRE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+                var rns = app.Services.GetRequiredService<ResourceNotificationService>();
+
+                await rns.WaitForResourceHealthyAsync(eventstore1.Resource.Name, default);
 
                 try
                 {
@@ -100,7 +111,8 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
                         await host.StartAsync();
 
                         var eventStoreClient = host.Services.GetRequiredService<EventStoreClient>();
-                        id = await CreateTestData(eventStoreClient);
+                        id = await CreateTestDataAsync(eventStoreClient);
+                        await VerifyTestDataAsync(eventStoreClient, id.Value);
                     }
                 }
                 finally
@@ -110,8 +122,7 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
                 }
             }
 
-            using var builder2 = TestDistributedApplicationBuilder.Create(testOutputHelper);
-
+            using var builder2 = TestDistributedApplicationBuilder.Create().WithTestAndResourceLogging(testOutputHelper);
             var eventstore2 = builder2.AddEventStore("eventstore");
 
             if (useVolume)
@@ -120,16 +131,18 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
             }
             else
             {
+                //EventStore shutdown can be slightly delayed, so second instance might fail to start when using the same bind mount before shutdown.
+                await Task.Delay(TimeSpan.FromSeconds(5));
                 eventstore2.WithDataBindMount(bindMountPath!);
             }
 
             using (var app = builder2.Build())
             {
                 await app.StartAsync();
 
-#pragma warning disable CTASPIRE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-                await app.WaitForTextAsync("Processor ConnectorsStreamSupervisor Running", eventstore2.Resource.Name);
-#pragma warning restore CTASPIRE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+                var rns = app.Services.GetRequiredService<ResourceNotificationService>();
+
+                await rns.WaitForResourceHealthyAsync(eventstore1.Resource.Name, default);
 
                 try
                 {
@@ -144,7 +157,7 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
                         await host.StartAsync();
                         var eventStoreClient = host.Services.GetRequiredService<EventStoreClient>();
 
-                        await VerifyTestData(eventStoreClient, id.Value);
+                        await VerifyTestDataAsync(eventStoreClient, id.Value);
                     }
                 }
                 finally
@@ -179,8 +192,8 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
     [Fact]
     public async Task VerifyWaitForEventStoreBlocksDependentResources()
     {
-        var cts = new CancellationTokenSource(TimeSpan.FromMinutes(10));
-        using var builder = TestDistributedApplicationBuilder.Create(testOutputHelper);
+        var cts = new CancellationTokenSource(TimeSpan.FromMinutes(5));
+        using var builder = TestDistributedApplicationBuilder.Create().WithTestAndResourceLogging(testOutputHelper);
 
         var healthCheckTcs = new TaskCompletionSource<HealthCheckResult>();
         builder.Services.AddHealthChecks().AddAsyncCheck("blocking_check", () =>
@@ -191,7 +204,7 @@ public async Task VerifyWaitForEventStoreBlocksDependentResources()
         var resource = builder.AddEventStore("resource")
                               .WithHealthCheck("blocking_check");
 
-        var dependentResource = builder.AddEventStore("dependentresource")
+        var dependentResource = builder.AddContainer("nginx", "mcr.microsoft.com/cbl-mariner/base/nginx", "1.22")
                                        .WaitFor(resource);
 
         using var app = builder.Build();
@@ -206,7 +219,7 @@ public async Task VerifyWaitForEventStoreBlocksDependentResources()
 
         healthCheckTcs.SetResult(HealthCheckResult.Healthy());
 
-        await rns.WaitForResourceAsync(resource.Resource.Name, re => re.Snapshot.HealthStatus == HealthStatus.Healthy, cts.Token);
+        await rns.WaitForResourceHealthyAsync(resource.Resource.Name, cts.Token);
 
         await rns.WaitForResourceAsync(dependentResource.Resource.Name, KnownResourceStates.Running, cts.Token);
 
@@ -215,7 +228,7 @@ public async Task VerifyWaitForEventStoreBlocksDependentResources()
         await app.StopAsync();
     }
 
-    private static async Task<Guid> CreateTestData(EventStoreClient eventStoreClient)
+    private static async Task<Guid> CreateTestDataAsync(EventStoreClient eventStoreClient)
     {
         var id = Guid.NewGuid();
         var accountCreated = new AccountCreated(id, TestAccountName);
@@ -226,12 +239,10 @@ private static async Task<Guid> CreateTestData(EventStoreClient eventStoreClient
         var writeResult = await eventStoreClient.AppendToStreamAsync(streamName, StreamRevision.None, [eventData]);
         Assert.NotNull(writeResult);
 
-        await VerifyTestData(eventStoreClient, id);
-
         return id;
     }
 
-    private static async Task VerifyTestData(EventStoreClient eventStoreClient, Guid id)
+    private static async Task VerifyTestDataAsync(EventStoreClient eventStoreClient, Guid id)
     {
         var streamName = $"{TestStreamNamePrefix}{id}";