Revert IComputeResource changes

captainsafia · captainsafia · commit 32d4cc8d3b0d · 2025-05-01T13:25:17.000-07:00
diff --git a/src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppsInfrastructure.cs b/src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppsInfrastructure.cs
@@ -62,12 +62,11 @@ public async Task BeforeStartAsync(DistributedApplicationModel appModel, Cancell
             // container app environment in the deployment target information
             // associated with each compute resource that needs an image
 #pragma warning disable ASPIRECOMPUTE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-            if (r is IComputeResource computeResource)
+            r.Annotations.Add(new DeploymentTargetAnnotation(containerApp)
             {
-                computeResource.ContainerRegistry = caes.FirstOrDefault();
-                computeResource.ComputeEnvironment = environment as IComputeEnvironmentResource;
-            }
-            r.Annotations.Add(new DeploymentTargetAnnotation(containerApp));
+                ContainerRegistry = caes.FirstOrDefault(),
+                ComputeEnvironment = environment as IComputeEnvironmentResource
+            });
 #pragma warning restore ASPIRECOMPUTE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
         }
 
diff --git a/src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj b/src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj
@@ -33,7 +33,6 @@
     <PackageReference Include="System.IO.Hashing" />
     <PackageReference Include="Azure.Provisioning" />
     <PackageReference Include="Azure.Provisioning.KeyVault" />
-    <PackageReference Include="Azure.Provisioning.ContainerRegistry" />
     <PackageReference Include="Azure.ResourceManager.Authorization" />
     <PackageReference Include="Azure.ResourceManager.KeyVault" />
     <PackageReference Include="Azure.ResourceManager.Resources" />
diff --git a/src/Aspire.Hosting.Azure/AzurePublishingContext.cs b/src/Aspire.Hosting.Azure/AzurePublishingContext.cs
@@ -238,14 +238,12 @@ void CaptureBicepOutputs(object value)
                 File.Copy(file.Path, modulePath, true);
 
                 // Capture any bicep outputs from the registry info as it may be needed
-                if (resource is IComputeResource computeResource)
+                Visit(annotation.ContainerRegistry?.Name, CaptureBicepOutputs);
+                Visit(annotation.ContainerRegistry?.Endpoint, CaptureBicepOutputs);
+
+                if (annotation.ContainerRegistry is IAzureContainerRegistry acr)
                 {
-                    Visit(computeResource.ContainerRegistry?.Name, CaptureBicepOutputs);
-                    Visit(computeResource.ContainerRegistry?.Endpoint, CaptureBicepOutputs);
-                    if (computeResource.ContainerRegistry is IAzureContainerRegistry acr)
-                    {
-                        Visit(acr.ManagedIdentityId, CaptureBicepOutputs);
-                    }
+                    Visit(acr.ManagedIdentityId, CaptureBicepOutputs);
                 }
 
                 foreach (var parameter in br.Parameters)
diff --git a/src/Aspire.Hosting.Docker/DockerComposeInfrastructure.cs b/src/Aspire.Hosting.Docker/DockerComposeInfrastructure.cs
@@ -57,11 +57,10 @@ public async Task BeforeStartAsync(DistributedApplicationModel appModel, Cancell
 
             // Add deployment target annotation to the resource
 #pragma warning disable ASPIRECOMPUTE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-            r.Annotations.Add(new DeploymentTargetAnnotation(serviceResource));
-            if (r is IComputeResource computeResource)
+            r.Annotations.Add(new DeploymentTargetAnnotation(serviceResource)
             {
-                computeResource.ComputeEnvironment = environment;
-            }
+                ComputeEnvironment = environment
+            });
 #pragma warning restore ASPIRECOMPUTE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
         }
     }
diff --git a/src/Aspire.Hosting.Kubernetes/KubernetesInfrastructure.cs b/src/Aspire.Hosting.Kubernetes/KubernetesInfrastructure.cs
@@ -57,11 +57,10 @@ public async Task BeforeStartAsync(DistributedApplicationModel appModel, Cancell
 
             // Add deployment target annotation to the resource
 #pragma warning disable ASPIRECOMPUTE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-            r.Annotations.Add(new DeploymentTargetAnnotation(serviceResource));
-            if (r is IComputeResource computeResource)
+            r.Annotations.Add(new DeploymentTargetAnnotation(serviceResource)
             {
-                computeResource.ComputeEnvironment = environment;
-            }
+                ComputeEnvironment = environment
+            });
 #pragma warning restore ASPIRECOMPUTE001
         }
     }
diff --git a/src/Aspire.Hosting/ApplicationModel/ContainerResource.cs b/src/Aspire.Hosting/ApplicationModel/ContainerResource.cs
@@ -19,10 +19,4 @@ public class ContainerResource(string name, string? entrypoint = null)
     /// </summary>
     /// <remarks><c>null</c> means use the default Entrypoint defined by the container.</remarks>
     public string? Entrypoint { get; set; } = entrypoint;
-
-    /// <inheritdoc />
-    IComputeEnvironmentResource? IComputeResource.ComputeEnvironment { get; set; }
-
-    /// <inheritdoc />
-    IContainerRegistry? IComputeResource.ContainerRegistry { get; set; }
 }
diff --git a/src/Aspire.Hosting/ApplicationModel/DeploymentTargetAnnotation.cs b/src/Aspire.Hosting/ApplicationModel/DeploymentTargetAnnotation.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
+
 namespace Aspire.Hosting.ApplicationModel;
 
 /// <summary>
@@ -12,4 +14,17 @@ public sealed class DeploymentTargetAnnotation(IResource target) : IResourceAnno
     /// The deployment target.
     /// </summary>
     public IResource DeploymentTarget { get; } = target;
+
+    /// <summary>
+    /// Gets or sets the container registry information associated with
+    /// the deployment target, if the deployment target is an image-based environment.
+    /// </summary>
+    [Experimental("ASPIRECOMPUTE001")]
+    public IContainerRegistry? ContainerRegistry { get; set; }
+
+    /// <summary>
+    /// Gets or sets the compute environment resource associated with the deployment target.
+    /// </summary>
+    [Experimental("ASPIRECOMPUTE001")]
+    public IComputeEnvironmentResource? ComputeEnvironment { get; set; }
 }
diff --git a/src/Aspire.Hosting/ApplicationModel/ExecutableResource.cs b/src/Aspire.Hosting/ApplicationModel/ExecutableResource.cs
@@ -28,12 +28,6 @@ public class ExecutableResource(string name, string command, string workingDirec
     /// </summary>
     public string WorkingDirectory { get; } = workingDirectory ?? throw new ArgumentNullException(nameof(workingDirectory));
 
-    /// <inheritdoc />
-    IComputeEnvironmentResource? IComputeResource.ComputeEnvironment { get; set; }
-
-    /// <inheritdoc />
-    IContainerRegistry? IComputeResource.ContainerRegistry { get; set; }
-
     private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
     {
         ArgumentException.ThrowIfNullOrEmpty(argument, paramName);
diff --git a/src/Aspire.Hosting/ApplicationModel/IComputeResource.cs b/src/Aspire.Hosting/ApplicationModel/IComputeResource.cs
@@ -15,13 +15,4 @@ namespace Aspire.Hosting.ApplicationModel;
 [Experimental("ASPIRECOMPUTE001")]
 public interface IComputeResource : IResource
 {
-    /// <summary>
-    /// Gets or sets the compute environment resource associated with this compute resource.
-    /// </summary>
-    public IComputeEnvironmentResource? ComputeEnvironment { get; set; }
-
-    /// <summary>
-    /// Gets or sets the container registry associated with this compute resource.
-    /// </summary>
-    public IContainerRegistry? ContainerRegistry { get; set; }
 }
diff --git a/src/Aspire.Hosting/ApplicationModel/ProjectResource.cs b/src/Aspire.Hosting/ApplicationModel/ProjectResource.cs
@@ -22,12 +22,6 @@ public class ProjectResource(string name)
     // Track the https endpoint that was added as a default, and should be excluded from the port & kestrel environment
     internal EndpointAnnotation? DefaultHttpsEndpoint { get; set; }
 
-    /// <inheritdoc />
-    IComputeEnvironmentResource? IComputeResource.ComputeEnvironment { get; set; }
-
-    /// <inheritdoc />
-    IContainerRegistry? IComputeResource.ContainerRegistry { get; set; }
-
     internal bool ShouldInjectEndpointEnvironment(EndpointReference e)
     {
         var endpoint = e.EndpointAnnotation;
diff --git a/src/Aspire.Hosting/ApplicationModel/ResourceExtensions.cs b/src/Aspire.Hosting/ApplicationModel/ResourceExtensions.cs
@@ -581,15 +581,29 @@ public static int GetReplicaCount(this IResource resource)
         if (resource.TryGetLastAnnotation<ComputeEnvironmentAnnotation>(out var computeEnvironmentAnnotation))
         {
             // find the deployment target for the compute environment
-            if (resource is IComputeResource { ComputeEnvironment: { } computeEnvironment } && computeEnvironment == computeEnvironmentAnnotation.ComputeEnvironment)
+            return resource.Annotations
+                .OfType<DeploymentTargetAnnotation>()
+                .LastOrDefault(a => a.ComputeEnvironment == computeEnvironmentAnnotation.ComputeEnvironment);
+        }
+        else
+        {
+            DeploymentTargetAnnotation? result = null;
+            var computeEnvironments = resource.Annotations.OfType<DeploymentTargetAnnotation>();
+            foreach (var annotation in computeEnvironments)
             {
-                return resource.Annotations
-                    .OfType<DeploymentTargetAnnotation>()
-                    .LastOrDefault();
+                if (result is null)
+                {
+                    result = annotation;
+                }
+                else
+                {
+                    var computeEnvironmentNames = string.Join(", ", computeEnvironments.Select(a => a.ComputeEnvironment?.Name));
+                    throw new InvalidOperationException($"Resource '{resource.Name}' has multiple compute environments - '{computeEnvironmentNames}'. Please specify a single compute environment using 'WithComputeEnvironment'.");
+                }
             }
-        }
 
-        return resource.Annotations.OfType<DeploymentTargetAnnotation>().SingleOrDefault();
+            return result;
+        }
 #pragma warning restore ASPIRECOMPUTE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
     }
 
diff --git a/src/Aspire.Hosting/ResourceBuilderExtensions.cs b/src/Aspire.Hosting/ResourceBuilderExtensions.cs
@@ -1951,7 +1951,7 @@ public static IResourceBuilder<T> WithComputeEnvironment<T>(this IResourceBuilde
         ArgumentNullException.ThrowIfNull(builder);
         ArgumentNullException.ThrowIfNull(computeEnvironmentResource);
 
-        builder.Resource.ComputeEnvironment = computeEnvironmentResource.Resource;
+        builder.WithAnnotation(new ComputeEnvironmentAnnotation(computeEnvironmentResource.Resource));
         return builder;
     }
 }
diff --git a/tests/Aspire.Hosting.Azure.Tests/Aspire.Hosting.Azure.Tests.csproj b/tests/Aspire.Hosting.Azure.Tests/Aspire.Hosting.Azure.Tests.csproj
@@ -32,7 +32,6 @@
     <ProjectReference Include="..\..\src\Components\Aspire.Microsoft.EntityFrameworkCore.Cosmos\Aspire.Microsoft.EntityFrameworkCore.Cosmos.csproj" />
     <ProjectReference Include="..\Aspire.Hosting.Tests\Aspire.Hosting.Tests.csproj" />
 
-
     <Compile Include="$(RepoRoot)src\Aspire.Hosting.Azure.EventHubs\EventHubsEmulatorContainerImageTags.cs" />
     <Compile Include="$(RepoRoot)src\Aspire.Hosting.Azure.ServiceBus\ServiceBusEmulatorContainerImageTags.cs" />
     <Compile Include="$(RepoRoot)src\Aspire.Hosting.Azure.Storage\AzureStorageEmulatorConnectionString.cs" />
diff --git a/tests/Aspire.Hosting.Azure.Tests/AzureContainerAppsTests.cs b/tests/Aspire.Hosting.Azure.Tests/AzureContainerAppsTests.cs
@@ -223,7 +223,7 @@ public async Task AddContainerAppEnvironmentAddsDeploymentTargetWithContainerApp
         var target = container.GetDeploymentTargetAnnotation();
 
         Assert.NotNull(target);
-        Assert.Same(env.Resource, container.ComputeEnvironment);
+        Assert.Same(env.Resource, target.ComputeEnvironment);
 
         var resource = target?.DeploymentTarget as AzureProvisioningResource;
         Assert.NotNull(resource);
@@ -363,7 +363,7 @@ public async Task AddExecutableResourceWithPublishAsDockerFileWithAppsInfrastruc
         var target = container.GetDeploymentTargetAnnotation();
 
         Assert.NotNull(target);
-        Assert.Same(infra.Resource, container.ComputeEnvironment);
+        Assert.Same(infra.Resource, target.ComputeEnvironment);
 
         var resource = target.DeploymentTarget as AzureProvisioningResource;
         Assert.NotNull(resource);
@@ -472,7 +472,7 @@ public async Task CanTweakContainerAppEnvironmentUsingPublishAsContainerAppOnExe
         var target = container.GetDeploymentTargetAnnotation();
 
         Assert.NotNull(target);
-        Assert.Same(env.Resource, container.ComputeEnvironment);
+        Assert.Same(env.Resource, target.ComputeEnvironment);
 
         var resource = target?.DeploymentTarget as AzureProvisioningResource;
         Assert.NotNull(resource);
diff --git a/tests/Aspire.Hosting.Azure.Tests/ContainerRegistryTests.cs b/tests/Aspire.Hosting.Azure.Tests/ContainerRegistryTests.cs
@@ -58,16 +58,16 @@ public async Task ContainerRegistryInfoFlowsToDeploymentTargetForProjects()
 
         // Assert
         var model = app.Services.GetRequiredService<DistributedApplicationModel>();
-        var project = Assert.IsType<IComputeResource>(Assert.Single(model.GetProjectResources()), exactMatch: false);
+        var project = Assert.Single(model.GetProjectResources());
 
         project.TryGetLastAnnotation<DeploymentTargetAnnotation>(out var target);
         Assert.NotNull(target);
 
         // Verify that ContainerRegistryInfo property is not null for project resources
-        Assert.NotNull(project.ContainerRegistry);
+        Assert.NotNull(target.ContainerRegistry);
 
         // Verify that ContainerRegistryInfo is of type IContainerRegistry
-        var registry = Assert.IsType<IContainerRegistry>(project.ContainerRegistry, exactMatch: false);
+        var registry = Assert.IsType<IContainerRegistry>(target.ContainerRegistry, exactMatch: false);
 
         // Verify registry properties are available
         Assert.NotNull(registry.Name);
@@ -156,10 +156,11 @@ public Task PublishAsync(DistributedApplicationModel model, CancellationToken ca
             // Look for container registry in deployment target annotations
             foreach (var resource in model.Resources)
             {
-                if (resource is IComputeResource computeResource && computeResource.ContainerRegistry is not null)
+                if (resource.TryGetLastAnnotation<DeploymentTargetAnnotation>(out var annotation) &&
+                    annotation.ContainerRegistry != null)
                 {
                     ComputeResourceRegistryFound = true;
-                    ComputeResourceRegistry = computeResource.ContainerRegistry;
+                    ComputeResourceRegistry = annotation.ContainerRegistry;
                     if (ComputeResourceRegistry is IAzureContainerRegistry azureRegistry)
                     {
                         AzureContainerRegistry = azureRegistry;
diff --git a/tests/Aspire.Hosting.Docker.Tests/DockerComposeTests.cs b/tests/Aspire.Hosting.Docker.Tests/DockerComposeTests.cs
@@ -26,7 +26,7 @@ public async Task DockerComposeSetsComputeEnvironment()
 
         await ExecuteBeforeStartHooksAsync(app, default);
 
-        Assert.Same(composeEnv.Resource, ((IComputeResource)container.Resource).ComputeEnvironment);
+        Assert.Same(composeEnv.Resource, container.Resource.GetDeploymentTargetAnnotation()?.ComputeEnvironment);
     }
 
     [UnsafeAccessor(UnsafeAccessorKind.Method, Name = "ExecuteBeforeStartHooksAsync")]
diff --git a/tests/Aspire.Hosting.Tests/ResourceExtensionsTests.cs b/tests/Aspire.Hosting.Tests/ResourceExtensionsTests.cs
@@ -303,15 +303,15 @@ public void GetDeploymentTargetAnnotationWorks()
         void RunTest<T>(IResourceBuilder<T> resourceBuilder) where T : IComputeResource
         {
             resourceBuilder
-                .WithAnnotation(new DeploymentTargetAnnotation(compute1.Resource))
-                .WithAnnotation(new DeploymentTargetAnnotation(compute2.Resource));
+                .WithAnnotation(new DeploymentTargetAnnotation(compute1.Resource) { ComputeEnvironment = compute1.Resource })
+                .WithAnnotation(new DeploymentTargetAnnotation(compute2.Resource) { ComputeEnvironment = compute2.Resource });
 
             var ex = Assert.Throws<InvalidOperationException>(resourceBuilder.Resource.GetDeploymentTargetAnnotation);
             Assert.Contains("'compute1, compute2'", ex.Message);
 
             resourceBuilder.WithComputeEnvironment(compute2);
 
-            Assert.Equal(compute2.Resource, resourceBuilder.Resource.ComputeEnvironment);
+            Assert.Equal(compute2.Resource, resourceBuilder.Resource.GetDeploymentTargetAnnotation()!.ComputeEnvironment);
         }
 
         RunTest(builder.AddContainer("myContainer", "nginx"));

Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,10 @@ public async Task BeforeStartAsync(DistributedApplicationModel appModel, Cancell`
`57`	`57`
`58`	`58`	`// Add deployment target annotation to the resource`
`59`	`59`	`#pragma warning disable ASPIRECOMPUTE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.`
`60`		`- r.Annotations.Add(new DeploymentTargetAnnotation(serviceResource));`
`61`		`- if (r is IComputeResource computeResource)`
	`60`	`+ r.Annotations.Add(new DeploymentTargetAnnotation(serviceResource)`
`62`	`61`	`{`
`63`		`- computeResource.ComputeEnvironment = environment;`
`64`		`- }`
	`62`	`+ ComputeEnvironment = environment`
	`63`	`+ });`
`65`	`64`	`#pragma warning restore ASPIRECOMPUTE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.`
`66`	`65`	`}`
`67`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,4 @@ namespace Aspire.Hosting.ApplicationModel;`
`15`	`15`	`[Experimental("ASPIRECOMPUTE001")]`
`16`	`16`	`public interface IComputeResource : IResource`
`17`	`17`	`{`
`18`		`- /// <summary>`
`19`		`- /// Gets or sets the compute environment resource associated with this compute resource.`
`20`		`- /// </summary>`
`21`		`- public IComputeEnvironmentResource? ComputeEnvironment { get; set; }`
`22`		`-`
`23`		`- /// <summary>`
`24`		`- /// Gets or sets the container registry associated with this compute resource.`
`25`		`- /// </summary>`
`26`		`- public IContainerRegistry? ContainerRegistry { get; set; }`
`27`	`18`	`}`