Add Waitfor For Meilisearch (#183)

* Add Waitfor For Meilisearch

* Update example to use waitfor

* Update MeilisearchFunctionalTests.cs

---------

Co-authored-by: Aaron Powell <[email protected]>

Author: Alirexaa

examples/meilisearch/CommunityToolkit.Aspire.Hosting.Meilisearch.AppHost/Program.cs

@@ -5,6 +5,7 @@
 var meilisearch = builder.AddMeilisearch("meilisearch");
 
 builder.AddProject<CommunityToolkit_Aspire_Hosting_Meilisearch_ApiService>("apiservice")
-    .WithReference(meilisearch);
+    .WithReference(meilisearch)
+    .WaitFor(meilisearch);
 
 builder.Build().Run();

src/CommunityToolkit.Aspire.Hosting.Meilisearch/CommunityToolkit.Aspire.Hosting.Meilisearch.csproj

@@ -7,6 +7,7 @@
 
   <ItemGroup>
     <Compile Include="$(RepoRoot)src\VolumeNameGenerator.cs" Link="Utils\VolumeNameGenerator.cs" />
+    <Compile Include="$(RepoRoot)src\CommunityToolkit.Aspire.Meilisearch\MeilisearchHealthCheck.cs" Link="MeilisearchHealthCheck.cs"></Compile>
   </ItemGroup>
 
   <ItemGroup>

src/CommunityToolkit.Aspire.Hosting.Meilisearch/MeilisearchBuilderExtensions.cs

@@ -3,6 +3,9 @@
 using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.Utils;
 using Meilisearch;
+using Microsoft.Extensions.Diagnostics.HealthChecks;
+using CommunityToolkit.Aspire.Meilisearch;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Aspire.Hosting;
 
@@ -49,26 +52,24 @@ public static IResourceBuilder<MeilisearchResource> AddMeilisearch(
 
         var meilisearch = new MeilisearchResource(name, masterKeyParameter);
 
-        //following commented section need to aspire 9.0.
+        MeilisearchClient? meilisearchClient = null;
 
-        //MeilisearchClient? meilisearchClient = null;
-
-        //builder.Eventing.Subscribe<ConnectionStringAvailableEvent>(meilisearch, async (@event, ct) =>
-        //{
-        //    var connectionString = await meilisearch.ConnectionStringExpression.GetValueAsync(ct).ConfigureAwait(false)
-        //    ?? throw new DistributedApplicationException($"ConnectionStringAvailableEvent was published for the '{meilisearch.Name}' resource but the connection string was null.");
+        builder.Eventing.Subscribe<ConnectionStringAvailableEvent>(meilisearch, async (@event, ct) =>
+        {
+            var connectionString = await meilisearch.ConnectionStringExpression.GetValueAsync(ct).ConfigureAwait(false)
+            ?? throw new DistributedApplicationException($"ConnectionStringAvailableEvent was published for the '{meilisearch.Name}' resource but the connection string was null.");
 
-        //    meilisearchClient = CreateMeilisearchClient(connectionString);
-        //});
+            meilisearchClient = CreateMeilisearchClient(connectionString);
+        });
 
-        //var healthCheckKey = $"{name}_check";
-        //builder.Services.AddHealthChecks()
-        // .Add(new HealthCheckRegistration(
-        //     healthCheckKey,
-        //     sp => new MeilisearchHealthCheck(meilisearchClient!),
-        //     failureStatus: default,
-        //     tags: default,
-        //     timeout: default));
+        var healthCheckKey = $"{name}_check";
+        builder.Services.AddHealthChecks()
+         .Add(new HealthCheckRegistration(
+             healthCheckKey,
+             sp => new MeilisearchHealthCheck(meilisearchClient!),
+             failureStatus: default,
+             tags: default,
+             timeout: default));
 
         return builder.AddResource(meilisearch)
              .WithImage(MeilisearchContainerImageTags.Image, MeilisearchContainerImageTags.Tag)
@@ -77,8 +78,8 @@ public static IResourceBuilder<MeilisearchResource> AddMeilisearch(
              .WithEnvironment(context =>
              {
                  context.EnvironmentVariables["MEILI_MASTER_KEY"] = meilisearch.MasterKeyParameter;
-             });
-        //.WithHealthCheck(healthCheckKey);
+             })
+             .WithHealthCheck(healthCheckKey);
     }
 
     /// <summary>

tests/CommunityToolkit.Aspire.Hosting.Meilisearch/MeilisearchFunctionalTests.cs

@@ -189,46 +189,44 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
         }
     }
 
-    //following commented section need to aspire 9.0.
-
-    //[Fact]
-    //public async Task VerifyWaitForOnMeilisearchBlocksDependentResources()
-    //{
-    //    var cts = new CancellationTokenSource(TimeSpan.FromMinutes(10));
-    //    using var builder = TestDistributedApplicationBuilder.Create(testOutputHelper);
+    [Fact]
+    public async Task VerifyWaitForOnMeilisearchBlocksDependentResources()
+    {
+        var cts = new CancellationTokenSource(TimeSpan.FromMinutes(10));
+        using var builder = TestDistributedApplicationBuilder.Create(testOutputHelper);
 
-    //    var healthCheckTcs = new TaskCompletionSource<HealthCheckResult>();
-    //    builder.Services.AddHealthChecks().AddAsyncCheck("blocking_check", () =>
-    //    {
-    //        return healthCheckTcs.Task;
-    //    });
+        var healthCheckTcs = new TaskCompletionSource<HealthCheckResult>();
+        builder.Services.AddHealthChecks().AddAsyncCheck("blocking_check", () =>
+        {
+            return healthCheckTcs.Task;
+        });
 
-    //    var resource = builder.AddMeilisearch("resource")
-    //                          .WithHealthCheck("blocking_check");
+        var resource = builder.AddMeilisearch("resource")
+                              .WithHealthCheck("blocking_check");
 
-    //    var dependentResource = builder.AddMeilisearch("dependentresource")
-    //                                   .WaitFor(resource);
+        var dependentResource = builder.AddMeilisearch("dependentresource")
+                                       .WaitFor(resource);
 
-    //    using var app = builder.Build();
+        using var app = builder.Build();
 
-    //    var pendingStart = app.StartAsync(cts.Token);
+        var pendingStart = app.StartAsync(cts.Token);
 
-    //    var rns = app.Services.GetRequiredService<ResourceNotificationService>();
+        var rns = app.Services.GetRequiredService<ResourceNotificationService>();
 
-    //    await rns.WaitForResourceAsync(resource.Resource.Name, KnownResourceStates.Running, cts.Token);
+        await rns.WaitForResourceAsync(resource.Resource.Name, KnownResourceStates.Running, cts.Token);
 
-    //    await rns.WaitForResourceAsync(dependentResource.Resource.Name, KnownResourceStates.Waiting, cts.Token);
+        await rns.WaitForResourceAsync(dependentResource.Resource.Name, KnownResourceStates.Waiting, cts.Token);
 
-    //    healthCheckTcs.SetResult(HealthCheckResult.Healthy());
+        healthCheckTcs.SetResult(HealthCheckResult.Healthy());
 
-    //    await rns.WaitForResourceAsync(resource.Resource.Name, re => re.Snapshot.HealthStatus == HealthStatus.Healthy, cts.Token);
+        await rns.WaitForResourceAsync(resource.Resource.Name, re => re.Snapshot.HealthStatus == HealthStatus.Healthy, cts.Token);
 
-    //    await rns.WaitForResourceAsync(dependentResource.Resource.Name, KnownResourceStates.Running, cts.Token);
+        await rns.WaitForResourceAsync(dependentResource.Resource.Name, KnownResourceStates.Running, cts.Token);
 
-    //    await pendingStart;
+        await pendingStart;
 
-    //    await app.StopAsync();
-    //}
+        await app.StopAsync();
+    }
 
     private static async Task CreateTestData(MeilisearchClient meilisearchClient)
     {