Handled PR feedback and added support to log dashboard Uri

Author: ShilpiR

src/Aspire.Hosting.Azure.AppService/AzureAppServiceEnvironmentExtensions.cs

@@ -134,17 +134,12 @@ public static IResourceBuilder<AzureAppServiceEnvironmentResource> AddAzureAppSe
                 Value = identity.ClientId
             });
 
-            infra.Add(new ProvisioningOutput("AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_NAME", typeof(string))
-            {
-                Value = identity.Name
-            });
-
             if (resource.EnableDashboard)
             {
                 // Add aspire dashboard website
                 var website = AzureAppServiceEnvironmentUtility.AddDashboard(infra, identity, plan.Id);
 
-                infra.Add(new ProvisioningOutput("DASHBOARD_URI", typeof(string))
+                infra.Add(new ProvisioningOutput("AZURE_APP_SERVICE_DASHBOARD_URI", typeof(string))
                 {
                     Value = BicepFunction.Interpolate($"https://{AzureAppServiceEnvironmentUtility.DashboardHostName}.azurewebsites.net")
                 });

src/Aspire.Hosting.Azure.AppService/AzureAppServiceEnvironmentResource.cs

@@ -41,7 +41,7 @@ public class AzureAppServiceEnvironmentResource(string name, Action<AzureResourc
     /// <summary>
     /// Gets the URI of the App Service Environment dashboard.
     /// </summary>
-    public BicepOutputReference DashboardUriReference => new("DASHBOARD_URI", this);
+    public BicepOutputReference DashboardUriReference => new("AZURE_APP_SERVICE_DASHBOARD_URI", this);
 
     ReferenceExpression IAzureContainerRegistry.ManagedIdentityId => 
         ReferenceExpression.Create($"{ContainerRegistryManagedIdentityId}");

src/Aspire.Hosting.Azure.AppService/AzureAppServiceEnvironmentUtility.cs

@@ -13,7 +13,7 @@ namespace Aspire.Hosting.Azure.AppService;
 
 internal static class AzureAppServiceEnvironmentUtility
 {
-    internal static readonly string ResourceName = "dashboard";
+    internal const string ResourceName = "dashboard";
 
     public static BicepValue<string> DashboardHostName => BicepFunction.Take(
         BicepFunction.Interpolate($"{BicepFunction.ToLower(ResourceName)}-{BicepFunction.GetUniqueString(BicepFunction.GetResourceGroup().Id)}"), 60);
@@ -22,13 +22,13 @@ public static WebSite AddDashboard(AzureResourceInfrastructure infra,
         UserAssignedIdentity otelIdentity,
         BicepValue<ResourceIdentifier> appServicePlanId)
     {
-        var acrClientIdParameter = otelIdentity.ClientId;
+        // This ACR identity is used by the dashboard to authorize the telemetry data
+        // coming from the dotnet web apps. This identity is being assigned to every web app
+        // in the aspire project and can be safely reused for authorization in the dashboard. 
+        var otelClientId = otelIdentity.ClientId;
         var prefix = infra.AspireResource.Name;
         var contributorIdentity = new UserAssignedIdentity(Infrastructure.NormalizeBicepIdentifier($"{prefix}-contributor-mi"));
-
-        var contributorMidParameter = contributorIdentity.Id;
-        var contributorClientIdParameter = contributorIdentity.ClientId;
-
+        
         infra.Add(contributorIdentity);
 
         // Add Website Contributor role assignment
@@ -72,7 +72,7 @@ public static WebSite AddDashboard(AzureResourceInfrastructure infra,
             SiteConfig = new SiteConfigProperties()
             {
                 LinuxFxVersion = "ASPIREDASHBOARD|1.0",
-                AcrUserManagedIdentityId = acrClientIdParameter,
+                AcrUserManagedIdentityId = otelClientId,
                 UseManagedIdentityCreds = true,
                 IsHttp20Enabled = true,
                 Http20ProxyFlag = 1,
@@ -89,7 +89,7 @@ public static WebSite AddDashboard(AzureResourceInfrastructure infra,
             }
         };
 
-        var contributorMid = BicepFunction.Interpolate($"{contributorMidParameter}").Compile().ToString();
+        var contributorMid = BicepFunction.Interpolate($"{contributorIdentity.Id}").Compile().ToString();
         webSite.Identity.UserAssignedIdentities[contributorMid] = new UserAssignedIdentityDetails();
 
         // Security is handled by app service platform
@@ -103,8 +103,8 @@ public static WebSite AddDashboard(AzureResourceInfrastructure infra,
         // Enable SCM preloading to ensure dashboard is always available
         webSite.SiteConfig.AppSettings.Add(new AppServiceNameValuePair { Name = "WEBSITE_START_SCM_WITH_PRELOAD", Value = "true" });
         // Appsettings related to managed identity for auth
-        webSite.SiteConfig.AppSettings.Add(new AppServiceNameValuePair { Name = "AZURE_CLIENT_ID", Value = contributorClientIdParameter });
-        webSite.SiteConfig.AppSettings.Add(new AppServiceNameValuePair { Name = "ALLOWED_MANAGED_IDENTITIES", Value = acrClientIdParameter });
+        webSite.SiteConfig.AppSettings.Add(new AppServiceNameValuePair { Name = "AZURE_CLIENT_ID", Value = contributorIdentity.ClientId });
+        webSite.SiteConfig.AppSettings.Add(new AppServiceNameValuePair { Name = "ALLOWED_MANAGED_IDENTITIES", Value = otelClientId });
         infra.Add(webSite);
 
         return webSite;

src/Aspire.Hosting.Azure/AzureDeployingContext.cs

@@ -482,6 +482,12 @@ private static string TryGetComputeResourceEndpoint(IResource computeResource, I
                 {
                     return $"https://aspire-dashboard.ext.{domainValue}";
                 }
+                // If the resource is a compute environment (app service), we can use its properties
+                // to get the dashboard URL.
+                if (environmentBicepResource.Outputs.TryGetValue($"AZURE_APP_SERVICE_DASHBOARD_URI", out var dashboardUri))
+                {
+                    return (string?)dashboardUri;
+                }
             }
         }
 

tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddAppServiceEnvironmentWithoutDashboardAddsEnvironmentResource.verified.bicep

@@ -55,5 +55,3 @@ output AZURE_CONTAINER_REGISTRY_ENDPOINT string = env_acr.properties.loginServer
 output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID string = env_mi.id
 
 output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_CLIENT_ID string = env_mi.properties.clientId
-
-output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_NAME string = env_mi.name

tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddContainerAppEnvironmentAddsDeploymentTargetWithContainerAppToProjectResources.verified.bicep

@@ -13,7 +13,7 @@ param api_containerimage string
 
 param api_containerport string
 
-param env_outputs_dashboard_uri string
+param env_outputs_azure_app_service_dashboard_uri string
 
 resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = {
   name: 'main'
@@ -75,7 +75,7 @@ resource webapp 'Microsoft.Web/sites@2024-11-01' = {
         }
         {
           name: 'OTEL_COLLECTOR_URL'
-          value: env_outputs_dashboard_uri
+          value: env_outputs_azure_app_service_dashboard_uri
         }
         {
           name: 'OTEL_CLIENT_ID'

tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddContainerAppEnvironmentAddsDeploymentTargetWithContainerAppToProjectResources.verified.json

@@ -8,6 +8,6 @@
     "env_outputs_azure_container_registry_managed_identity_client_id": "{env.outputs.AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_CLIENT_ID}",
     "api_containerimage": "{api.containerImage}",
     "api_containerport": "{api.containerPort}",
-    "env_outputs_dashboard_uri": "{env.outputs.DASHBOARD_URI}"
+    "env_outputs_azure_app_service_dashboard_uri": "{env.outputs.AZURE_APP_SERVICE_DASHBOARD_URI}"
   }
 }

tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddContainerAppEnvironmentAddsEnvironmentResource.verified.bicep

@@ -141,6 +141,4 @@ output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID string = env_mi.id
 
 output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_CLIENT_ID string = env_mi.properties.clientId
 
-output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_NAME string = env_mi.name
-
-output DASHBOARD_URI string = 'https://${take('${toLower('dashboard')}-${uniqueString(resourceGroup().id)}', 60)}.azurewebsites.net'
+output AZURE_APP_SERVICE_DASHBOARD_URI string = 'https://${take('${toLower('dashboard')}-${uniqueString(resourceGroup().id)}', 60)}.azurewebsites.net'

tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddDockerfileWithAppServiceInfrastructureAddsDeploymentTargetWithAppServiceToContainerResources.verified.bicep

@@ -11,7 +11,7 @@ param env_outputs_azure_container_registry_managed_identity_client_id string
 
 param api_containerimage string
 
-param env_outputs_dashboard_uri string
+param env_outputs_azure_app_service_dashboard_uri string
 
 resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = {
   name: 'main'
@@ -57,7 +57,7 @@ resource webapp 'Microsoft.Web/sites@2024-11-01' = {
         }
         {
           name: 'OTEL_COLLECTOR_URL'
-          value: env_outputs_dashboard_uri
+          value: env_outputs_azure_app_service_dashboard_uri
         }
         {
           name: 'OTEL_CLIENT_ID'

tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureAppServiceTests.AddDockerfileWithAppServiceInfrastructureAddsDeploymentTargetWithAppServiceToContainerResources.verified.json

@@ -7,6 +7,6 @@
     "env_outputs_azure_container_registry_managed_identity_id": "{env.outputs.AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID}",
     "env_outputs_azure_container_registry_managed_identity_client_id": "{env.outputs.AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_CLIENT_ID}",
     "api_containerimage": "{api.containerImage}",
-    "env_outputs_dashboard_uri": "{env.outputs.DASHBOARD_URI}"
+    "env_outputs_azure_app_service_dashboard_uri": "{env.outputs.AZURE_APP_SERVICE_DASHBOARD_URI}"
   }
 }