dotnet · mitchdenny · Jul 18, 2024 · Jun 8, 2024 · Jun 9, 2024 · Jun 10, 2024
diff --git a/Aspire.sln b/Aspire.sln
@@ -1,4 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -487,18 +488,22 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Milvus.Client.Tests"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.Azure.WebPubSub", "src\Aspire.Hosting.Azure.WebPubSub\Aspire.Hosting.Azure.WebPubSub.csproj", "{DF00FDA3-D3EC-4E07-B4EC-0EBB57A813A4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.Hosting.Valkey", "src\Aspire.Hosting.Valkey\Aspire.Hosting.Valkey.csproj", "{5CB63205-24F4-4388-A41B-BAF3BEA59866}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.Valkey", "src\Aspire.Hosting.Valkey\Aspire.Hosting.Valkey.csproj", "{5CB63205-24F4-4388-A41B-BAF3BEA59866}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.Elasticsearch", "src\Aspire.Hosting.Elasticsearch\Aspire.Hosting.Elasticsearch.csproj", "{9357EC71-823B-433A-9993-B7CB2FA082D1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Elasticsearch", "Elasticsearch", "{5C28905E-0EE2-41C2-A161-7400671E66F7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elasticseach.AppHost", "playground\Elasticseach\Elasticseach.AppHost\Elasticseach.AppHost.csproj", "{4926BEFF-6A63-422F-8758-BB8EBEDD6BE8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elasticseach.ApiService", "playground\Elasticseach\Elasticseach.ApiService\Elasticseach.ApiService.csproj", "{A923A2F5-1DA9-4D37-A2C1-7005051CE774}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5CB63205-24F4-4388-A41B-BAF3BEA59866}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5CB63205-24F4-4388-A41B-BAF3BEA59866}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5CB63205-24F4-4388-A41B-BAF3BEA59866}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5CB63205-24F4-4388-A41B-BAF3BEA59866}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B52DCF1A-465D-4E92-A68A-0EE1A9ED49DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B52DCF1A-465D-4E92-A68A-0EE1A9ED49DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B52DCF1A-465D-4E92-A68A-0EE1A9ED49DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1287,12 +1292,27 @@ Global
 		{DF00FDA3-D3EC-4E07-B4EC-0EBB57A813A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DF00FDA3-D3EC-4E07-B4EC-0EBB57A813A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DF00FDA3-D3EC-4E07-B4EC-0EBB57A813A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5CB63205-24F4-4388-A41B-BAF3BEA59866}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5CB63205-24F4-4388-A41B-BAF3BEA59866}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5CB63205-24F4-4388-A41B-BAF3BEA59866}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5CB63205-24F4-4388-A41B-BAF3BEA59866}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9357EC71-823B-433A-9993-B7CB2FA082D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9357EC71-823B-433A-9993-B7CB2FA082D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9357EC71-823B-433A-9993-B7CB2FA082D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9357EC71-823B-433A-9993-B7CB2FA082D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4926BEFF-6A63-422F-8758-BB8EBEDD6BE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4926BEFF-6A63-422F-8758-BB8EBEDD6BE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4926BEFF-6A63-422F-8758-BB8EBEDD6BE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4926BEFF-6A63-422F-8758-BB8EBEDD6BE8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A923A2F5-1DA9-4D37-A2C1-7005051CE774}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A923A2F5-1DA9-4D37-A2C1-7005051CE774}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A923A2F5-1DA9-4D37-A2C1-7005051CE774}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A923A2F5-1DA9-4D37-A2C1-7005051CE774}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{5CB63205-24F4-4388-A41B-BAF3BEA59866} = {B80354C7-BE58-43F6-8928-9F3A74AB7F47}
 		{B52DCF1A-465D-4E92-A68A-0EE1A9ED49DF} = {B80354C7-BE58-43F6-8928-9F3A74AB7F47}
 		{E958BE04-81C2-434C-9E6C-CA145A2B8218} = {A68BA1A5-1604-433D-9778-DC0199831C2A}
 		{C1D595AD-FFFD-4E52-AAF6-8DD8C4BD67F1} = {A68BA1A5-1604-433D-9778-DC0199831C2A}
@@ -1521,6 +1541,11 @@ Global
 		{1BFE3C02-3B81-4596-99A2-4DCDD9129C9A} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
 		{9FAE1602-2C69-4D24-8655-A164489441E8} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
 		{DF00FDA3-D3EC-4E07-B4EC-0EBB57A813A4} = {77CFE74A-32EE-400C-8930-5025E8555256}
+		{5CB63205-24F4-4388-A41B-BAF3BEA59866} = {B80354C7-BE58-43F6-8928-9F3A74AB7F47}
+		{9357EC71-823B-433A-9993-B7CB2FA082D1} = {B80354C7-BE58-43F6-8928-9F3A74AB7F47}
+		{5C28905E-0EE2-41C2-A161-7400671E66F7} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
+		{4926BEFF-6A63-422F-8758-BB8EBEDD6BE8} = {5C28905E-0EE2-41C2-A161-7400671E66F7}
+		{A923A2F5-1DA9-4D37-A2C1-7005051CE774} = {5C28905E-0EE2-41C2-A161-7400671E66F7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6DCEDFEC-988E-4CB3-B45B-191EB5086E0C}

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -103,7 +103,7 @@
     <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.1" />
     <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.7.2" />
     <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.7.2" />
-    <PackageVersion Include="Milvus.Client" Version="2.3.0-preview.1"/>
+    <PackageVersion Include="Milvus.Client" Version="2.3.0-preview.1" />
     <PackageVersion Include="MongoDB.Driver" Version="2.25.0" />
     <PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.4.0" />
     <PackageVersion Include="MySqlConnector.DependencyInjection" Version="2.3.6" />
@@ -120,6 +120,7 @@
     <PackageVersion Include="StackExchange.Redis" Version="2.7.33" />
     <PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
     <PackageVersion Include="Yarp.ReverseProxy" Version="2.1.0" />
+    <PackageVersion Include="Elasticsearch.Net" Version="7.17.5" />
     <!-- Open Telemetry -->
     <PackageVersion Include="Npgsql.OpenTelemetry" Version="8.0.3" />
     <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.8.1" />
@@ -154,7 +155,6 @@
     <PackageVersion Include="Testcontainers.Redis" Version="$(TestcontainersPackageVersion)" />
     <PackageVersion Include="Testcontainers.Nats" Version="$(TestcontainersPackageVersion)" />
     <PackageVersion Include="Testcontainers.Milvus" Version="$(TestcontainersPackageVersion)" />
-
     <!-- playground apps dependencies -->
     <PackageVersion Include="Dapr.AspNetCore" Version="1.13.1" />
     <PackageVersion Include="Microsoft.Orleans.Clustering.AzureStorage" Version="8.1.0" />

diff --git a/playground/Elasticseach/Elasticseach.ApiService/Elasticseach.ApiService.csproj b/playground/Elasticseach/Elasticseach.ApiService/Elasticseach.ApiService.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Elasticsearch.Net" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Aspire.Hosting.Elasticsearch\Aspire.Hosting.Elasticsearch.csproj" />
+    <ProjectReference Include="..\..\Playground.ServiceDefaults\Playground.ServiceDefaults.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/playground/Elasticseach/Elasticseach.ApiService/Program.cs b/playground/Elasticseach/Elasticseach.ApiService/Program.cs
@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Elasticsearch.Net;
+
+var builder = WebApplication.CreateBuilder(args);
+
+builder.AddServiceDefaults();
+
+builder.Services.AddSingleton<ElasticLowLevelClient>((sp) =>
+{
+    var settings = new ConnectionConfiguration(new Uri(builder.Configuration.GetConnectionString("elasticsearch")!))
+    .RequestTimeout(TimeSpan.FromMinutes(2));
+
+    var lowlevelClient = new ElasticLowLevelClient(settings);
+    return lowlevelClient;
+});
+
+var app = builder.Build();
+
+app.MapGet("/", async (ElasticLowLevelClient elasticClient) =>
+{
+    var response = await elasticClient.GetAsync<StringResponse>("people", "1");
+    return response.Body;
+});
+
+app.MapPost("/", async (ElasticLowLevelClient elasticClient) =>
+{
+    var person = new
+    {
+        FirstName = "Alireza",
+        LastName = "Baloochi"
+    };
+
+    var response = await elasticClient.IndexAsync<StringResponse>("people", "1", PostData.Serializable(person));
+    return response.Body;
+});
+
+app.Run();
diff --git a/playground/Elasticseach/Elasticseach.ApiService/Properties/launchSettings.json b/playground/Elasticseach/Elasticseach.ApiService/Properties/launchSettings.json
@@ -0,0 +1,38 @@
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:4855",
+      "sslPort": 44376
+    }
+  },
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "http://localhost:5053",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:7158;http://localhost:5053",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/playground/Elasticseach/Elasticseach.ApiService/appsettings.Development.json b/playground/Elasticseach/Elasticseach.ApiService/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}
diff --git a/playground/Elasticseach/Elasticseach.ApiService/appsettings.json b/playground/Elasticseach/Elasticseach.ApiService/appsettings.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}
diff --git a/playground/Elasticseach/Elasticseach.AppHost/Directory.Build.props b/playground/Elasticseach/Elasticseach.AppHost/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
+  <!-- NOTE: This line is only required because we are using P2P references, not NuGet. It will not exist in real apps. -->
+  <Import Project="../../../src/Aspire.Hosting.AppHost/build/Aspire.Hosting.AppHost.props" />
+
+</Project>
diff --git a/playground/Elasticseach/Elasticseach.AppHost/Directory.Build.targets b/playground/Elasticseach/Elasticseach.AppHost/Directory.Build.targets
@@ -0,0 +1,9 @@
+<Project>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
+
+  <!-- NOTE: These lines are only required because we are using P2P references, not NuGet. They will not exist in real apps. -->
+  <Import Project="..\..\..\src\Aspire.Hosting.AppHost\build\Aspire.Hosting.AppHost.targets" />
+  <Import Project="..\..\..\src\Aspire.Hosting.Sdk\SDK\Sdk.targets" />
+
+</Project>
diff --git a/playground/Elasticseach/Elasticseach.AppHost/Elasticseach.AppHost.csproj b/playground/Elasticseach/Elasticseach.AppHost/Elasticseach.AppHost.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsAspireHost>true</IsAspireHost>
+    <UserSecretsId>76c9a20b-a2cc-4874-8d26-6fbe827d11bf</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Aspire.Dashboard\Aspire.Dashboard.csproj" />
+    <ProjectReference Include="..\..\..\src\Aspire.Hosting.AppHost\Aspire.Hosting.AppHost.csproj" IsAspireProjectResource="false" />
+    <ProjectReference Include="..\..\..\src\Aspire.Hosting.Elasticsearch\Aspire.Hosting.Elasticsearch.csproj" IsAspireProjectResource="false" />
+    <ProjectReference Include="..\Elasticseach.ApiService\Elasticseach.ApiService.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="$(SharedDir)KnownResourceNames.cs" Link="KnownResourceNames.cs" />
+  </ItemGroup>
+</Project>
diff --git a/playground/Elasticseach/Elasticseach.AppHost/Program.cs b/playground/Elasticseach/Elasticseach.AppHost/Program.cs
@@ -0,0 +1,21 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Projects;
+
+var builder = DistributedApplication.CreateBuilder(args);
+
+var elasticsearch = builder.AddElasticsearch("elasticsearch")
+    .WithDataVolume("data");
+
+builder.AddProject<Elasticseach_ApiService>("elasticsearch-apiservice")
+    .WithReference(elasticsearch);
+
+// This project is only added in playground projects to support development/debugging
+// of the dashboard. It is not required in end developer code. Comment out this code
+// to test end developer dashboard launch experience. Refer to Directory.Build.props
+// for the path to the dashboard binary (defaults to the Aspire.Dashboard bin output
+// in the artifacts dir).
+builder.AddProject<Projects.Aspire_Dashboard>(KnownResourceNames.AspireDashboard);
+
+builder.Build().Run();
diff --git a/playground/Elasticseach/Elasticseach.AppHost/Properties/launchSettings.json b/playground/Elasticseach/Elasticseach.AppHost/Properties/launchSettings.json
@@ -0,0 +1,29 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:17196;http://localhost:15122",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21146",
+        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22194"
+      }
+    },
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "http://localhost:15122",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19117",
+        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20104"
+      }
+    }
+  }
+}
diff --git a/playground/Elasticseach/Elasticseach.AppHost/appsettings.Development.json b/playground/Elasticseach/Elasticseach.AppHost/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}
diff --git a/playground/Elasticseach/Elasticseach.AppHost/appsettings.json b/playground/Elasticseach/Elasticseach.AppHost/appsettings.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Aspire.Hosting.Dcp": "Warning"
+    }
+  }
+}
diff --git a/src/Aspire.Hosting.Elasticsearch/Aspire.Hosting.Elasticsearch.csproj b/src/Aspire.Hosting.Elasticsearch/Aspire.Hosting.Elasticsearch.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>$(NetCurrent)</TargetFramework>
+    <IsPackable>true</IsPackable>
+    <PackageTags>aspire hosting elasticsearch</PackageTags>
+    <Description>Elasticsearch support for .NET Aspire.</Description>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(SharedDir)VolumeNameGenerator.cs" Link="Utils\VolumeNameGenerator.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="Aspire.Hosting.Tests" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Aspire.Hosting\Aspire.Hosting.csproj" />
+  </ItemGroup>
+</Project>