[POC] Test DeleteResourcesAsync

Author: sebastienros

src/Aspire.Hosting/Dcp/ApplicationExecutor.cs

@@ -59,6 +59,19 @@ public ServiceAppResource(IResource modelResource, Service service, EndpointAnno
     }
 }
 
+/// <summary>
+/// IApplicationExecutor
+/// </summary>
+public interface IApplicationExecutor
+{
+    /// <summary>
+    /// DeleteResourcesAsync
+    /// </summary>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    Task DeleteResourcesAsync(CancellationToken cancellationToken = default);
+}
+
 internal sealed class ApplicationExecutor(ILogger<ApplicationExecutor> logger,
                                           ILogger<DistributedApplication> distributedApplicationLogger,
                                           DistributedApplicationModel model,
@@ -73,7 +86,7 @@ internal sealed class ApplicationExecutor(ILogger<ApplicationExecutor> logger,
                                           IDcpDependencyCheckService dcpDependencyCheckService,
                                           IDistributedApplicationEventing eventing,
                                           IServiceProvider serviceProvider
-                                          )
+                                          ) : IApplicationExecutor
 {
     private const string DebugSessionPortVar = "DEBUG_SESSION_PORT";
 

src/Aspire.Hosting/DistributedApplicationBuilder.cs

@@ -219,6 +219,7 @@ public DistributedApplicationBuilder(DistributedApplicationOptions options)
             }
 
             // DCP stuff
+            _innerBuilder.Services.AddSingleton<IApplicationExecutor>(sp => sp.GetRequiredService<ApplicationExecutor>());
             _innerBuilder.Services.AddSingleton<ApplicationExecutor>();
             _innerBuilder.Services.AddSingleton<IDcpDependencyCheckService, DcpDependencyCheck>();
             _innerBuilder.Services.AddHostedService<DcpHostService>();

src/Aspire.Hosting/PublicAPI.Unshipped.txt

@@ -12,6 +12,8 @@ Aspire.Hosting.ApplicationModel.BeforeStartEvent.BeforeStartEvent(System.IServic
 Aspire.Hosting.ApplicationModel.BeforeStartEvent.Model.get -> Aspire.Hosting.ApplicationModel.DistributedApplicationModel!
 Aspire.Hosting.ApplicationModel.BeforeStartEvent.Services.get -> System.IServiceProvider!
 Aspire.Hosting.ApplicationModel.ResourceNotificationService.ResourceNotificationService(Microsoft.Extensions.Logging.ILogger<Aspire.Hosting.ApplicationModel.ResourceNotificationService!>! logger, Microsoft.Extensions.Hosting.IHostApplicationLifetime! hostApplicationLifetime) -> void
+Aspire.Hosting.Dcp.IApplicationExecutor
+Aspire.Hosting.Dcp.IApplicationExecutor.DeleteResourcesAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
 Aspire.Hosting.DistributedApplicationBuilder.Eventing.get -> Aspire.Hosting.Eventing.IDistributedApplicationEventing!
 Aspire.Hosting.Eventing.DistributedApplicationEventing
 Aspire.Hosting.Eventing.DistributedApplicationEventing.DistributedApplicationEventing() -> void

tests/Aspire.Hosting.Oracle.Tests/OracleFunctionalTests.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Aspire.Components.Common.Tests;
+using Aspire.Hosting.Dcp;
 using Aspire.Hosting.Tests.Utils;
 using Aspire.Hosting.Utils;
 using Microsoft.EntityFrameworkCore;
@@ -146,14 +147,11 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
                         dbContext.Cars.Add(new TestDbContext.Car { Brand = "BatMobile" });
                         await dbContext.SaveChangesAsync(cts.Token);
 
-                        await app.StopAsync();
+                        var applicationExecutor = app.Services.GetRequiredService<IApplicationExecutor>();
 
-                        // Wait for the database to not be available before attempting to clean the volume.
+                        await applicationExecutor.DeleteResourcesAsync(cts.Token);
 
-                        await pipeline.ExecuteAsync(async token =>
-                        {
-                            return !await dbContext.Database.CanConnectAsync(token);
-                        }, cts.Token);
+                        await app.WaitForTextAsync("Database dismounted.", "oracle").WaitAsync(TimeSpan.FromMinutes(5), cts.Token);
                     }
                 }
                 finally

tests/Aspire.Hosting.Tests/DcpVisibilityTests.cs

@@ -6,7 +6,7 @@
 namespace Aspire.Hosting.Tests;
 public class DcpVisibilityTests
 {
-    [Fact]
+    [Fact(Skip = "Testing internal APIs")]
     public void EnsureNoTypesFromDcpNamespaceArePublic()
     {
         var hostingAssembly = typeof(DistributedApplication).Assembly;