Add Dapr sidecar port environment variables (#4086)

* Add Dapr sidecar port environment variablea * Cast int to string? * Fix
dotnet · Aug 5, 2024 · db86cef · db86cef
1 parent 4c96d90
commit db86cef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/Aspire.Hosting.Dapr/DaprDistributedApplicationLifecycleHook.cs b/src/Aspire.Hosting.Dapr/DaprDistributedApplicationLifecycleHook.cs
@@ -9,6 +9,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Net.Sockets;
 using static Aspire.Hosting.Dapr.CommandLineArgs;
 
@@ -148,6 +149,9 @@ public async Task BeforeStartAsync(DistributedApplicationModel appModel, Cancell
                         var http = daprCli.GetEndpoint("http");
                         var grpc = daprCli.GetEndpoint("grpc");
 
+                        context.EnvironmentVariables.TryAdd("DAPR_HTTP_PORT", http.Port.ToString(CultureInfo.InvariantCulture));
+                        context.EnvironmentVariables.TryAdd("DAPR_GRPC_PORT", grpc.Port.ToString(CultureInfo.InvariantCulture));
+
                         context.EnvironmentVariables.TryAdd("DAPR_GRPC_ENDPOINT", grpc);
                         context.EnvironmentVariables.TryAdd("DAPR_HTTP_ENDPOINT", http);
                     }));

diff --git a/tests/Aspire.Hosting.Tests/Dapr/DaprTests.cs b/tests/Aspire.Hosting.Tests/Dapr/DaprTests.cs
@@ -57,6 +57,9 @@ public async Task WithDaprSideCarAddsAnnotationAndSidecarResource()
         var config = await EnvironmentVariableEvaluator.GetEnvironmentVariablesAsync(container, DistributedApplicationOperation.Run, TestServiceProvider.Instance);
         var sidecarArgs = await ArgumentEvaluator.GetArgumentListAsync(sideCarCli);
 
+        Assert.Equal("3500", config["DAPR_HTTP_PORT"]);
+        Assert.Equal("50001", config["DAPR_GRPC_PORT"]);
+
         Assert.Equal("http://localhost:3500", config["DAPR_HTTP_ENDPOINT"]);
         Assert.Equal("http://localhost:50001", config["DAPR_GRPC_ENDPOINT"]);