Skip to content

test(hosting): fix Outerloop tests asserting null proxyless EffectivePort #18249

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

Closed
Ankit Jain (radical) wants to merge 1 commit into from
Closed

test(hosting): fix Outerloop tests asserting null proxyless EffectivePort #18249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 20 additions & 5 deletions tests/Aspire.Hosting.Tests/DistributedApplicationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1809,7 +1809,6 @@ public async Task ProxylessContainerCanBeReferenced()
await clientA.GetStringAsync("/").DefaultTimeout(TestConstants.DefaultOrchestratorTestTimeout);

var s = app.Services.GetRequiredService<IKubernetesService>();
var serviceList = await s.ListAsync<Service>().DefaultTimeout();
var exeList = await s.ListAsync<Executable>().DefaultTimeout();

var service = Assert.Single(exeList, c => $"{testName}-servicea".Equals(c.AppModelResourceName));
Expand All @@ -1831,7 +1830,8 @@ public async Task ProxylessContainerCanBeReferenced()
Assert.Equal(port, Assert.Single(redisContainer.Spec.Ports!).HostPort);
}

var otherRedisService = GetEndpointService(serviceList, redisNoPort.Resource, redisNoPort.Resource.PrimaryEndpoint);
var otherRedisService = await WaitForAllocatedProxylessServiceAsync(s, redisNoPort.Resource, redisNoPort.Resource.PrimaryEndpoint)
.DefaultTimeout(TestConstants.DefaultOrchestratorTestLongTimeout);
var otherRedisPort = AssertAllocatedProxylessPort(otherRedisService);
var otherRedisEnv = Assert.Single(service.Spec.Env!, e => e.Name == $"ConnectionStrings__{testName}-redisNoPort");
sslVal = redisNoPort.Resource.TlsEnabled ? ",ssl=true" : string.Empty;
Expand Down Expand Up @@ -1908,7 +1908,8 @@ public async Task WithEndpointProxySupportDisablesProxies()
Assert.Equal(port, Assert.Single(redisContainer.Spec.Ports!).HostPort);
}

var otherRedisService = GetEndpointService(serviceList, redisNoPort.Resource, redisNoPort.Resource.PrimaryEndpoint);
var otherRedisService = await WaitForAllocatedProxylessServiceAsync(s, redisNoPort.Resource, redisNoPort.Resource.PrimaryEndpoint)
.DefaultTimeout(TestConstants.DefaultOrchestratorTestLongTimeout);
var otherRedisPort = AssertAllocatedProxylessPort(otherRedisService);
var otherRedisEnv = Assert.Single(service.Spec.Env!, e => e.Name == $"ConnectionStrings__{testName}-redisNoPort");
sslVal = redisNoPort.Resource.TlsEnabled ? ",ssl=true" : string.Empty;
Expand Down Expand Up @@ -2304,11 +2305,25 @@ private static IResourceBuilder<ContainerResource> AddRedisContainer(IDistribute
.WithImageRegistry(AspireTestContainerRegistry);
}

private static Service GetEndpointService(IEnumerable<Service> services, RedisResource redis, EndpointReference endpoint)
private static Task<Service> WaitForAllocatedProxylessServiceAsync(IKubernetesService kubernetesService, RedisResource redis, EndpointReference endpoint, CancellationToken cancellationToken = default)
{
var hasMultipleEndpoints = redis.Annotations.OfType<EndpointAnnotation>().Count() > 1;
var expectedServiceName = hasMultipleEndpoints ? $"{redis.Name}-{endpoint.EndpointName}" : redis.Name;
return Assert.Single(services, s => string.Equals(s.Metadata.Name, expectedServiceName, StringComparison.Ordinal));

// A proxyless endpoint's host port is assigned synchronously by Aspire (Service.Spec.Port),
// but DCP reports the actually-bound port back asynchronously via Service.Status.EffectivePort.
// Orchestrator startup intentionally does NOT wait for DCP to echo the effective address of
// proxyless services (they are excluded from the startup address-wait in DcpExecutor) because
// connection strings are built from the Aspire-assigned Spec.Port and are usable immediately.
// As a result, a fast agent can observe the Service before DCP has populated EffectivePort, so
// wait until it appears before asserting on it (otherwise the EffectivePort assertion in
// AssertAllocatedProxylessPort races and is null on fast Linux CI agents while passing on Windows).
return KubernetesHelper.GetResourceByNameAsync<Service>(
kubernetesService,
expectedServiceName,
string.Empty,
service => service.Status?.EffectivePort is not null,
cancellationToken);
}

private static int AssertAllocatedProxylessPort(Service service)
Expand Down
Loading