Refactor Azure Storage API (#10241)

* Add AddBlobContainer on AzureStorageResource

* Add AddQueue

* Rename AzureQueueResource to AzureQueueStorageQueueResource

* Rename AddAzureQueueServiceClient to AddAzureQueueServiceClient

* More refactorings

* Rename obsolete methods

* Fix tests

* Fix tests

* Fix markdown

* Add API diff

* Add nameless storage resources

* Update API diff

* Update tables

* Update tests/Aspire.Hosting.Azure.Tests/AzureStorageExtensionsTests.cs

Co-authored-by: Copilot <[email protected]>

* Some feedback work

* Revert functions playground changes

* Fix test

* Fix storage playground app

* Use Regex to remove connection string property

* Revert API diff changes

* Add bicep test

* Updated manifest

---------

Co-authored-by: Copilot <[email protected]>

Author: sebastienros

playground/AspireEventHub/EventHubs.AppHost/Program.cs

@@ -3,7 +3,7 @@
 // required for the event processor client which will use the connectionName to get the connectionString.
 var blob = builder.AddAzureStorage("ehstorage")
     .RunAsEmulator()
-    .AddBlobs("checkpoints");
+    .AddBlobService("checkpoints");
 
 var eventHub = builder.AddAzureEventHubs("eventhubns")
     .RunAsEmulator()

playground/AspireEventHub/EventHubsConsumer/Program.cs

@@ -18,7 +18,7 @@
 else
 {
     // required for checkpointing our position in the event stream
-    builder.AddAzureBlobClient("checkpoints");
+    builder.AddAzureBlobServiceClient("checkpoints");
 
     builder.AddAzureEventProcessorClient("eventhubOne");
 

playground/AzureAppService/AzureAppService.ApiService/Program.cs

@@ -10,7 +10,7 @@
 builder.AddServiceDefaults();
 
 builder.AddCosmosDbContext<TestCosmosContext>("account", "db");
-builder.AddAzureBlobClient("blobs");
+builder.AddAzureBlobServiceClient("blobs");
 
 var app = builder.Build();
 

playground/AzureAppService/AzureAppService.AppHost/Program.cs

@@ -25,7 +25,7 @@
                          storage.AllowBlobPublicAccess = false;
                      })
                      .RunAsEmulator(c => c.WithLifetime(ContainerLifetime.Persistent));
-var blobs = storage.AddBlobs("blobs");
+var blobs = storage.AddBlobService("blobs");
 
 // Testing projects
 builder.AddProject<Projects.AzureAppService_ApiService>("api")

playground/AzureContainerApps/AzureContainerApps.ApiService/Program.cs

@@ -11,7 +11,7 @@
 builder.AddServiceDefaults();
 
 builder.AddCosmosDbContext<TestCosmosContext>("account", "db");
-builder.AddAzureBlobClient("blobs");
+builder.AddAzureBlobServiceClient("blobs");
 builder.AddRedisClient("cache");
 
 var app = builder.Build();

playground/AzureContainerApps/AzureContainerApps.AppHost/Program.cs

@@ -31,7 +31,7 @@
 // Testing a connection string
 var storage = builder.AddAzureStorage("storage")
                      .RunAsEmulator(c => c.WithLifetime(ContainerLifetime.Persistent));
-var blobs = storage.AddBlobs("blobs");
+var blobs = storage.AddBlobService("blobs");
 
 // Testing docker files
 

playground/AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.ApiService/Program.cs

@@ -14,8 +14,8 @@
 
 // Add service defaults & Aspire client integrations.
 builder.AddServiceDefaults();
-builder.AddAzureQueueClient("queue");
-builder.AddAzureBlobClient("blob");
+builder.AddAzureQueueServiceClient("queue");
+builder.AddAzureBlobServiceClient("blob");
 builder.AddAzureEventHubProducerClient("myhub");
 #if !SKIP_UNSTABLE_EMULATORS
 builder.AddAzureServiceBusClient("messaging");

playground/AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.AppHost/Program.cs

@@ -3,9 +3,9 @@
 builder.AddAzureContainerAppEnvironment("env");
 
 var storage = builder.AddAzureStorage("storage").RunAsEmulator();
-var queue = storage.AddQueues("queue");
-var blob = storage.AddBlobs("blob");
-var myBlobContainer = blob.AddBlobContainer("myblobcontainer");
+var queue = storage.AddQueueService("queue");
+var blob = storage.AddBlobService("blob");
+var myBlobContainer = storage.AddBlobContainer("myblobcontainer");
 
 var eventHub = builder.AddAzureEventHubs("eventhubs")
     .RunAsEmulator()
@@ -24,11 +24,11 @@
 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)
 #endif
+    .WithReference(myBlobContainer).WaitFor(myBlobContainer)
     .WithReference(blob)
     .WithReference(queue);
 

playground/AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.Functions/MyAzureBlobTrigger.cs

@@ -4,7 +4,7 @@
 
 namespace AzureFunctionsEndToEnd.Functions;
 
-public class MyAzureBlobTrigger(ILogger<MyAzureBlobTrigger> logger, BlobContainerClient containerClient)
+public class MyAzureBlobTrigger(BlobContainerClient containerClient, ILogger<MyAzureBlobTrigger> logger)
 {
     [Function(nameof(MyAzureBlobTrigger))]
     [BlobOutput("test-files/{name}.txt", Connection = "blob")]

playground/AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.Functions/MyAzureQueueTrigger.cs

@@ -8,7 +8,7 @@ public class MyAzureQueueTrigger(ILogger<MyAzureQueueTrigger> logger)
 {
     [Function(nameof(MyAzureQueueTrigger))]
     public void Run([QueueTrigger("queue", Connection = "queue")] QueueMessage message)
-    {
+    {        
         logger.LogInformation("C# Queue trigger function processed: {Text}", message.MessageText);
     }
 }