Implement the functions interface on storage as well

Author: davidfowl

src/Aspire.Hosting.Azure.Functions/AzureFunctionsProjectResourceExtensions.cs

@@ -30,7 +30,7 @@ public static class AzureFunctionsProjectResourceExtensions
             builder.Eventing.Subscribe<BeforeStartEvent>((data, token) =>
             {
                 var removeStorage = true;
-                // Look at all of the resources and if non of them use the default storage, then we can remove it.
+                // Look at all of the resources and if none of them use the default storage, then we can remove it.
                 // This is because we're unable to cleanly add a resource to the builder from within a callback.
                 foreach (var item in data.Model.Resources.OfType<AzureFunctionsProjectResource>())
                 {
@@ -111,15 +111,8 @@ public static class AzureFunctionsProjectResourceExtensions
                 context.EnvironmentVariables["ASPNETCORE_FORWARDEDHEADERS_ENABLED"] = "true";
                 context.EnvironmentVariables["FUNCTIONS_WORKER_RUNTIME"] = "dotnet-isolated";
 
-                if (resource.HostStorage.IsEmulator)
-                {
-                    context.EnvironmentVariables["Storage"] = resource.HostStorage.GetEmulatorConnectionString();
-                }
-                else
-                {
-                    context.EnvironmentVariables["Storage__blobServiceUri"] = resource.HostStorage.BlobEndpoint;
-                    context.EnvironmentVariables["Storage__queueServiceUri"] = resource.HostStorage.QueueEndpoint;
-                }
+                // Set the storage connection string.
+                ((IResourceWithAzureFunctionsConfig)resource.HostStorage).ApplyAzureFunctionsConfiguration(context.EnvironmentVariables, "Storage");
             })
             .WithOtlpExporter()
             .WithHttpEndpoint()

src/Aspire.Hosting.Azure.Storage/AzureStorageResource.cs

@@ -12,7 +12,8 @@ namespace Aspire.Hosting.Azure;
 /// <param name="configureConstruct">Callback to populate the construct with Azure resources.</param>
 public class AzureStorageResource(string name, Action<ResourceModuleConstruct> configureConstruct) :
     AzureConstructResource(name, configureConstruct),
-    IResourceWithEndpoints
+    IResourceWithEndpoints,
+    IResourceWithAzureFunctionsConfig
 {
     private EndpointReference EmulatorBlobEndpoint => new(this, "blob");
     private EndpointReference EmulatorQueueEndpoint => new(this, "queue");
@@ -42,7 +43,7 @@ public class AzureStorageResource(string name, Action<ResourceModuleConstruct> c
     /// Gets the connection string for the Azure Storage emulator.
     /// </summary>
     /// <returns></returns>
-    public ReferenceExpression GetEmulatorConnectionString() => IsEmulator
+    internal ReferenceExpression GetEmulatorConnectionString() => IsEmulator
        ? ReferenceExpression.Create($"{AzureStorageEmulatorConnectionString.Create(blobPort: EmulatorBlobEndpoint.Port, queuePort: EmulatorQueueEndpoint.Port, tablePort: EmulatorTableEndpoint.Port)}")
        : throw new InvalidOperationException("The Azure Storage resource is not running in the local emulator.");
 
@@ -57,4 +58,17 @@ internal ReferenceExpression GetQueueConnectionString() => IsEmulator
     internal ReferenceExpression GetBlobConnectionString() => IsEmulator
         ? ReferenceExpression.Create($"{AzureStorageEmulatorConnectionString.Create(blobPort: EmulatorBlobEndpoint.Port)}")
         : ReferenceExpression.Create($"{BlobEndpoint}");
+
+    void IResourceWithAzureFunctionsConfig.ApplyAzureFunctionsConfiguration(IDictionary<string, object> target, string connectionName)
+    {
+        if (IsEmulator)
+        {
+            target[connectionName] = GetEmulatorConnectionString();
+        }
+        else
+        {
+            target[$"{connectionName}__blobServiceUri"] = BlobEndpoint;
+            target[$"{connectionName}__queueServiceUri"] = QueueEndpoint;
+        }
+    }
 }

src/Aspire.Hosting.Azure.Storage/PublicAPI.Unshipped.txt

@@ -1,2 +1,2 @@
 #nullable enable
-Aspire.Hosting.Azure.AzureStorageResource.GetEmulatorConnectionString() -> Aspire.Hosting.ApplicationModel.ReferenceExpression!
+