Skip to content

Allow HostUrl to remap both address and port #12521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danegsta merged 16 commits into from
Oct 31, 2025
+231 −147
Merged

Allow HostUrl to remap both address and port #12521

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1e87bfd
Allow HostUrl to remap both address and port
danegsta Oct 30, 2025
da15e5a
Fix method signature in test
danegsta Oct 30, 2025
c72f38a
Check correct context value
danegsta Oct 30, 2025
d09b84a
Fix failing tests
danegsta Oct 30, 2025
6bc79de
Remove compatibility suppression that no longer applies
danegsta Oct 30, 2025
e88e58f
Fix more tests
danegsta Oct 30, 2025
037a613
REmove unused code
danegsta Oct 30, 2025
904eecc
Add comments and enable tunnel in yarp playground
danegsta Oct 30, 2025
107669f
Update test helper to ask for specific endpoint
danegsta Oct 30, 2025
1a33f05
Ensure allocated endpoint checks still work the same
danegsta Oct 30, 2025
3d8b2de
Updated method compat
danegsta Oct 30, 2025
83f2abf
Optional method
danegsta Oct 30, 2025
0a5a17f
Don't add ambiguous method
danegsta Oct 30, 2025
be99467
Merge remote-tracking branch 'upstream/main' into danegsta/hostUrl
danegsta Oct 31, 2025
f62a759
Merge remote-tracking branch 'upstream/main' into danegsta/hostUrl
danegsta Oct 31, 2025
8dbc77f
Add additional comments and move config to appsettings
danegsta Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated method compat
  • Loading branch information
@danegsta
danegsta committed Oct 30, 2025
commit 3d8b2de74bf4e2496fc6f0a5730a037e7cd7552f
19 changes: 18 additions & 1 deletion src/Aspire.Hosting.Testing/DistributedApplicationHostingTestingExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,23 @@ public static HttpClient CreateHttpClient(this DistributedApplication app, strin
return resourceWithConnectionString.GetConnectionStringAsync(cancellationToken);
}

/// <summary>
/// Gets the endpoint for the specified resource.
/// </summary>
/// <param name="app">The application.</param>
/// <param name="resourceName">The resource name.</param>
/// <param name="endpointName">The optional endpoint name. If none are specified, the single defined endpoint is returned.</param>
/// <returns>A URI representation of the endpoint.</returns>
/// <exception cref="ArgumentException">The resource was not found, no matching endpoint was found, or multiple endpoints were found.</exception>
/// <exception cref="InvalidOperationException">The resource has no endpoints.</exception>
public static Uri GetEndpoint(this DistributedApplication app, string resourceName, string? endpointName = default)
{
ArgumentNullException.ThrowIfNull(app);
ArgumentException.ThrowIfNullOrEmpty(resourceName);

return GetEndpoint(app, resourceName, endpointName, networkIdentifier: null);
}

/// <summary>
/// Gets the endpoint for the specified resource.
/// </summary>
Expand All @@ -64,7 +81,7 @@ public static HttpClient CreateHttpClient(this DistributedApplication app, strin
/// <returns>A URI representation of the endpoint.</returns>
/// <exception cref="ArgumentException">The resource was not found, no matching endpoint was found, or multiple endpoints were found.</exception>
/// <exception cref="InvalidOperationException">The resource has no endpoints.</exception>
public static Uri GetEndpoint(this DistributedApplication app, string resourceName, string? endpointName = default, NetworkIdentifier? networkIdentifier = default)
public static Uri GetEndpoint(this DistributedApplication app, string resourceName, string? endpointName = default, NetworkIdentifier? networkIdentifier)
{
ArgumentNullException.ThrowIfNull(app);
ArgumentException.ThrowIfNullOrEmpty(resourceName);
Expand Down
14 changes: 14 additions & 0 deletions src/Aspire.Hosting/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,20 @@
<Right>lib/net8.0/Aspire.Hosting.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Aspire.Hosting.ApplicationModel.ResourceExtensions.ProcessArgumentValuesAsync(Aspire.Hosting.ApplicationModel.IResource,Aspire.Hosting.DistributedApplicationExecutionContext,System.Action{System.Object,System.String,System.Exception,System.Boolean},Microsoft.Extensions.Logging.ILogger,System.String,System.Threading.CancellationToken)</Target>
<Left>lib/net8.0/Aspire.Hosting.dll</Left>
<Right>lib/net8.0/Aspire.Hosting.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Aspire.Hosting.ApplicationModel.ResourceExtensions.ProcessEnvironmentVariableValuesAsync(Aspire.Hosting.ApplicationModel.IResource,Aspire.Hosting.DistributedApplicationExecutionContext,System.Action{System.String,System.Object,System.String,System.Exception},Microsoft.Extensions.Logging.ILogger,System.String,System.Threading.CancellationToken)</Target>
<Left>lib/net8.0/Aspire.Hosting.dll</Left>
<Right>lib/net8.0/Aspire.Hosting.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Aspire.Hosting.IInteractionService.PromptInputsAsync(System.String,System.String,System.Collections.Generic.IReadOnlyList{Aspire.Hosting.InteractionInput},Aspire.Hosting.InputsDialogInteractionOptions,System.Threading.CancellationToken)</Target>
Expand Down
Loading