Refactor Azure Container Apps processing (#9075)

* Refactor Azure Container Apps processing
- Split the 2 phases and state more clearly. The first pass is handled directly in before start and resolved environment variables, arguments, volumes, endpoints.
- The second pass is during bicep writing where that data is processed and translated into the underlying bicep primitives.

* Fixed tests again

* Remove more whitespace

* Update AzurePublishingContext tests to reflect new Bicep identifiers

Author: davidfowl

playground/AzureContainerApps/AzureContainerApps.AppHost/api.module.bicep

@@ -1,9 +1,17 @@
 @description('The location for the resource(s) to be deployed.')
 param location string = resourceGroup().location
 
-param api_identity_outputs_id string
+param infra_outputs_azure_container_apps_environment_default_domain string
 
-param api_identity_outputs_clientid string
+param infra_outputs_azure_container_apps_environment_id string
+
+param infra_outputs_azure_container_registry_endpoint string
+
+param infra_outputs_azure_container_registry_managed_identity_id string
+
+param api_containerimage string
+
+param api_identity_outputs_id string
 
 param api_containerport string
 
@@ -19,15 +27,7 @@ param secretparam_value string
 
 param api_identity_outputs_principalname string
 
-param infra_outputs_azure_container_apps_environment_default_domain string
-
-param infra_outputs_azure_container_apps_environment_id string
-
-param infra_outputs_azure_container_registry_endpoint string
-
-param infra_outputs_azure_container_registry_managed_identity_id string
-
-param api_containerimage string
+param api_identity_outputs_clientid string
 
 param certificateName string
 

playground/AzureContainerApps/AzureContainerApps.AppHost/aspire-manifest.json

@@ -44,10 +44,10 @@
         "type": "azure.bicep.v0",
         "path": "cache.module.bicep",
         "params": {
-          "infra_outputs_volumes_cache_0": "{infra.outputs.volumes_cache_0}",
-          "cache_password_value": "{cache-password.value}",
           "infra_outputs_azure_container_apps_environment_default_domain": "{infra.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_DEFAULT_DOMAIN}",
-          "infra_outputs_azure_container_apps_environment_id": "{infra.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_ID}"
+          "infra_outputs_azure_container_apps_environment_id": "{infra.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_ID}",
+          "cache_password_value": "{cache-password.value}",
+          "infra_outputs_volumes_cache_0": "{infra.outputs.volumes_cache_0}"
         }
       },
       "entrypoint": "/bin/sh",
@@ -124,19 +124,19 @@
         "type": "azure.bicep.v0",
         "path": "api.module.bicep",
         "params": {
+          "infra_outputs_azure_container_apps_environment_default_domain": "{infra.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_DEFAULT_DOMAIN}",
+          "infra_outputs_azure_container_apps_environment_id": "{infra.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_ID}",
+          "infra_outputs_azure_container_registry_endpoint": "{infra.outputs.AZURE_CONTAINER_REGISTRY_ENDPOINT}",
+          "infra_outputs_azure_container_registry_managed_identity_id": "{infra.outputs.AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID}",
+          "api_containerimage": "{api.containerImage}",
           "api_identity_outputs_id": "{api-identity.outputs.id}",
-          "api_identity_outputs_clientid": "{api-identity.outputs.clientId}",
           "api_containerport": "{api.containerPort}",
           "storage_outputs_blobendpoint": "{storage.outputs.blobEndpoint}",
           "cache_password_value": "{cache-password.value}",
           "account_kv_outputs_name": "{account-kv.outputs.name}",
           "secretparam_value": "{secretparam.value}",
           "api_identity_outputs_principalname": "{api-identity.outputs.principalName}",
-          "infra_outputs_azure_container_apps_environment_default_domain": "{infra.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_DEFAULT_DOMAIN}",
-          "infra_outputs_azure_container_apps_environment_id": "{infra.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_ID}",
-          "infra_outputs_azure_container_registry_endpoint": "{infra.outputs.AZURE_CONTAINER_REGISTRY_ENDPOINT}",
-          "infra_outputs_azure_container_registry_managed_identity_id": "{infra.outputs.AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID}",
-          "api_containerimage": "{api.containerImage}",
+          "api_identity_outputs_clientid": "{api-identity.outputs.clientId}",
           "certificateName": "{certificateName.value}",
           "customDomain": "{customDomain.value}"
         }

playground/AzureContainerApps/AzureContainerApps.AppHost/cache.module.bicep

@@ -1,14 +1,14 @@
 @description('The location for the resource(s) to be deployed.')
 param location string = resourceGroup().location
 
-param infra_outputs_volumes_cache_0 string
+param infra_outputs_azure_container_apps_environment_default_domain string
+
+param infra_outputs_azure_container_apps_environment_id string
 
 @secure()
 param cache_password_value string
 
-param infra_outputs_azure_container_apps_environment_default_domain string
-
-param infra_outputs_azure_container_apps_environment_id string
+param infra_outputs_volumes_cache_0 string
 
 resource cache 'Microsoft.App/containerApps@2024-03-01' = {
   name: 'cache'

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

@@ -42,6 +42,7 @@ public async Task BeforeStartAsync(DistributedApplicationModel appModel, Cancell
 
         var containerAppEnvironmentContext = new ContainerAppEnvironmentContext(
             logger,
+            executionContext,
             environment);
 
         foreach (var r in appModel.Resources)
@@ -56,7 +57,7 @@ public async Task BeforeStartAsync(DistributedApplicationModel appModel, Cancell
                 continue;
             }
 
-            var containerApp = await containerAppEnvironmentContext.CreateContainerAppAsync(r, provisioningOptions.Value, executionContext, cancellationToken).ConfigureAwait(false);
+            var containerApp = await containerAppEnvironmentContext.CreateContainerAppAsync(r, provisioningOptions.Value, cancellationToken).ConfigureAwait(false);
 
             // Capture information about the container registry used by the
             // container app environment in the deployment target information