|
19 | 19 | using Aspire.Dashboard.Model; |
20 | 20 | using Aspire.Hosting.Dcp; |
21 | 21 | using Aspire.Hosting.Dcp.Model; |
| 22 | +using Aspire.Hosting.DevTunnels; |
22 | 23 | using Aspire.Hosting.Diagnostics; |
23 | 24 | using Aspire.Hosting.Publishing; |
24 | 25 | using Aspire.Hosting.Tests.Utils; |
@@ -1051,6 +1052,88 @@ public async Task EndpointPortsExecutableNotReplicatedProxylessNoPortNoTargetPor |
1051 | 1052 | Assert.Equal(allocatedPort, int.Parse(envVarVal, CultureInfo.InvariantCulture)); |
1052 | 1053 | } |
1053 | 1054 |
|
| 1055 | + [Fact] |
| 1056 | + public async Task ProxylessPortAllocatorOnlyAllocatesPortsForDcpWorkloads() |
| 1057 | + { |
| 1058 | + var (rangeStart, rangeEnd) = GetAvailableConsecutivePortPair(); |
| 1059 | + var builder = DistributedApplication.CreateBuilder(); |
| 1060 | + |
| 1061 | + var compute = builder.AddExecutable("compute", "compute", Environment.CurrentDirectory) |
| 1062 | + .WithEndpoint(name: "tcp", isProxied: false); |
| 1063 | + var target = builder.AddExecutable("target", "target", Environment.CurrentDirectory) |
| 1064 | + .WithHttpEndpoint(targetPort: 8000, name: "http"); |
| 1065 | + builder.AddDevTunnel("tunnel") |
| 1066 | + .WithReference(target); |
| 1067 | + |
| 1068 | + var dcpOptions = new DcpOptions |
| 1069 | + { |
| 1070 | + DashboardPath = "./dashboard", |
| 1071 | + ProxylessEndpointPortRangeStart = rangeStart, |
| 1072 | + ProxylessEndpointPortRangeEnd = rangeEnd |
| 1073 | + }; |
| 1074 | + var kubernetesService = new TestKubernetesService(); |
| 1075 | + using var app = builder.Build(); |
| 1076 | + var distributedAppModel = app.Services.GetRequiredService<DistributedApplicationModel>(); |
| 1077 | + var tunnelPort = Assert.Single(distributedAppModel.Resources.OfType<DevTunnelPortResource>()); |
| 1078 | + var computeEndpoint = compute.GetEndpoint("tcp").EndpointAnnotation; |
| 1079 | + var tunnelEndpoint = Assert.Single(tunnelPort.Annotations.OfType<EndpointAnnotation>()); |
| 1080 | + var appExecutor = CreateAppExecutor(distributedAppModel, kubernetesService: kubernetesService, dcpOptions: dcpOptions); |
| 1081 | + |
| 1082 | + await appExecutor.RunApplicationAsync(); |
| 1083 | + |
| 1084 | + Assert.NotNull(computeEndpoint.AllocatedEndpoint); |
| 1085 | + var computePort = Assert.IsType<int>(computeEndpoint.Port); |
| 1086 | + Assert.InRange(computePort, rangeStart, rangeEnd); |
| 1087 | + Assert.Equal(computePort, computeEndpoint.TargetPort); |
| 1088 | + Assert.Null(tunnelEndpoint.Port); |
| 1089 | + Assert.Null(tunnelEndpoint.TargetPort); |
| 1090 | + Assert.Null(tunnelEndpoint.AllocatedEndpoint); |
| 1091 | + } |
| 1092 | + |
| 1093 | + [Fact] |
| 1094 | + public async Task ProxylessPortAllocatorAllocatesPortForNonComputeContainerResource() |
| 1095 | + { |
| 1096 | + const int targetPort = 10000; |
| 1097 | + var (allocatedPort, _) = GetAvailableConsecutivePortPair(); |
| 1098 | + var builder = DistributedApplication.CreateBuilder(); |
| 1099 | + |
| 1100 | + var emulator = builder.AddResource(new TestContainerResource("emulator")) |
| 1101 | + .WithAnnotation(new ContainerImageAnnotation { Image = "image" }) |
| 1102 | + .WithAnnotation(new ContainerLifetimeAnnotation { Lifetime = ContainerLifetime.Persistent }) |
| 1103 | + .WithHttpEndpoint(targetPort: targetPort, name: "http"); |
| 1104 | + |
| 1105 | + var configuration = new ConfigurationBuilder() |
| 1106 | + .AddInMemoryCollection(new Dictionary<string, string?> |
| 1107 | + { |
| 1108 | + ["AppHost:Sha256"] = "1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef" |
| 1109 | + }) |
| 1110 | + .Build(); |
| 1111 | + var dcpOptions = new DcpOptions |
| 1112 | + { |
| 1113 | + DashboardPath = "./dashboard", |
| 1114 | + ProxylessEndpointPortRangeStart = allocatedPort, |
| 1115 | + ProxylessEndpointPortRangeEnd = allocatedPort |
| 1116 | + }; |
| 1117 | + var kubernetesService = new TestKubernetesService(); |
| 1118 | + using var app = builder.Build(); |
| 1119 | + var distributedAppModel = app.Services.GetRequiredService<DistributedApplicationModel>(); |
| 1120 | + var endpoint = emulator.GetEndpoint("http").EndpointAnnotation; |
| 1121 | + var appExecutor = CreateAppExecutor( |
| 1122 | + distributedAppModel, |
| 1123 | + configuration: configuration, |
| 1124 | + kubernetesService: kubernetesService, |
| 1125 | + dcpOptions: dcpOptions); |
| 1126 | + |
| 1127 | + await appExecutor.RunApplicationAsync(); |
| 1128 | + |
| 1129 | + Assert.IsNotAssignableFrom<IComputeResource>(emulator.Resource); |
| 1130 | + Assert.True(emulator.Resource.IsContainer()); |
| 1131 | + Assert.Equal(allocatedPort, endpoint.Port); |
| 1132 | + Assert.Equal(targetPort, endpoint.TargetPort); |
| 1133 | + Assert.Equal(allocatedPort, endpoint.AllocatedEndpoint?.Port); |
| 1134 | + Assert.Single(kubernetesService.CreatedResources.OfType<Container>(), c => c.AppModelResourceName == emulator.Resource.Name); |
| 1135 | + } |
| 1136 | + |
1054 | 1137 | [Fact] |
1055 | 1138 | public async Task ProxylessPortAllocatorExcludesFixedPublicPorts() |
1056 | 1139 | { |
@@ -9580,6 +9663,7 @@ private static X509Certificate2 CreateTestCertificate() |
9580 | 9663 |
|
9581 | 9664 | private sealed class TestExecutableResource(string directory) : ExecutableResource("TestExecutable", "test", directory); |
9582 | 9665 | private sealed class TestOtherExecutableResource(string directory) : ExecutableResource("TestOtherExecutable", "test-other", directory); |
| 9666 | + private sealed class TestContainerResource(string name) : Resource(name), IResourceWithEndpoints; |
9583 | 9667 |
|
9584 | 9668 | private sealed class NullValueProvider : IValueProvider |
9585 | 9669 | { |
|
0 commit comments