Clean up IAzureContainerRegistry explicit implementation

Author: captainsafia

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

@@ -165,40 +165,23 @@ await context.ReportingStep.CompleteAsync(
 
     internal Dictionary<string, (IResource resource, ContainerMountAnnotation volume, int index, BicepOutputReference outputReference)> VolumeNames { get; } = [];
 
-    private IContainerRegistry? GetAssociatedRegistry()
+    private IAzureContainerRegistry GetAssociatedRegistry()
     {
-        return this.TryGetLastAnnotation<ContainerRegistryReferenceAnnotation>(out var annotation)
-            ? annotation.Registry
-            : null;
-    }
-
-    // Implement IAzureContainerRegistry interface by delegating to the associated registry
-    ReferenceExpression IContainerRegistry.Name
-    {
-        get
+        if (this.TryGetLastAnnotation<ContainerRegistryReferenceAnnotation>(out var annotation) &&
+            annotation.Registry is IAzureContainerRegistry registry)
         {
-            var registry = GetAssociatedRegistry();
-            return registry?.Name ?? throw new InvalidOperationException($"No container registry associated with environment '{Name}'");
+            return registry;
         }
-    }
 
-    ReferenceExpression IContainerRegistry.Endpoint
-    {
-        get
-        {
-            var registry = GetAssociatedRegistry();
-            return registry?.Endpoint ?? throw new InvalidOperationException($"No container registry associated with environment '{Name}'");
-        }
+        throw new InvalidOperationException($"No Azure container registry associated with environment '{Name}'");
     }
 
-    ReferenceExpression IAzureContainerRegistry.ManagedIdentityId
-    {
-        get
-        {
-            var registry = GetAssociatedRegistry() as IAzureContainerRegistry;
-            return registry?.ManagedIdentityId ?? throw new InvalidOperationException($"No Azure container registry associated with environment '{Name}'");
-        }
-    }
+    // Implement IAzureContainerRegistry interface by delegating to the associated registry
+    ReferenceExpression IContainerRegistry.Name => GetAssociatedRegistry().Name;
+
+    ReferenceExpression IContainerRegistry.Endpoint => GetAssociatedRegistry().Endpoint;
+
+    ReferenceExpression IAzureContainerRegistry.ManagedIdentityId => GetAssociatedRegistry().ManagedIdentityId;
 
     ReferenceExpression IComputeEnvironmentResource.GetHostAddressExpression(EndpointReference endpointReference)
     {

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

@@ -203,40 +203,23 @@ await context.ReportingStep.CompleteAsync(
     internal static BicepValue<string> GetWebSiteSuffixBicep() =>
         BicepFunction.GetUniqueString(BicepFunction.GetResourceGroup().Id);
 
-    private IContainerRegistry? GetAssociatedRegistry()
+    private IAzureContainerRegistry GetAssociatedRegistry()
     {
-        return this.TryGetLastAnnotation<ContainerRegistryReferenceAnnotation>(out var annotation)
-            ? annotation.Registry
-            : null;
-    }
-
-    // Implement IAzureContainerRegistry interface by delegating to the associated registry
-    ReferenceExpression IAzureContainerRegistry.ManagedIdentityId
-    {
-        get
+        if (this.TryGetLastAnnotation<ContainerRegistryReferenceAnnotation>(out var annotation) &&
+            annotation.Registry is IAzureContainerRegistry registry)
         {
-            var registry = GetAssociatedRegistry() as IAzureContainerRegistry;
-            return registry?.ManagedIdentityId ?? throw new InvalidOperationException($"No Azure container registry associated with environment '{Name}'");
+            return registry;
         }
-    }
 
-    ReferenceExpression IContainerRegistry.Name
-    {
-        get
-        {
-            var registry = GetAssociatedRegistry();
-            return registry?.Name ?? throw new InvalidOperationException($"No container registry associated with environment '{Name}'");
-        }
+        throw new InvalidOperationException($"No Azure container registry associated with environment '{Name}'");
     }
 
-    ReferenceExpression IContainerRegistry.Endpoint
-    {
-        get
-        {
-            var registry = GetAssociatedRegistry();
-            return registry?.Endpoint ?? throw new InvalidOperationException($"No container registry associated with environment '{Name}'");
-        }
-    }
+    // Implement IAzureContainerRegistry interface by delegating to the associated registry
+    ReferenceExpression IAzureContainerRegistry.ManagedIdentityId => GetAssociatedRegistry().ManagedIdentityId;
+
+    ReferenceExpression IContainerRegistry.Name => GetAssociatedRegistry().Name;
+
+    ReferenceExpression IContainerRegistry.Endpoint => GetAssociatedRegistry().Endpoint;
 
     ReferenceExpression IComputeEnvironmentResource.GetHostAddressExpression(EndpointReference endpointReference)
     {