Using the new event callback model

Author: aaronpowell

src/CommunityToolkit.Aspire.Hosting.ActiveMQ/ActiveMQBuilderExtensions.cs

@@ -154,10 +154,10 @@ private static IResourceBuilder<T> WithJolokiaHealthCheck<T>(
         const int statusCode = 200;
         const string endpointName = "web";
         const string scheme = "http";
-        EndpointReference endpoint = builder.Resource.GetEndpoint(endpointName);
 
-        builder.ApplicationBuilder.Eventing.Subscribe<AfterEndpointsAllocatedEvent>((_, _) =>
+        builder.OnResourceEndpointsAllocated((resource, @event, ct) =>
         {
+            var endpoint = resource.GetEndpoint(endpointName);
             if (!endpoint.Exists)
             {
                 throw new DistributedApplicationException($"The endpoint '{endpointName}' does not exist on the resource '{builder.Resource.Name}'.");
@@ -173,11 +173,12 @@ private static IResourceBuilder<T> WithJolokiaHealthCheck<T>(
 
         Uri? uri = null;
         string basicAuthentication = string.Empty;
-        builder.ApplicationBuilder.Eventing.Subscribe<BeforeResourceStartedEvent>(builder.Resource, async (_, ct) =>
+        builder.OnBeforeResourceStarted(async (resource, _, ct) =>
         {
+            var endpoint = resource.GetEndpoint(endpointName);
             Uri baseUri = new (endpoint.Url, UriKind.Absolute);
-            string userName = (await builder.Resource.UserNameReference.GetValueAsync(ct))!;
-            string password = (await builder.Resource.PasswordParameter.GetValueAsync(ct))!;
+            string userName = (await resource.UserNameReference.GetValueAsync(ct))!;
+            string password = (await resource.PasswordParameter.GetValueAsync(ct))!;
             basicAuthentication = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes($"{userName}:{password}"));
             uri = new UriBuilder(baseUri)
             {

src/CommunityToolkit.Aspire.Hosting.Ngrok/NgrokExtensions.cs

@@ -34,7 +34,7 @@ public static IResourceBuilder<NgrokResource> AddNgrok(
         ArgumentNullException.ThrowIfNull(builder);
         if (configurationFolder is not null)
             ArgumentException.ThrowIfNullOrWhiteSpace(configurationFolder);
-        
+
         if (endpointPort is not null)
         {
             ArgumentOutOfRangeException.ThrowIfLessThan(endpointPort.Value, 1, nameof(endpointPort));
@@ -49,28 +49,27 @@ public static IResourceBuilder<NgrokResource> AddNgrok(
         configurationFolder ??= Path.Combine(builder.AppHostDirectory, ".ngrok");
         if (!Directory.Exists(configurationFolder))
             Directory.CreateDirectory(configurationFolder);
-        
-        var resource = new NgrokResource(name);
-        var resourceBuilder = builder.AddResource(resource)
+
+        var resourceBuilder = builder.AddResource(new NgrokResource(name))
             .WithImage(NgrokContainerValues.Image, NgrokContainerValues.Tag)
             .WithImageRegistry(NgrokContainerValues.Registry)
             .WithBindMount(configurationFolder, "/var/tmp/ngrok")
             .WithHttpEndpoint(targetPort: 4040, port: endpointPort, name: endpointName);
-        builder.Eventing.Subscribe<AfterEndpointsAllocatedEvent>(async (e, ct) =>
+        resourceBuilder.OnResourceEndpointsAllocated(async (resource, e, ct) =>
         {
             var endpointTuples = resource.Annotations
                 .OfType<NgrokEndpointAnnotation>()
                 .SelectMany(annotation => annotation.Endpoints.Select(ngrokEndpoint => (endpointRefernce: annotation.Resource.GetEndpoint(ngrokEndpoint.EndpointName), ngrokEndpoint)))
                 .ToList();
             await CreateNgrokConfigurationFileAsync(configurationFolder, name, endpointTuples, configurationVersion ?? 3);
-            
+
             resourceBuilder.WithArgs(
-                "start", endpointTuples.Count > 0 ? "--all" : "--none", 
+                "start", endpointTuples.Count > 0 ? "--all" : "--none",
                 "--config", $"/var/tmp/ngrok/{name}.yml");
         });
         return resourceBuilder;
     }
-    
+
     /// <summary>
     /// Adds a ngrok auth token to a ngrok resource.
     /// </summary>
@@ -86,7 +85,7 @@ public static IResourceBuilder<NgrokResource> WithAuthToken(
 
         return builder.WithEnvironment(NgrokContainerValues.AuthTokenEnvName, ngrokAuthToken);
     }
-    
+
     /// <summary>
     /// Adds a ngrok auth token to a ngrok resource.
     /// </summary>
@@ -102,13 +101,13 @@ public static IResourceBuilder<NgrokResource> WithAuthToken(
 
         return builder.WithEnvironment(NgrokContainerValues.AuthTokenEnvName, ngrokAuthToken);
     }
-    
+
     /// <summary>
     /// Configures a resource with endpoints as a ngrok tunnel endpoint.
     /// </summary>
     /// <typeparam name="TResource">The resource type.</typeparam>
     public static IResourceBuilder<NgrokResource> WithTunnelEndpoint<TResource>(
-        this IResourceBuilder<NgrokResource> builder, 
+        this IResourceBuilder<NgrokResource> builder,
         IResourceBuilder<TResource> resource,
         string endpointName,
         string? ngrokUrl = null,
@@ -136,7 +135,7 @@ public static IResourceBuilder<NgrokResource> WithTunnelEndpoint<TResource>(
 
         return builder;
     }
-    
+
     private static async Task CreateNgrokConfigurationFileAsync(
         string configurationFolder,
         string name,
@@ -165,7 +164,7 @@ private static async Task CreateNgrokConfigurationFileAsync(
                 break;
             case 3:
                 ngrokConfig.AppendLine("agent:");
-                ngrokConfig.AppendLine( "  log: stdout");
+                ngrokConfig.AppendLine("  log: stdout");
                 if (endpointTuples.Count > 0)
                 {
                     ngrokConfig.AppendLine();
@@ -190,7 +189,7 @@ private static async Task CreateNgrokConfigurationFileAsync(
     private static string GetUpstreamUrl(EndpointReference endpoint)
     {
         var isLocal = endpoint.Host.Equals("localhost", StringComparison.InvariantCultureIgnoreCase);
-        var host = (IsWindows || IsOsx) && isLocal? "host.docker.internal" : endpoint.Host;
+        var host = (IsWindows || IsOsx) && isLocal ? "host.docker.internal" : endpoint.Host;
         return $"{endpoint.Scheme}://{host}:{endpoint.Port}";
     }
 }

tests/CommunityToolkit.Aspire.Hosting.Adminer.Tests/AddAdminerTests.cs

@@ -301,7 +301,7 @@ public async Task AddAdminerWithDefaultsAddsUrlAnnotations()
         var adminer = builder.AddAdminer("adminer");
 
         var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        builder.Eventing.Subscribe<AfterEndpointsAllocatedEvent>((e, ct) =>
+        adminer.OnResourceEndpointsAllocated((resource, @event, ct) =>
         {
             tcs.SetResult();
             return Task.CompletedTask;

tests/CommunityToolkit.Aspire.Hosting.DbGate.Tests/AddDbGateTests.cs

@@ -564,7 +564,7 @@ public async Task AddDbGateWithDefaultsAddsUrlAnnotations()
         var dbgate = builder.AddDbGate("dbgate");
 
         var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        builder.Eventing.Subscribe<AfterEndpointsAllocatedEvent>((e, ct) =>
+        dbgate.OnResourceEndpointsAllocated((resource, @event, ct) =>
         {
             tcs.SetResult();
             return Task.CompletedTask;