Move integration tests over to aspire

Author: Mpdreamz

src/Elastic.Documentation.ServiceDefaults/AppDefaultsExtensions.cs

@@ -36,11 +36,6 @@ public static TBuilder AddAppDefaults<TBuilder>(this TBuilder builder, ref strin
 		ProcessCommandLineArguments(ref args, ref logLevel);
 
 		var services = builder.Services;
-		_ = services.AddLogging(x => x
-			.ClearProviders()
-			.SetMinimumLevel(logLevel).AddConsole(c => c.FormatterName = "condensed")
-		);
-
 		_ = services
 			.AddGitHubActionsCore()
 			.AddSingleton<DiagnosticsChannel>()
@@ -58,7 +53,7 @@ public static TBuilder AddAppDefaults<TBuilder>(this TBuilder builder, ref strin
 			.AddConsole(c => c.FormatterName = "condensed")
 		);
 
-		return builder;
+		return builder.AddServiceDefaults();
 	}
 
 	private static void ProcessCommandLineArguments(ref string[] args, ref LogLevel defaultLogLevel)

src/tooling/docs-assembler/Program.cs

@@ -19,8 +19,7 @@
 	.AddAppDefaults(ref args, (s, p) =>
 	{
 		_ = s.AddSingleton(AssemblyConfiguration.Create(p));
-	})
-	.AddServiceDefaults();
+	});
 
 var app = builder.ToConsoleAppBuilder();
 

src/tooling/docs-builder/Http/DocumentationWebHost.cs

@@ -35,7 +35,7 @@ public DocumentationWebHost(ILoggerFactory logFactory, string? path, int port, I
 	{
 		_writeFileSystem = writeFs;
 		var builder = WebApplication.CreateSlimBuilder();
-		_ = builder.AddAppDefaults().AddServiceDefaults();
+		_ = builder.AddAppDefaults();
 
 		_ = builder.Logging
 			.AddFilter("Microsoft.AspNetCore.Hosting.Diagnostics", LogLevel.Error)

src/tooling/docs-builder/Http/StaticWebHost.cs

@@ -26,7 +26,7 @@ public StaticWebHost(int port)
 			ContentRootPath = contentRoot
 		});
 
-		_ = builder.AddAppDefaults().AddServiceDefaults();
+		_ = builder.AddAppDefaults();
 
 		_ = builder.Logging
 			.AddFilter("Microsoft.AspNetCore.Hosting.Diagnostics", LogLevel.Error)

src/tooling/docs-builder/Program.cs

@@ -12,8 +12,7 @@
 using Microsoft.Extensions.Logging;
 
 var builder = Host.CreateApplicationBuilder()
-	.AddAppDefaults(ref args)
-	.AddServiceDefaults();
+	.AddAppDefaults(ref args);
 
 var app = builder.ToConsoleAppBuilder();
 

tests-integration/Elastic.Assembler.IntegrationTests/AssembleFixture.cs

@@ -2,24 +2,9 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Collections.ObjectModel;
-using System.IO.Abstractions;
+using Aspire.Hosting;
 using Aspire.Hosting.Testing;
-using Documentation.Assembler;
-using Documentation.Assembler.Building;
-using Documentation.Assembler.Legacy;
-using Documentation.Assembler.Navigation;
-using Documentation.Assembler.Sourcing;
-using Documentation.Builder.Http;
-using Elastic.Documentation.Configuration;
-using Elastic.Documentation.Configuration.Assembler;
-using Elastic.Documentation.Configuration.Versions;
-using Elastic.Documentation.LegacyDocs;
-using Elastic.Documentation.Tooling;
-using Elastic.Documentation.Tooling.Diagnostics.Console;
-using Microsoft.Extensions.Logging;
 using FluentAssertions;
-using Xunit;
 
 [assembly: CaptureConsole, AssemblyFixture(typeof(Elastic.Assembler.IntegrationTests.AssembleFixture))]
 
@@ -28,85 +13,37 @@ namespace Elastic.Assembler.IntegrationTests;
 
 public class AssembleFixture : IAsyncLifetime
 {
-	private static IFileSystem FileSystem { get; } = new FileSystem();
-	public ConfigurationFileProvider ConfigurationFileProvider { get; } = new(FileSystem);
-	public StaticWebHost WebsiteHost { get; private set; } = null!;
-	public Task WebsiteRunning { get; private set; } = null!;
+	public DistributedApplication DistributedApplication { get; private set; } = null!;
 
 	/// <inheritdoc />
-	public async ValueTask DisposeAsync()
+	public async ValueTask InitializeAsync()
 	{
-		GC.SuppressFinalize(this);
-		await WebsiteHost.StopAsync(TestContext.Current.CancellationToken);
+		var builder = await DistributedApplicationTestingBuilder.CreateAsync<Projects.Elastic_Documentation_Aspire>();
+		DistributedApplication = await builder.BuildAsync();
+		await DistributedApplication.StartAsync();
 	}
 
 	/// <inheritdoc />
-	public async ValueTask InitializeAsync()
+	public async ValueTask DisposeAsync()
 	{
-		//var builder = await DistributedApplicationTestingBuilder.CreateAsync([]);
-		var ctx = TestContext.Current.CancellationToken;
-		var logFactory = LoggerFactory.Create(builder =>
-		{
-			_ = builder.AddConsole();
-		});
-		await using var collector = new ConsoleDiagnosticsCollector(logFactory, null).StartAsync(ctx);
-
-		var assemblyConfiguration = AssemblyConfiguration.Create(ConfigurationFileProvider);
-		var versionsConfig = ConfigurationFileProvider.CreateVersionConfiguration();
-
-		var assembleContext = new AssembleContext(assemblyConfiguration, ConfigurationFileProvider, "dev", collector, FileSystem, FileSystem, null, null);
-		var cloner = new AssemblerRepositorySourcer(logFactory, assembleContext);
-
-		_ = await cloner.CloneAll(false, ctx);
-
-		_ = GlobalNavigationFile.ValidatePathPrefixes(assembleContext);
-
-		var checkoutResult = cloner.GetAll();
-		var checkouts = checkoutResult.Checkouts.ToArray();
-
-		if (checkouts.Length == 0)
-			throw new Exception("No checkouts found");
-
-		var assembleSources = await AssembleSources.AssembleAsync(logFactory, assembleContext, checkouts, versionsConfig, ctx);
-		var navigationFile = new GlobalNavigationFile(assembleContext, assembleSources);
-
-		var navigation = new GlobalNavigation(assembleSources, navigationFile);
-
-		var pathProvider = new GlobalNavigationPathProvider(navigationFile, assembleSources, assembleContext);
-		var htmlWriter = new GlobalNavigationHtmlWriter(logFactory, navigation, collector);
-		var legacyPageChecker = new LegacyPageChecker();
-		var historyMapper = new PageLegacyUrlMapper(legacyPageChecker, assembleSources.HistoryMappings);
-
-		var exporters = new HashSet<ExportOption>([ExportOption.Html, ExportOption.Configuration]);
-		var builder = new AssemblerBuilder(logFactory, assembleContext, navigation, htmlWriter, pathProvider, historyMapper);
-		await builder.BuildAllAsync(assembleSources.AssembleSets, exporters, ctx);
-
-		await cloner.WriteLinkRegistrySnapshot(checkoutResult.LinkRegistrySnapshot, ctx);
-
-		var redirectsPath = Path.Combine(assembleContext.OutputDirectory.FullName, "redirects.json");
-
-		var sitemapBuilder = new SitemapBuilder(navigation.NavigationItems, assembleContext.WriteFileSystem, assembleContext.OutputDirectory);
-		sitemapBuilder.Generate();
-
-		await collector.StopAsync(ctx);
-
-		WebsiteHost = new StaticWebHost(4001);
-		WebsiteRunning = WebsiteHost.RunAsync(ctx);
-		_ = await WebsiteHost.WaitForAppStartup(ctx);
+		await DistributedApplication.StopAsync();
+		await DistributedApplication.DisposeAsync();
+		GC.SuppressFinalize(this);
 	}
 
+
 }
 
 public class DatabaseTestClass1(AssembleFixture fixture)
 {
 	[Fact]
 	public async Task X()
 	{
-		using var client = new HttpClient { BaseAddress = new Uri("http://localhost:4001") };
+		_ = await fixture.DistributedApplication.ResourceNotifications
+			.WaitForResourceHealthyAsync("DocsBuilderServeStatic", cancellationToken: TestContext.Current.CancellationToken);
+		var client = fixture.DistributedApplication.CreateHttpClient("DocsBuilderServeStatic", "http");
 		var root = await client.GetStringAsync("/", TestContext.Current.CancellationToken);
-		Console.WriteLine(root);
-
-		fixture.Should().NotBeNull();
+		_ = root.Should().NotBeNullOrEmpty();
 	}
 
 

tests-integration/Elastic.Assembler.IntegrationTests/Elastic.Assembler.IntegrationTests.csproj

@@ -10,6 +10,7 @@
       <ProjectReference Include="..\..\src\Elastic.Documentation\Elastic.Documentation.csproj" />
       <ProjectReference Include="..\..\src\tooling\docs-assembler\docs-assembler.csproj" />
       <ProjectReference Include="..\..\src\tooling\docs-builder\docs-builder.csproj" />
+      <ProjectReference Include="..\Elastic.Documentation.Aspire\Elastic.Documentation.Aspire.csproj" />
     </ItemGroup>
 
     <ItemGroup>

tests-integration/Elastic.Documentation.Aspire/AppHost.cs

@@ -9,10 +9,11 @@
 var buildAll = builder.AddProject<Projects.docs_assembler>("DocsAssemblerBuildAll").WithArgs("repo", "build-all").WaitForCompletion(cloneAll);
 
 var serveStatic = builder.AddProject<Projects.docs_builder>("DocsBuilderServeStatic")
-	.WithHttpEndpoint(name: "serve-static", port: 4000, isProxied: false)
+	.WithHttpEndpoint(port: 4000, isProxied: false)
 	.WithArgs("serve-static")
+	.WithHttpHealthCheck("/", 200)
 	.WaitForCompletion(buildAll);
 
-builder.AddElasticsearch("elasticsearch");
+//builder.AddElasticsearch("elasticsearch");
 
 builder.Build().Run();