Obsolete AddAzureContainerAppsInfrastructure (#8639)

* Obsolete AddAzureContainerAppsInfrastructure

This method is no longer meant to be used. Instead developers should be calling AddAzureContainerAppEnvironment.

Covert the tests using this API to the new API

* Fix volume output naming issue

We weren't discriminating between volumes and bindmounts, which caused a cache collision.

* Switch the prefix at the beginning

Author: eerhardt

src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppContainerExtensions.cs

@@ -42,7 +42,7 @@ public static IResourceBuilder<T> PublishAsAzureContainerApp<T>(this IResourceBu
             return container;
         }
 
-        container.ApplicationBuilder.AddAzureContainerAppsInfrastructure();
+        container.ApplicationBuilder.AddAzureContainerAppsInfrastructureCore();
 
         container.WithAnnotation(new AzureContainerAppCustomizationAnnotation(configure));
 

src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppEnvironmentResource.cs

@@ -80,8 +80,15 @@ IManifestExpressionProvider IAzureContainerAppEnvironment.GetSecretOutputKeyVaul
 
     IManifestExpressionProvider IAzureContainerAppEnvironment.GetVolumeStorage(IResource resource, ContainerMountAnnotation volume, int volumeIndex)
     {
+        var prefix = volume.Type switch
+        {
+            ContainerMountType.BindMount => "bindmounts",
+            ContainerMountType.Volume => "volumes",
+            _ => throw new NotSupportedException()
+        };
+
         // REVIEW: Should we use the same naming algorithm as azd?
-        var outputName = $"volumes_{resource.Name}_{volumeIndex}";
+        var outputName = $"{prefix}_{resource.Name}_{volumeIndex}";
 
         if (!VolumeNames.TryGetValue(outputName, out var volumeName))
         {

src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppExecutableExtensions.cs

@@ -42,7 +42,7 @@ public static IResourceBuilder<T> PublishAsAzureContainerApp<T>(this IResourceBu
             return executable;
         }
 
-        executable.ApplicationBuilder.AddAzureContainerAppsInfrastructure();
+        executable.ApplicationBuilder.AddAzureContainerAppsInfrastructureCore();
 
         return executable.WithAnnotation(new AzureContainerAppCustomizationAnnotation(configure));
     }

src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppExtensions.cs

@@ -28,7 +28,11 @@ public static class AzureContainerAppExtensions
     /// Adds the necessary infrastructure for Azure Container Apps to the distributed application builder.
     /// </summary>
     /// <param name="builder">The distributed application builder.</param>
-    public static IDistributedApplicationBuilder AddAzureContainerAppsInfrastructure(this IDistributedApplicationBuilder builder)
+    [Obsolete($"Use {nameof(AddAzureContainerAppEnvironment)} instead. This method will be removed in a future version.")]
+    public static IDistributedApplicationBuilder AddAzureContainerAppsInfrastructure(this IDistributedApplicationBuilder builder) =>
+        AddAzureContainerAppsInfrastructureCore(builder);
+
+    internal static IDistributedApplicationBuilder AddAzureContainerAppsInfrastructureCore(this IDistributedApplicationBuilder builder)
     {
         ArgumentNullException.ThrowIfNull(builder);
 
@@ -52,7 +56,7 @@ public static IDistributedApplicationBuilder AddAzureContainerAppsInfrastructure
     /// <returns><see cref="IResourceBuilder{T}"/></returns>
     public static IResourceBuilder<AzureContainerAppEnvironmentResource> AddAzureContainerAppEnvironment(this IDistributedApplicationBuilder builder, string name)
     {
-        builder.AddAzureContainerAppsInfrastructure();
+        builder.AddAzureContainerAppsInfrastructureCore();
 
         // Only support one temporarily until we can support multiple environments
         // and allowing each container app to be explicit about which environment it uses

src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppProjectExtensions.cs

@@ -42,7 +42,7 @@ public static IResourceBuilder<T> PublishAsAzureContainerApp<T>(this IResourceBu
             return project;
         }
 
-        project.ApplicationBuilder.AddAzureContainerAppsInfrastructure();
+        project.ApplicationBuilder.AddAzureContainerAppsInfrastructureCore();
 
         project.WithAnnotation(new AzureContainerAppCustomizationAnnotation(configure));
 

src/Aspire.Hosting.Azure/AzureResourcePreparer.cs

@@ -85,7 +85,7 @@ private static void EnsureNoRoleAssignmentAnnotations(DistributedApplicationMode
         {
             if (resource.HasAnnotationOfType<RoleAssignmentAnnotation>())
             {
-                throw new InvalidOperationException("The application model does not support role assignments. Ensure you are using a publisher that supports role assignments, for example AddAzureContainerAppsInfrastructure.");
+                throw new InvalidOperationException("The application model does not support role assignments. Ensure you are using an environment that supports role assignments, for example AddAzureContainerAppEnvironment.");
             }
         }
     }

tests/Aspire.Hosting.Azure.Tests/AzureContainerAppsTests.cs

@@ -189,7 +189,7 @@ public async Task AddAzureCosmosDB(bool useAcaInfrastructure)
 
         if (useAcaInfrastructure)
         {
-            builder.AddAzureContainerAppsInfrastructure();
+            builder.AddAzureContainerAppEnvironment("env");
         }
 
         var cosmos = builder.AddAzureCosmosDB("cosmos");

tests/Aspire.Hosting.Azure.Tests/AzureCosmosDBExtensionsTests.cs

@@ -288,7 +288,7 @@ public async Task AddAzureFunctionsProject_CanGetStorageManifestSuccessfully()
     public async Task AddAzureFunctionsProject_WorksWithAddAzureContainerAppsInfrastructure()
     {
         using var builder = TestDistributedApplicationBuilder.Create(DistributedApplicationOperation.Publish);
-        builder.AddAzureContainerAppsInfrastructure();
+        builder.AddAzureContainerAppEnvironment("env");
 
         // hardcoded sha256 to make the storage name deterministic
         builder.Configuration["AppHost:Sha256"] = "634f8";
@@ -378,7 +378,7 @@ param principalId string
     public async Task AddAzureFunctionsProject_WorksWithAddAzureContainerAppsInfrastructure_WithHostStorage()
     {
         using var builder = TestDistributedApplicationBuilder.Create(DistributedApplicationOperation.Publish);
-        builder.AddAzureContainerAppsInfrastructure();
+        builder.AddAzureContainerAppEnvironment("env");
 
         // hardcoded sha256 to make the storage name deterministic
         var storage = builder.AddAzureStorage("my-own-storage").RunAsEmulator();
@@ -460,7 +460,7 @@ param principalId string
     public async Task AddAzureFunctionsProject_WorksWithAddAzureContainerAppsInfrastructure_WithHostStorage_WithRoleAssignments()
     {
         using var builder = TestDistributedApplicationBuilder.Create(DistributedApplicationOperation.Publish);
-        builder.AddAzureContainerAppsInfrastructure();
+        builder.AddAzureContainerAppEnvironment("env");
 
         // hardcoded sha256 to make the storage name deterministic
         var storage = builder.AddAzureStorage("my-own-storage").RunAsEmulator();
@@ -523,7 +523,7 @@ param principalId string
     public async Task MultipleAddAzureFunctionsProject_WorksWithAddAzureContainerAppsInfrastructure_WithHostStorage_WithRoleAssignments()
     {
         using var builder = TestDistributedApplicationBuilder.Create(DistributedApplicationOperation.Publish);
-        builder.AddAzureContainerAppsInfrastructure();
+        builder.AddAzureContainerAppEnvironment("env");
 
         // hardcoded sha256 to make the storage name deterministic
         var storage = builder.AddAzureStorage("my-own-storage").RunAsEmulator();

tests/Aspire.Hosting.Azure.Tests/AzureFunctionsTests.cs

@@ -24,7 +24,7 @@ public async Task AddAzurePostgresFlexibleServer(bool publishMode, bool useAcaIn
 
         if (useAcaInfrastructure)
         {
-            builder.AddAzureContainerAppsInfrastructure();
+            builder.AddAzureContainerAppEnvironment("env");
 
             // on ACA infrastructure, if there are no references to the postgres resource,
             // then there won't be any roles created. So add a reference here.