Tests

Author: JamesNK

tests/Aspire.Hosting.Tests/Dcp/ApplicationExecutorTests.cs

@@ -349,7 +349,7 @@ public async Task UnsupportedEndpointPortsExecutableNotReplicatedProxyless()
 
     [Theory]
     [InlineData(1, "ServiceA")]
-    [InlineData(2, "ServiceA-suffix")]
+    [InlineData(2, "ServiceA")]
     public async Task EndpointOtelServiceName(int replicaCount, string expectedName)
     {
         var builder = DistributedApplication.CreateBuilder(new DistributedApplicationOptions
@@ -367,8 +367,13 @@ public async Task EndpointOtelServiceName(int replicaCount, string expectedName)
         var appExecutor = CreateAppExecutor(distributedAppModel, app.Services, kubernetesService: kubernetesService, dcpOptions: dcpOptions);
         await appExecutor.RunApplicationAsync();
 
-        var ers = Assert.Single(kubernetesService.CreatedResources.OfType<ExecutableReplicaSet>());
-        Assert.Equal(expectedName, ers.Spec?.Template.Annotations?[CustomResource.OtelServiceNameAnnotation]);
+        var executables = kubernetesService.CreatedResources.OfType<Executable>().ToList();
+        Assert.Equal(replicaCount, executables.Count);
+
+        foreach (var exe in executables)
+        {
+            Assert.Equal(expectedName, exe.Metadata.Annotations[CustomResource.OtelServiceNameAnnotation]);
+        }
     }
 
     [Fact]
@@ -602,25 +607,30 @@ public async Task EndpointPortsProjectNoPortNoTargetPort()
         var appExecutor = CreateAppExecutor(distributedAppModel, app.Services, kubernetesService: kubernetesService);
         await appExecutor.RunApplicationAsync();
 
-        var ers = Assert.Single(kubernetesService.CreatedResources.OfType<ExecutableReplicaSet>());
-        Assert.True(ers.Spec.Template.TryGetAnnotationAsObjectList<ServiceProducerAnnotation>(CustomResource.ServiceProducerAnnotation, out var spAnnList));
+        var exes = kubernetesService.CreatedResources.OfType<Executable>().ToList();
+        Assert.Equal(3, exes.Count);
 
-        // Neither Port, nor TargetPort are set
-        // Clients use proxy, MAY have the proxy port injected.
-        // Proxy gets autogenerated port.
-        // Each replica gets a different autogenerated port that MUST be injected via env var/startup param.
-        var svc = kubernetesService.CreatedResources.OfType<Service>().Single(s => s.Name() == "ServiceA-NoPortNoTargetPort");
-        Assert.Equal(AddressAllocationModes.Localhost, svc.Spec.AddressAllocationMode);
-        Assert.True(svc.Status?.EffectivePort >= TestKubernetesService.StartOfAutoPortRange);
-        Assert.True(spAnnList.Single(ann => ann.ServiceName == "ServiceA-NoPortNoTargetPort").Port is null,
-            "Expected service producer (target) port to not be set (leave allocation to DCP)");
-        var envVarVal = ers.Spec.Template.Spec.Env?.Single(v => v.Name == "NO_PORT_NO_TARGET_PORT").Value;
-        Assert.False(string.IsNullOrWhiteSpace(envVarVal));
-        Assert.Contains("""portForServing "ServiceA-NoPortNoTargetPort" """, envVarVal);
-
-        // ASPNETCORE_URLS should not include dontinjectme, as it was excluded using WithEndpointsInEnvironment
-        var aspnetCoreUrls = ers.Spec.Template.Spec.Env?.Single(v => v.Name == "ASPNETCORE_URLS").Value;
-        Assert.Equal("http://localhost:{{- portForServing \"ServiceA-http\" -}};http://localhost:{{- portForServing \"ServiceA-hp1\" -}}", aspnetCoreUrls);
+        foreach (var dcpExe in exes)
+        {
+            Assert.True(dcpExe.TryGetAnnotationAsObjectList<ServiceProducerAnnotation>(CustomResource.ServiceProducerAnnotation, out var spAnnList));
+
+            // Neither Port, nor TargetPort are set
+            // Clients use proxy, MAY have the proxy port injected.
+            // Proxy gets autogenerated port.
+            // Each replica gets a different autogenerated port that MUST be injected via env var/startup param.
+            var svc = kubernetesService.CreatedResources.OfType<Service>().Single(s => s.Name() == "ServiceA-NoPortNoTargetPort");
+            Assert.Equal(AddressAllocationModes.Localhost, svc.Spec.AddressAllocationMode);
+            Assert.True(svc.Status?.EffectivePort >= TestKubernetesService.StartOfAutoPortRange);
+            Assert.True(spAnnList.Single(ann => ann.ServiceName == "ServiceA-NoPortNoTargetPort").Port is null,
+                "Expected service producer (target) port to not be set (leave allocation to DCP)");
+            var envVarVal = dcpExe.Spec.Env?.Single(v => v.Name == "NO_PORT_NO_TARGET_PORT").Value;
+            Assert.False(string.IsNullOrWhiteSpace(envVarVal));
+            Assert.Contains("""portForServing "ServiceA-NoPortNoTargetPort" """, envVarVal);
+
+            // ASPNETCORE_URLS should not include dontinjectme, as it was excluded using WithEndpointsInEnvironment
+            var aspnetCoreUrls = dcpExe.Spec.Env?.Single(v => v.Name == "ASPNETCORE_URLS").Value;
+            Assert.Equal("http://localhost:{{- portForServing \"ServiceA-http\" -}};http://localhost:{{- portForServing \"ServiceA-hp1\" -}}", aspnetCoreUrls);
+        }
     }
 
     [Fact]
@@ -642,77 +652,25 @@ public async Task EndpointPortsProjectPortSetNoTargetPort()
         var appExecutor = CreateAppExecutor(distributedAppModel, app.Services, kubernetesService: kubernetesService);
         await appExecutor.RunApplicationAsync();
 
-        var ers = Assert.Single(kubernetesService.CreatedResources.OfType<ExecutableReplicaSet>());
-        Assert.True(ers.Spec.Template.TryGetAnnotationAsObjectList<ServiceProducerAnnotation>(CustomResource.ServiceProducerAnnotation, out var spAnnList));
+        var exes = kubernetesService.CreatedResources.OfType<Executable>().ToList();
+        Assert.Equal(3, exes.Count);
 
-        // Port is set, but TargetPort is empty.
-        // Clients use proxy, MAY have the proxy port injected.
-        // Proxy uses Port.
-        // Each replica gets a different autogenerated port that MUST be injected via env var/startup param.
-        var svc = kubernetesService.CreatedResources.OfType<Service>().Single(s => s.Name() == "ServiceA-PortSetNoTargetPort");
-        Assert.Equal(AddressAllocationModes.Localhost, svc.Spec.AddressAllocationMode);
-        Assert.Equal(desiredPortOne, svc.Status?.EffectivePort);
-        Assert.True(spAnnList.Single(ann => ann.ServiceName == "ServiceA-PortSetNoTargetPort").Port is null,
-            "Expected service producer (target) port to not be set (leave allocation to DCP)");
-        var envVarVal = ers.Spec.Template.Spec.Env?.Single(v => v.Name == "PORT_SET_NO_TARGET_PORT").Value;
-        Assert.False(string.IsNullOrWhiteSpace(envVarVal));
-        Assert.Contains("""portForServing "ServiceA-PortSetNoTargetPort" """, envVarVal);
-    }
-
-    /// <summary>
-    /// Verifies that applying unsupported endpoint port configuration to a Project resource results in an error.
-    /// </summary>
-    /// <remarks>
-    /// Projects are run by DCP via ExecutableReplicaSet and must use a proxy to enable dynamic scaling.
-    /// Any Endpoint configuration that does not enable proxying should result in an error.
-    /// Similarly, specifying a TargetPort is not supported because each replica must get a distinct port.
-    /// </remarks>
-    [Fact]
-    public async Task UnsupportedEndpointPortsProject()
-    {
-        const int desiredPortOne = TestKubernetesService.StartOfAutoPortRange - 1000;
-        const int desiredPortTwo = TestKubernetesService.StartOfAutoPortRange - 999;
-        const int desiredPortThree = TestKubernetesService.StartOfAutoPortRange - 998;
-
-        (Action<IResourceBuilder<ProjectResource>> AddEndpoint, string ErrorMessageFragment)[] testcases = [
-            // Invalid configuration: TargetPort is set (Port left empty).
-            (
-                pr => pr.WithEndpoint(name: "NoPortTargetPortSet", targetPort: desiredPortOne, env: "NO_PORT_TARGET_PORT_SET", isProxied: true),
-                "setting TargetPort is not allowed"
-            ),
-
-            // Invalid configuration: both TargetPort and Port are set.
-            (
-                pr => pr.WithEndpoint(name: "PortAndTargetPortSet", port: desiredPortTwo, targetPort: desiredPortThree, env: "PORT_AND_TARGET_PORT_SET", isProxied: true),
-                "setting TargetPort is not allowed"
-            ),
-
-            // Invalid configuration: proxy-less endpoints and (replicated) projects do not work together
-            (
-                pr => pr.WithEndpoint(name: "NoPortNoTargetPort", env: "NO_PORT_NO_TARGET_PORT", isProxied: false),
-                "features do not work together"
-            )
-        ];
-
-        foreach (var tc in testcases)
+        foreach (var dcpExe in exes)
         {
-            var builder = DistributedApplication.CreateBuilder(new DistributedApplicationOptions
-            {
-                AssemblyName = typeof(DistributedApplicationTests).Assembly.FullName
-            });
-
-            // Invalid configuration: TargetPort is set (Port left empty).
-
-            var pr = builder.AddProject<Projects.ServiceA>("ServiceA");
-            tc.AddEndpoint(pr);
-            pr.WithReplicas(3);
-
-            var kubernetesService = new TestKubernetesService();
-            using var app = builder.Build();
-            var distributedAppModel = app.Services.GetRequiredService<DistributedApplicationModel>();
-            var appExecutor = CreateAppExecutor(distributedAppModel, app.Services, kubernetesService: kubernetesService);
-            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => appExecutor.RunApplicationAsync());
-            Assert.Contains(tc.ErrorMessageFragment, exception.Message);
+            Assert.True(dcpExe.TryGetAnnotationAsObjectList<ServiceProducerAnnotation>(CustomResource.ServiceProducerAnnotation, out var spAnnList));
+
+            // Port is set, but TargetPort is empty.
+            // Clients use proxy, MAY have the proxy port injected.
+            // Proxy uses Port.
+            // Each replica gets a different autogenerated port that MUST be injected via env var/startup param.
+            var svc = kubernetesService.CreatedResources.OfType<Service>().Single(s => s.Name() == "ServiceA-PortSetNoTargetPort");
+            Assert.Equal(AddressAllocationModes.Localhost, svc.Spec.AddressAllocationMode);
+            Assert.Equal(desiredPortOne, svc.Status?.EffectivePort);
+            Assert.True(spAnnList.Single(ann => ann.ServiceName == "ServiceA-PortSetNoTargetPort").Port is null,
+                "Expected service producer (target) port to not be set (leave allocation to DCP)");
+            var envVarVal = dcpExe.Spec.Env?.Single(v => v.Name == "PORT_SET_NO_TARGET_PORT").Value;
+            Assert.False(string.IsNullOrWhiteSpace(envVarVal));
+            Assert.Contains("""portForServing "ServiceA-PortSetNoTargetPort" """, envVarVal);
         }
     }