Test AF integration

Author: RussKie

playground/AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.AppHost/Program.cs

@@ -3,6 +3,8 @@
 var storage = builder.AddAzureStorage("storage").RunAsEmulator();
 var queue = storage.AddQueues("queue");
 var blob = storage.AddBlobs("blob");
+var myBlobContainer = blob.AddBlobContainer("myblobcontainer");
+
 var eventHub = builder.AddAzureEventHubs("eventhubs")
     .RunAsEmulator()
     .AddHub("myhub");
@@ -20,6 +22,7 @@
 var funcApp = builder.AddAzureFunctionsProject<Projects.AzureFunctionsEndToEnd_Functions>("funcapp")
     .WithExternalHttpEndpoints()
     .WithReference(eventHub).WaitFor(eventHub)
+    .WithReference(myBlobContainer).WaitFor(myBlobContainer)
 #if !SKIP_UNSTABLE_EMULATORS
     .WithReference(serviceBus).WaitFor(serviceBus)
     .WithReference(cosmosDb).WaitFor(cosmosDb)

playground/AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.Functions/MyAzureBlobTrigger.cs

@@ -1,16 +1,19 @@
+using Azure.Storage.Blobs;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Extensions.Logging;
 
 namespace AzureFunctionsEndToEnd.Functions;
 
-public class MyAzureBlobTrigger(ILogger<MyAzureBlobTrigger> logger)
+public class MyAzureBlobTrigger(ILogger<MyAzureBlobTrigger> logger, BlobContainerClient containerClient)
 {
     [Function(nameof(MyAzureBlobTrigger))]
     [BlobOutput("test-files/{name}.txt", Connection = "blob")]
-    public string Run([BlobTrigger("blobs/{name}", Connection = "blob")] string triggerString)
+    public async Task<string> RunAsync([BlobTrigger("blobs/{name}", Connection = "blob")] string triggerString, FunctionContext context)
     {
-        logger.LogInformation("C# blob trigger function invoked with {message}...", triggerString);
+        var blobName = (string)context.BindingContext.BindingData["name"]!;
+        await containerClient.UploadBlobAsync(blobName, new BinaryData(triggerString));
+
+        logger.LogInformation("C# blob trigger function invoked for 'blobs/{source}' with {message}...", blobName, triggerString);
         return triggerString.ToUpper();
     }
 }
-

playground/AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.Functions/Program.cs

@@ -6,6 +6,7 @@
 builder.AddServiceDefaults();
 builder.AddAzureQueueClient("queue");
 builder.AddAzureBlobClient("blob");
+builder.AddAzureBlobContainerClient("myblobcontainer");
 builder.AddAzureEventHubProducerClient("myhub");
 #if !SKIP_UNSTABLE_EMULATORS
 builder.AddAzureServiceBusClient("messaging");

src/Components/Aspire.Azure.Storage.Blobs/AzureBlobStorageContainerSettings.cs

@@ -1,18 +1,19 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Data.Common;
-using System.Globalization;
-using System.Text;
+using System.Text.RegularExpressions;
 using Aspire.Azure.Common;
 
 namespace Aspire.Azure.Storage.Blobs;
 
 /// <summary>
 /// Provides the client configuration settings for connecting to Azure Blob Storage container.
 /// </summary>
-public sealed class AzureBlobStorageContainerSettings : AzureStorageBlobsSettings, IConnectionStringSettings
+public sealed partial class AzureBlobStorageContainerSettings : AzureStorageBlobsSettings, IConnectionStringSettings
 {
+    [GeneratedRegex(@"ContainerName=([^;]*);")]
+    private static partial Regex ExtractContainerName();
+
     public string? BlobContainerName { get; set; }
 
     void IConnectionStringSettings.ParseConnectionString(string? connectionString)
@@ -22,38 +23,30 @@ void IConnectionStringSettings.ParseConnectionString(string? connectionString)
             return;
         }
 
+        // In the emulator mode, the connection string may look like:
+        //
+        //     DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=...;BlobEndpoint=http://127.0.0.1:5555/devstoreaccount1;ContainerName=<container_name>;
+        //
+        // When run against the real Azure resources, the connection string will look similar to:
+        //
+        //      https://<storage_name>.blob.core.windows.net/ContainerName=<container_name>;
+        //
+        // Retrieve the container name from the connection string, if it is present; and then
+        // remove it as it will upset BlobServiceClient.
+
+        if (ExtractContainerName().Match(connectionString) is var match)
+        {
+            BlobContainerName = match.Groups[1].Value;
+            connectionString = connectionString.Replace(match.Value, string.Empty);
+        }
+
         if (Uri.TryCreate(connectionString, UriKind.Absolute, out var uri))
         {
             ServiceUri = uri;
-
-            // TODO: how do we get the container name from the URI?
         }
         else
         {
-            var connectionBuilder = new DbConnectionStringBuilder()
-            {
-                ConnectionString = connectionString
-            };
-
-            if (connectionBuilder.TryGetValue("ContainerName", out var containerValue))
-            {
-                BlobContainerName = (string)containerValue;
-
-                // Remove it from the connection string, it is our custom property.
-                connectionBuilder["ContainerName"] = null;
-            }
-
-            // We can't use connectionBuilder.ConnectionString here, because connectionBuilder escapes values
-            // adding quotes and other characters, which upsets the Azure SDK.
-            // So, we have rebuilt the connection string manually.
-
-            StringBuilder builder = new();
-            foreach (string keyword in connectionBuilder.Keys)
-            {
-                builder.Append(CultureInfo.InvariantCulture, $"{keyword}={connectionBuilder[keyword]};");
-            }
-
-            ConnectionString = builder.ToString();
+            ConnectionString = connectionString;
         }
     }
 }