Refactor naming

reakaleek · reakaleek · commit c9d67b093240 · 2025-07-31T12:47:00.000+02:00
diff --git a/.editorconfig b/.editorconfig
@@ -247,6 +247,10 @@ dotnet_diagnostic.IDE0305.severity = none
 dotnet_diagnostic.IDE0072.severity = none
 
 
+[src/api/AwsLambda/**/*.cs]
+dotnet_diagnostic.IL3050.severity = none
+dotnet_diagnostic.IL2026.severity = none
+
 
 [DocumentationWebHost.cs]
 dotnet_diagnostic.IL3050.severity = none
diff --git a/.github/workflows/build-api-lambda.yml b/.github/workflows/build-api-lambda.yml
@@ -16,14 +16,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      BINARY_PATH: .artifacts/AwsLambda/release_linux-x64/bootstrap
+      BINARY_PATH: .artifacts/Elastic.Documentation.Api.Lambda/release_linux-x64/bootstrap
     steps:
       - uses: actions/checkout@v4
         with: 
           ref: ${{ inputs.ref }}
       - name: Amazon Linux 2023 build
         run: |
-          docker build . -t api-lambda:latest -f src/api/AwsLambda/Dockerfile
+          docker build . -t api-lambda:latest -f src/api/Elastic.Documentation.Api.Lambda/Dockerfile
       - name: Get bootstrap binary
         run: |
           docker cp $(docker create --name tc api-lambda:latest):/app/.artifacts/publish ./.artifacts && docker rm tc
diff --git a/docs-builder.sln b/docs-builder.sln
@@ -121,11 +121,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{6FAB56
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "api", "api", "{B042CC78-5060-4091-B95A-79C71BA3908A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "src\api\Core\Core.csproj", "{F30B90AD-1A01-4A6F-9699-809FA6875B22}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Documentation.Api.Core", "src\api\Elastic.Documentation.Api.Core\Elastic.Documentation.Api.Core.csproj", "{F30B90AD-1A01-4A6F-9699-809FA6875B22}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Infrastructure", "src\api\Infrastructure\Infrastructure.csproj", "{AE3FC78E-167F-4B6E-88EC-84743EB748B7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Documentation.Api.Infrastructure", "src\api\Elastic.Documentation.Api.Infrastructure\Elastic.Documentation.Api.Infrastructure.csproj", "{AE3FC78E-167F-4B6E-88EC-84743EB748B7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AwsLambda", "src\api\AwsLambda\AwsLambda.csproj", "{C6A121C5-DEB1-4FCE-9140-AF144EA98EEE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Documentation.Api.Lambda", "src\api\Elastic.Documentation.Api.Lambda\Elastic.Documentation.Api.Lambda.csproj", "{C6A121C5-DEB1-4FCE-9140-AF144EA98EEE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/api/Elastic.Documentation.Api.Core/AskAi/AskAiRequest.cs b/src/api/Elastic.Documentation.Api.Core/AskAi/AskAiRequest.cs
@@ -2,6 +2,5 @@
 // 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
 
-namespace Api.Core.AskAi;
+namespace Elastic.Documentation.Api.Core.AskAi;
 
-public record AskAiRequest(string Message, string? ThreadId);
diff --git a/src/api/Elastic.Documentation.Api.Core/AskAi/AskAiUsecase.cs b/src/api/Elastic.Documentation.Api.Core/AskAi/AskAiUsecase.cs
@@ -4,7 +4,7 @@
 
 using Microsoft.Extensions.Logging;
 
-namespace Api.Core.AskAi;
+namespace Elastic.Documentation.Api.Core.AskAi;
 
 public class AskAiUsecase(IAskAiGateway<Stream> askAiGateway, ILogger<AskAiUsecase> logger)
 {
@@ -14,3 +14,5 @@ public async Task<Stream> AskAi(AskAiRequest askAiRequest, Cancel ctx)
 		return await askAiGateway.AskAi(askAiRequest, ctx);
 	}
 }
+
+public record AskAiRequest(string Message, string? ThreadId);
diff --git a/src/api/Elastic.Documentation.Api.Core/AskAi/IAskAiGateway.cs b/src/api/Elastic.Documentation.Api.Core/AskAi/IAskAiGateway.cs
@@ -2,7 +2,7 @@
 // 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
 
-namespace Api.Core.AskAi;
+namespace Elastic.Documentation.Api.Core.AskAi;
 
 public interface IAskAiGateway<T>
 {
diff --git a/src/api/Elastic.Documentation.Api.Core/Elastic.Documentation.Api.Core.csproj b/src/api/Elastic.Documentation.Api.Core/Elastic.Documentation.Api.Core.csproj
@@ -4,8 +4,8 @@
         <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <AssemblyName>Api.Core</AssemblyName>
-        <RootNamespace>Api.Core</RootNamespace>
+        <AssemblyName>Elastic.Documentation.Api.Core</AssemblyName>
+        <RootNamespace>Elastic.Documentation.Api.Core</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/api/Elastic.Documentation.Api.Core/SerializationContext.cs b/src/api/Elastic.Documentation.Api.Core/SerializationContext.cs
@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information
 
 using System.Text.Json.Serialization;
-using Api.Core.AskAi;
+using Elastic.Documentation.Api.Core.AskAi;
 
-namespace Api.Core;
+namespace Elastic.Documentation.Api.Core;
 
 
 [JsonSerializable(typeof(AskAiRequest))]
diff --git a/src/api/Elastic.Documentation.Api.Infrastructure/Adapters/GcpIdTokenProvider.cs b/src/api/Elastic.Documentation.Api.Infrastructure/Adapters/GcpIdTokenProvider.cs
@@ -7,7 +7,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Api.Infrastructure.Adapters;
+namespace Elastic.Documentation.Api.Infrastructure.Adapters;
 
 // This is a custom implementation to create an ID token for GCP.
 // Because Google.Api.Auth.OAuth2 is not compatible with AOT
diff --git a/src/api/Elastic.Documentation.Api.Infrastructure/Adapters/LlmGatewayChatGateway.cs b/src/api/Elastic.Documentation.Api.Infrastructure/Adapters/LlmGatewayChatGateway.cs
@@ -5,9 +5,9 @@
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Api.Core.AskAi;
+using Elastic.Documentation.Api.Core.AskAi;
 
-namespace Api.Infrastructure.Adapters;
+namespace Elastic.Documentation.Api.Infrastructure.Adapters;
 
 public class LlmGatewayAskAiGateway(HttpClient httpClient, GcpIdTokenProvider tokenProvider, string gcpFunctionUrl) : IAskAiGateway<Stream>
 {
diff --git a/src/api/Elastic.Documentation.Api.Infrastructure/Aws/IParameterProvider.cs b/src/api/Elastic.Documentation.Api.Infrastructure/Aws/IParameterProvider.cs
@@ -2,7 +2,7 @@
 // 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
 
-namespace Api.Infrastructure.Aws;
+namespace Elastic.Documentation.Api.Infrastructure.Aws;
 
 public interface IParameterProvider
 {
diff --git a/src/api/Elastic.Documentation.Api.Infrastructure/Aws/LambdaExtensionParameterProvider.cs b/src/api/Elastic.Documentation.Api.Infrastructure/Aws/LambdaExtensionParameterProvider.cs
@@ -7,7 +7,7 @@
 using System.Text.Json.Serialization;
 using Microsoft.Extensions.Logging;
 
-namespace Api.Infrastructure.Aws;
+namespace Elastic.Documentation.Api.Infrastructure.Aws;
 
 public class LambdaExtensionParameterProvider(IHttpClientFactory httpClientFactory, ILogger<LambdaExtensionParameterProvider> logger) : IParameterProvider
 {
diff --git a/src/api/Elastic.Documentation.Api.Infrastructure/Aws/LocalParameterProvider.cs b/src/api/Elastic.Documentation.Api.Infrastructure/Aws/LocalParameterProvider.cs
@@ -0,0 +1,38 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// 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
+
+namespace Elastic.Documentation.Api.Infrastructure.Aws;
+
+public class LocalParameterProvider : IParameterProvider
+{
+	public async Task<string> GetParam(string name, bool withDecryption = true, Cancel ctx = default)
+	{
+		switch (name)
+		{
+			case "/elastic-docs-v3/dev/llm-gateway-service-account":
+				{
+					const string envName = "LLM_GATEWAY_SERVICE_ACCOUNT_KEY_PATH";
+					var serviceAccountKeyPath = Environment.GetEnvironmentVariable(envName);
+					if (string.IsNullOrEmpty(serviceAccountKeyPath))
+						throw new ArgumentException($"Environment variable '{envName}' not found.");
+					if (!File.Exists(serviceAccountKeyPath))
+						throw new ArgumentException($"Service account key file not found at '{serviceAccountKeyPath}'.");
+					var serviceAccountKey = await File.ReadAllTextAsync(serviceAccountKeyPath, ctx);
+					return serviceAccountKey;
+				}
+			case "/elastic-docs-v3/dev/llm-gateway-function-url":
+				{
+					const string envName = "LLM_GATEWAY_FUNCTION_URL";
+					var value = Environment.GetEnvironmentVariable(envName);
+					if (string.IsNullOrEmpty(value))
+						throw new ArgumentException($"Environment variable '{envName}' not found.");
+					return value;
+				}
+			default:
+				{
+					throw new ArgumentException($"Parameter '{name}' not found in {nameof(LocalParameterProvider)}");
+				}
+		}
+	}
+}
diff --git a/src/api/Elastic.Documentation.Api.Infrastructure/Elastic.Documentation.Api.Infrastructure.csproj b/src/api/Elastic.Documentation.Api.Infrastructure/Elastic.Documentation.Api.Infrastructure.csproj
@@ -4,12 +4,12 @@
         <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <AssemblyName>Api.Infrastructure</AssemblyName>
-        <RootNamespace>Api.Infrastructure</RootNamespace>
+        <AssemblyName>Elastic.Documentation.Api.Infrastructure</AssemblyName>
+        <RootNamespace>Elastic.Documentation.Api.Infrastructure</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Core\Core.csproj" />
+      <ProjectReference Include="..\Elastic.Documentation.Api.Core\Elastic.Documentation.Api.Core.csproj" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/api/Elastic.Documentation.Api.Infrastructure/ServicesExtension.cs b/src/api/Elastic.Documentation.Api.Infrastructure/ServicesExtension.cs
@@ -3,13 +3,13 @@
 // See the LICENSE file in the project root for more information
 
 using System.ComponentModel.DataAnnotations;
-using Api.Core.AskAi;
-using Api.Infrastructure.Adapters;
-using Api.Infrastructure.Aws;
+using Elastic.Documentation.Api.Core.AskAi;
+using Elastic.Documentation.Api.Infrastructure.Adapters;
+using Elastic.Documentation.Api.Infrastructure.Aws;
 using Microsoft.Extensions.DependencyInjection;
 using NetEscapades.EnumGenerators;
 
-namespace Api.Infrastructure;
+namespace Elastic.Documentation.Api.Infrastructure;
 
 [EnumExtensions]
 public enum AppEnvironment
@@ -55,7 +55,7 @@ private static void AddParameterProvider(IServiceCollection services, AppEnviron
 				}
 			case AppEnvironment.Dev:
 				{
-					_ = services.AddSingleton<IParameterProvider, LocalEnvParameterProvider>();
+					_ = services.AddSingleton<IParameterProvider, LocalParameterProvider>();
 					break;
 				}
 			default:
diff --git a/src/api/Elastic.Documentation.Api.Lambda/AskAiEndpoint.cs b/src/api/Elastic.Documentation.Api.Lambda/AskAiEndpoint.cs
@@ -0,0 +1,20 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// 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 Elastic.Documentation.Api.Core.AskAi;
+
+namespace Elastic.Documentation.Api.Lambda;
+
+public static class AskAiEndpoint
+{
+	public static void MapAskAiEndpoint(this IEndpointRouteBuilder app)
+	{
+		var askAiGroup = app.MapGroup("/ask-ai");
+		_ = askAiGroup.MapPost("/stream", async (AskAiRequest askAiRequest, AskAiUsecase askAiUsecase, Cancel ctx) =>
+		{
+			var stream = await askAiUsecase.AskAi(askAiRequest, ctx);
+			return Results.Stream(stream, "text/event-stream");
+		});
+	}
+}
diff --git a/src/api/Elastic.Documentation.Api.Lambda/Dockerfile b/src/api/Elastic.Documentation.Api.Lambda/Dockerfile
diff --git a/src/api/Elastic.Documentation.Api.Lambda/Elastic.Documentation.Api.Lambda.csproj b/src/api/Elastic.Documentation.Api.Lambda/Elastic.Documentation.Api.Lambda.csproj
@@ -13,16 +13,17 @@
       <IsPublishable>true</IsPublishable>
       <PublishAot>true</PublishAot>
       <PublishTrimmed>true</PublishTrimmed>
+
       <EnableSdkContainerSupport>true</EnableSdkContainerSupport>
       <TrimmerSingleWarn>false</TrimmerSingleWarn>
       <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-
-      <RootNamespace>Elastic.Documentation.Lambda.Api</RootNamespace>
+      <EnableRequestDelegateGenerator>true</EnableRequestDelegateGenerator>
+      <InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.AspNetCore.Http.Generated</InterceptorsPreviewNamespaces>
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Core\Core.csproj" />
-      <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
+      <ProjectReference Include="..\Elastic.Documentation.Api.Core\Elastic.Documentation.Api.Core.csproj" />
+      <ProjectReference Include="..\Elastic.Documentation.Api.Infrastructure\Elastic.Documentation.Api.Infrastructure.csproj" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/api/Elastic.Documentation.Api.Lambda/Program.cs b/src/api/Elastic.Documentation.Api.Lambda/Program.cs
@@ -5,11 +5,11 @@
 using System.Text.Json.Serialization;
 using Amazon.Lambda.APIGatewayEvents;
 using Amazon.Lambda.Serialization.SystemTextJson;
-using Api.Core;
-using Api.Core.AskAi;
-using Api.Infrastructure;
+using Elastic.Documentation.Api.Core;
+using Elastic.Documentation.Api.Infrastructure;
+using Elastic.Documentation.Api.Lambda;
 
-var builder = WebApplication.CreateBuilder(args);
+var builder = WebApplication.CreateSlimBuilder(args);
 
 builder.Services.ConfigureHttpJsonOptions(options =>
 {
@@ -23,14 +23,10 @@
 
 var app = builder.Build();
 
-app.MapPost("/ask-ai/stream", async (AskAiRequest askAiRequest, AskAiUsecase askAiUsecase, Cancel ctx) =>
-{
-	var stream = await askAiUsecase.AskAi(askAiRequest, ctx);
-	return Results.Stream(stream, "text/event-stream");
-});
+app.MapAskAiEndpoint();
 
 app.Run();
 
 [JsonSerializable(typeof(APIGatewayHttpApiV2ProxyRequest), GenerationMode = JsonSourceGenerationMode.Metadata)]
 [JsonSerializable(typeof(APIGatewayHttpApiV2ProxyResponse), GenerationMode = JsonSourceGenerationMode.Default)]
-internal sealed partial class LambdaJsonSerializerContext : JsonSerializerContext { }
+internal sealed partial class LambdaJsonSerializerContext : JsonSerializerContext;
diff --git a/src/api/Elastic.Documentation.Api.Lambda/Properties/launchSettings.json b/src/api/Elastic.Documentation.Api.Lambda/Properties/launchSettings.json
diff --git a/src/api/Elastic.Documentation.Api.Lambda/appsettings.Development.json b/src/api/Elastic.Documentation.Api.Lambda/appsettings.Development.json
diff --git a/src/api/Elastic.Documentation.Api.Lambda/appsettings.json b/src/api/Elastic.Documentation.Api.Lambda/appsettings.json
diff --git a/src/api/Infrastructure/Aws/LocalEnvParameterProvider.cs b/src/api/Infrastructure/Aws/LocalEnvParameterProvider.cs
diff --git a/src/tooling/docs-builder/Http/DocumentationWebHost.cs b/src/tooling/docs-builder/Http/DocumentationWebHost.cs
@@ -7,10 +7,10 @@
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.Json;
-using Api.Core;
-using Api.Core.AskAi;
-using Api.Infrastructure.Adapters;
 using Documentation.Builder.Diagnostics.LiveMode;
+using Elastic.Documentation.Api.Core;
+using Elastic.Documentation.Api.Core.AskAi;
+using Elastic.Documentation.Api.Infrastructure.Adapters;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Configuration.Versions;
 using Elastic.Documentation.Site.FileProviders;
@@ -32,10 +32,12 @@ public class DocumentationWebHost
 
 	private readonly IHostedService _hostedService;
 	private readonly IFileSystem _writeFileSystem;
+	private readonly ILoggerFactory _logFactory;
 
 	public DocumentationWebHost(ILoggerFactory logFactory, string? path, int port, IFileSystem readFs, IFileSystem writeFs,
 		VersionsConfiguration versionsConfig)
 	{
+		_logFactory = logFactory;
 		_writeFileSystem = writeFs;
 		var builder = WebApplication.CreateSlimBuilder();
 		DocumentationTooling.CreateServiceCollection(builder.Services, LogLevel.Information);
@@ -224,14 +226,14 @@ private static IResult LiveReloadHtml(string content, Encoding? encoding = null,
 		return Results.Content(content, "text/html", encoding, statusCode);
 	}
 
-	private static async Task<IResult> ProxyChatRequest(HttpContext context, CancellationToken ctx)
+	private async Task<IResult> ProxyChatRequest(HttpContext context, CancellationToken ctx)
 	{
 		// Read the frontend request body
 		var requestBody = await new StreamReader(context.Request.Body).ReadToEndAsync(ctx);
 		var askAiRequest = JsonSerializer.Deserialize<AskAiRequest>(requestBody, ApiJsonContext.Default.AskAiRequest);
 
 		// Load GCP service account credentials
-		var serviceAccountKeyPath = Environment.GetEnvironmentVariable("LLM_GATEWAY_GCP_SERVICE_ACCOUNT_KEY_PATH")
+		var serviceAccountKeyPath = Environment.GetEnvironmentVariable("LLM_GATEWAY_SERVICE_ACCOUNT_KEY_PATH")
 									?? "service-account-key.json";
 
 		if (!File.Exists(serviceAccountKeyPath))
@@ -242,7 +244,7 @@ private static async Task<IResult> ProxyChatRequest(HttpContext context, Cancell
 		}
 
 		// Get GCP function URL
-		var gcpFunctionUrl = Environment.GetEnvironmentVariable("LLM_GATEWAY_GCP_FUNCTION_URL");
+		var gcpFunctionUrl = Environment.GetEnvironmentVariable("LLM_GATEWAY_FUNCTION_URL");
 		if (string.IsNullOrEmpty(gcpFunctionUrl))
 		{
 			context.Response.StatusCode = 500;
@@ -263,7 +265,8 @@ await File.ReadAllTextAsync(serviceAccountKeyPath, ctx),
 			gcpIdTokenProvider,
 			gcpFunctionUrl
 		);
-		var askAiUsecase = new AskAiUsecase(llmGatewayAskAiGateway);
+
+		var askAiUsecase = new AskAiUsecase(llmGatewayAskAiGateway, _logFactory.CreateLogger<AskAiUsecase>());
 
 		if (askAiRequest == null)
 			return Results.BadRequest("Invalid chat request.");
diff --git a/src/tooling/docs-builder/docs-builder.csproj b/src/tooling/docs-builder/docs-builder.csproj
@@ -26,8 +26,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\api\Core\Core.csproj" />
-    <ProjectReference Include="..\..\api\Infrastructure\Infrastructure.csproj" />
+    <ProjectReference Include="..\..\api\Elastic.Documentation.Api.Core\Elastic.Documentation.Api.Core.csproj" />
+    <ProjectReference Include="..\..\api\Elastic.Documentation.Api.Infrastructure\Elastic.Documentation.Api.Infrastructure.csproj" />
     <ProjectReference Include="..\..\Elastic.ApiExplorer\Elastic.ApiExplorer.csproj" />
     <ProjectReference Include="..\Elastic.Documentation.Tooling\Elastic.Documentation.Tooling.csproj" />
     <ProjectReference Include="..\..\authoring\Elastic.Documentation.Refactor\Elastic.Documentation.Refactor.csproj" />

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`using Microsoft.Extensions.Logging;`
`6`	`6`
`7`		`-namespace Api.Core.AskAi;`
	`7`	`+namespace Elastic.Documentation.Api.Core.AskAi;`
`8`	`8`
`9`	`9`	`public class AskAiUsecase(IAskAiGateway<Stream> askAiGateway, ILogger<AskAiUsecase> logger)`
`10`	`10`	`{`
`@@ -14,3 +14,5 @@ public async Task<Stream> AskAi(AskAiRequest askAiRequest, Cancel ctx)`
`14`	`14`	`return await askAiGateway.AskAi(askAiRequest, ctx);`
`15`	`15`	`}`
`16`	`16`	`}`
	`17`	`+`
	`18`	`+public record AskAiRequest(string Message, string? ThreadId);`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.`
`3`	`3`	`// See the LICENSE file in the project root for more information`
`4`	`4`
`5`		`-namespace Api.Core.AskAi;`
	`5`	`+namespace Elastic.Documentation.Api.Core.AskAi;`
`6`	`6`
`7`	`7`	`public interface IAskAiGateway<T>`
`8`	`8`	`{`