Skip to content
Merged
Changes from 1 commit
Commits
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
Fix build
  • Loading branch information
DamianEdwards authored and BrennanConroy committed Jul 10, 2025
commit 22c3391d8a88de8042ce61f693da9be92ddd2ece
71 changes: 36 additions & 35 deletions src/Aspire.Hosting/Orchestrator/ApplicationOrchestrator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -222,55 +222,56 @@ private async Task ProcessResourceUrlCallbacks(IResource resource, CancellationT
url = new ResourceUrlAnnotation { Url = $"{allocatedEndpoint.UriScheme}://{address}:{allocatedEndpoint.Port}", Endpoint = endpointReference };
urls.Add(url);
}
}
}
}

if (resource.TryGetUrls(out var existingUrls))
{
// Static URLs added to the resource via WithUrl(string name, string url), i.e. not callback-based
urls.AddRange(existingUrls);
}

// Run the URL callbacks
if (resource.TryGetAnnotationsOfType<ResourceUrlsCallbackAnnotation>(out var callbacks))
{
var urlsCallbackContext = new ResourceUrlsCallbackContext(_executionContext, resource, urls, cancellationToken)
if (resource.TryGetUrls(out var existingUrls))
{
Logger = _loggerService.GetLogger(resource.Name)
};
foreach (var callback in callbacks)
// Static URLs added to the resource via WithUrl(string name, string url), i.e. not callback-based
urls.AddRange(existingUrls);
}

// Run the URL callbacks
if (resource.TryGetAnnotationsOfType<ResourceUrlsCallbackAnnotation>(out var callbacks))
{
await callback.Callback(urlsCallbackContext).ConfigureAwait(false);
var urlsCallbackContext = new ResourceUrlsCallbackContext(_executionContext, resource, urls, cancellationToken)
{
Logger = _loggerService.GetLogger(resource.Name)
};
foreach (var callback in callbacks)
{
await callback.Callback(urlsCallbackContext).ConfigureAwait(false);
}
}
}

// Clear existing URLs
if (existingUrls is not null)
{
var existing = existingUrls.ToArray();
for (var i = existing.Length - 1; i >= 0; i--)
// Clear existing URLs
if (existingUrls is not null)
{
var url = existing[i];
resource.Annotations.Remove(url);
var existing = existingUrls.ToArray();
for (var i = existing.Length - 1; i >= 0; i--)
{
var url = existing[i];
resource.Annotations.Remove(url);
}
}
}

// Convert relative endpoint URLs to absolute URLs
foreach (var url in urls)
{
if (url.Endpoint is { } endpoint)
// Convert relative endpoint URLs to absolute URLs
foreach (var url in urls)
{
if (url.Url.StartsWith('/') && endpoint.AllocatedEndpoint is { } allocatedEndpoint)
if (url.Endpoint is { } endpoint)
{
url.Url = allocatedEndpoint.UriString.TrimEnd('/') + url.Url;
if (url.Url.StartsWith('/') && endpoint.AllocatedEndpoint is { } allocatedEndpoint)
{
url.Url = allocatedEndpoint.UriString.TrimEnd('/') + url.Url;
}
}
}
}

// Add URLs
foreach (var url in urls)
{
resource.Annotations.Add(url);
// Add URLs
foreach (var url in urls)
{
resource.Annotations.Add(url);
}
}
}

Expand Down