Revert AspireBlobStorageBuilder

Author: RussKie

playground/AzureStorageEndToEnd/AzureStorageEndToEnd.ApiService/Program.cs

@@ -8,9 +8,7 @@
 
 builder.AddServiceDefaults();
 
-builder.AddAzureBlobClient("blobs")
-       .AddKeyedAzureBlobContainerClient(blobContainerName: "test-container-1")
-       .AddKeyedAzureBlobContainerClient(blobContainerName: "test-container-2");
+builder.AddAzureBlobClient("blobs");
 builder.AddKeyedAzureBlobContainerClient("foocontainer");
 
 builder.AddAzureQueueClient("queues");
@@ -19,21 +17,7 @@
 
 app.MapDefaultEndpoints();
 
-app.MapGet("/", async ([FromKeyedServices("test-container-1")] BlobContainerClient keyedContainerClient1,
-                       [FromKeyedServices("foocontainer")] BlobContainerClient keyedContainerClient2) =>
-{
-    var blobNames = new List<string>();
-    var blobNameAndContent = Guid.NewGuid().ToString();
-
-    await keyedContainerClient1.UploadBlobAsync(blobNameAndContent, new BinaryData(blobNameAndContent));
-    await keyedContainerClient2.UploadBlobAsync(blobNameAndContent, new BinaryData(blobNameAndContent));
-
-    await ReadBlobsAsync(keyedContainerClient1, blobNames);
-    await ReadBlobsAsync(keyedContainerClient2, blobNames);
-
-    return blobNames;
-});
-app.MapGet("/test", async (BlobServiceClient bsc, QueueServiceClient qsc, [FromKeyedServices("test-container-2")] BlobContainerClient keyedContainerClient1) =>
+app.MapGet("/", async (BlobServiceClient bsc, QueueServiceClient qsc, [FromKeyedServices("foocontainer")] BlobContainerClient keyedContainerClient1) =>
 {
     var blobNames = new List<string>();
     var blobNameAndContent = Guid.NewGuid().ToString();

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

@@ -33,7 +33,7 @@ public static partial class AspireBlobStorageExtensions
     /// <exception cref="InvalidOperationException">
     ///  Neither <see cref="AzureStorageBlobsSettings.ConnectionString"/> nor <see cref="AzureStorageBlobsSettings.ServiceUri"/> is provided.
     /// </exception>
-    public static AspireBlobStorageBuilder AddAzureBlobClient(
+    public static void AddAzureBlobClient(
         this IHostApplicationBuilder builder,
         string connectionName,
         Action<AzureStorageBlobsSettings>? configureSettings = null,
@@ -42,9 +42,7 @@ public static AspireBlobStorageBuilder AddAzureBlobClient(
         ArgumentNullException.ThrowIfNull(builder);
         ArgumentException.ThrowIfNullOrEmpty(connectionName);
 
-        var settings = new BlobStorageComponent().AddClient(builder, DefaultConfigSectionName, configureSettings, configureClientBuilder, connectionName, serviceKey: null);
-
-        return new AspireBlobStorageBuilder(builder, connectionName, serviceKey: null, settings);
+        new BlobStorageComponent().AddClient(builder, DefaultConfigSectionName, configureSettings, configureClientBuilder, connectionName, serviceKey: null);
     }
 
     /// <summary>
@@ -67,7 +65,7 @@ public static AspireBlobStorageBuilder AddAzureBlobClient(
     /// <exception cref="InvalidOperationException">
     ///  Neither <see cref="AzureStorageBlobsSettings.ConnectionString"/> nor <see cref="AzureStorageBlobsSettings.ServiceUri"/> is provided.
     /// </exception>
-    public static AspireBlobStorageBuilder AddKeyedAzureBlobClient(
+    public static void AddKeyedAzureBlobClient(
         this IHostApplicationBuilder builder,
         string name,
         Action<AzureStorageBlobsSettings>? configureSettings = null,
@@ -76,9 +74,7 @@ public static AspireBlobStorageBuilder AddKeyedAzureBlobClient(
         ArgumentNullException.ThrowIfNull(builder);
         ArgumentException.ThrowIfNullOrEmpty(name);
 
-        var settings = new BlobStorageComponent().AddClient(builder, DefaultConfigSectionName, configureSettings, configureClientBuilder, connectionName: name, serviceKey: name);
-
-        return new AspireBlobStorageBuilder(builder, connectionName: name, serviceKey: name, settings);
+        new BlobStorageComponent().AddClient(builder, DefaultConfigSectionName, configureSettings, configureClientBuilder, connectionName: name, serviceKey: name);
     }
 
     /// <summary>