More tests

Author: RussKie

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.AddAzureQueueClient("queues");
+builder.AddAzureBlobClient("blobs");
 builder.AddAzureEventHubProducerClient("myhub");
 #if !SKIP_UNSTABLE_EMULATORS
 builder.AddAzureServiceBusClient("messaging");
@@ -26,8 +26,8 @@
 
 app.MapGet("/publish/asq", async (QueueServiceClient client, CancellationToken cancellationToken) =>
 {
-    var queue = client.GetQueueClient("queue");
-    await queue.CreateIfNotExistsAsync(cancellationToken: cancellationToken);
+    var queue = client.GetQueueClient("myqueue");
+
     var data = Convert.ToBase64String(Encoding.UTF8.GetBytes("Hello, World!"));
     await queue.SendMessageAsync(data, cancellationToken: cancellationToken);
     return Results.Ok("Message sent to Azure Storage Queue.");
@@ -41,15 +41,14 @@ static string RandomString(int length)
 
 app.MapGet("/publish/blob", async (BlobServiceClient client, CancellationToken cancellationToken, int length = 20) =>
 {
-    var container = client.GetBlobContainerClient("blobs");
-    await container.CreateIfNotExistsAsync(cancellationToken: cancellationToken);
+    var container = client.GetBlobContainerClient("myblobcontainer");
 
     var entry = new { Id = Guid.NewGuid(), Text = RandomString(length) };
     var blob = container.GetBlobClient(entry.Id.ToString());
 
     await blob.UploadAsync(new BinaryData(entry));
 
-    return Results.Ok("String uploaded to Azure Storage Blobs.");
+    return Results.Ok($"String uploaded to Azure Storage Blobs {container.Uri}.");
 });
 
 app.MapGet("/publish/eventhubs", async (EventHubProducerClient client, CancellationToken cancellationToken, int length = 20) =>

playground/AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.AppHost/Program.cs

@@ -1,9 +1,12 @@
 var builder = DistributedApplication.CreateBuilder(args);
 
 var storage = builder.AddAzureStorage("storage").RunAsEmulator();
-var queue = storage.AddQueues("queue");
-var blob = storage.AddBlobs("blob");
-var myBlobContainer = blob.AddBlobContainer("myblobcontainer");
+
+var queues = storage.AddQueues("queues");
+var myQueue = queues.AddQueue("myqueue");
+
+var blobs = storage.AddBlobs("blobs");
+var myBlobContainer = blobs.AddBlobContainer("myblobcontainer");
 
 var eventHub = builder.AddAzureEventHubs("eventhubs")
     .RunAsEmulator()
@@ -22,22 +25,23 @@
 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(blob)
-    .WithReference(queue);
+    .WithReference(blobs)
+    .WithReference(myBlobContainer).WaitFor(myBlobContainer)
+    .WithReference(queues)
+    .WithReference(myQueue).WaitFor(myQueue);
 
 builder.AddProject<Projects.AzureFunctionsEndToEnd_ApiService>("apiservice")
     .WithReference(eventHub).WaitFor(eventHub)
 #if !SKIP_UNSTABLE_EMULATORS
     .WithReference(serviceBus).WaitFor(serviceBus)
     .WithReference(cosmosDb).WaitFor(cosmosDb)
 #endif
-    .WithReference(queue)
-    .WithReference(blob)
+    .WithReference(queues)
+    .WithReference(blobs)
     .WithReference(funcApp);
 
 builder.Build().Run();

playground/AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.Functions/MyAzureBlobTrigger.cs

@@ -4,16 +4,16 @@
 
 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")]
-    public async Task<string> RunAsync([BlobTrigger("blobs/{name}", Connection = "blob")] string triggerString, FunctionContext context)
+    [BlobOutput("test-files/{name}.txt", Connection = "blobs")]
+    public async Task<string> RunAsync([BlobTrigger("myblobcontainer/{name}", Connection = "blobs")] string triggerString, FunctionContext context)
     {
         var blobName = (string)context.BindingContext.BindingData["name"]!;
-        await containerClient.UploadBlobAsync(blobName, new BinaryData(triggerString));
+        var accountInfo = await containerClient.GetAccountInfoAsync();
 
-        logger.LogInformation("C# blob trigger function invoked for 'blobs/{source}' with {message}...", blobName, triggerString);
+        logger.LogInformation("C# blob trigger function invoked for 'myblobcontainer/{source}' with {message}...", blobName, triggerString);
         return triggerString.ToUpper();
     }
 }

playground/AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.Functions/MyAzureQueueTrigger.cs

@@ -1,14 +1,17 @@
+using Azure.Storage.Queues;
 using Azure.Storage.Queues.Models;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Extensions.Logging;
 
 namespace AzureFunctionsEndToEnd.Functions;
 
-public class MyAzureQueueTrigger(ILogger<MyAzureQueueTrigger> logger)
+public class MyAzureQueueTrigger(QueueClient queueClient, ILogger<MyAzureQueueTrigger> logger)
 {
     [Function(nameof(MyAzureQueueTrigger))]
-    public void Run([QueueTrigger("queue", Connection = "queue")] QueueMessage message)
+    public void Run([QueueTrigger("myqueue", Connection = "queues")] QueueMessage message)
     {
+        var props = queueClient.GetProperties();
+
         logger.LogInformation("C# Queue trigger function processed: {Text}", message.MessageText);
     }
 }

playground/AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.Functions/MyHttpTrigger.cs

@@ -22,6 +22,7 @@ public class MyHttpTrigger(
 #endif
     EventHubProducerClient eventHubProducerClient,
     QueueServiceClient queueServiceClient,
+    QueueClient queueClient,
     BlobServiceClient blobServiceClient,
     BlobContainerClient blobContainerClient)
 {
@@ -35,6 +36,7 @@ public IResult Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post")] Ht
 #endif
         stringBuilder.AppendLine(CultureInfo.InvariantCulture, $"Aspire-injected EventHubProducerClient namespace: {eventHubProducerClient.FullyQualifiedNamespace}");
         stringBuilder.AppendLine(CultureInfo.InvariantCulture, $"Aspire-injected QueueServiceClient URI: {queueServiceClient.Uri}");
+        stringBuilder.AppendLine(CultureInfo.InvariantCulture, $"Aspire-injected QueueClient URI: {queueClient.Uri}");
         stringBuilder.AppendLine(CultureInfo.InvariantCulture, $"Aspire-injected BlobServiceClient URI: {blobServiceClient.Uri}");
         stringBuilder.AppendLine(CultureInfo.InvariantCulture, $"Aspire-injected BlobContainerClient URI: {blobContainerClient.Uri}");
         return Results.Text(stringBuilder.ToString());

playground/AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.Functions/Program.cs

@@ -4,9 +4,13 @@
 var builder = FunctionsApplication.CreateBuilder(args);
 
 builder.AddServiceDefaults();
-builder.AddAzureQueueClient("queue");
-builder.AddAzureBlobClient("blob");
+
+builder.AddAzureQueueClient("queues");
+builder.AddAzureQueue("myqueue");
+
+builder.AddAzureBlobClient("blobs");
 builder.AddAzureBlobContainerClient("myblobcontainer");
+
 builder.AddAzureEventHubProducerClient("myhub");
 #if !SKIP_UNSTABLE_EMULATORS
 builder.AddAzureServiceBusClient("messaging");

playground/AzureStorageEndToEnd/AzureStorageEndToEnd.ApiService/Program.cs

@@ -12,27 +12,29 @@
 builder.AddKeyedAzureBlobContainerClient("foocontainer");
 
 builder.AddAzureQueueClient("queues");
+builder.AddKeyedAzureQueueClient("myqueue");
 
 var app = builder.Build();
 
 app.MapDefaultEndpoints();
 
-app.MapGet("/", async (BlobServiceClient bsc, QueueServiceClient qsc, [FromKeyedServices("foocontainer")] BlobContainerClient keyedContainerClient1) =>
+app.MapGet("/", async (BlobServiceClient bsc, QueueServiceClient qsc, [FromKeyedServices("foocontainer")] BlobContainerClient bcc, [FromKeyedServices("myqueue")] QueueClient qc) =>
 {
     var blobNames = new List<string>();
     var blobNameAndContent = Guid.NewGuid().ToString();
 
-    await keyedContainerClient1.UploadBlobAsync(blobNameAndContent, new BinaryData(blobNameAndContent));
+    await bcc.UploadBlobAsync(blobNameAndContent, new BinaryData(blobNameAndContent));
 
     var directContainerClient = bsc.GetBlobContainerClient(blobContainerName: "test-container-1");
     await directContainerClient.UploadBlobAsync(blobNameAndContent, new BinaryData(blobNameAndContent));
 
     await ReadBlobsAsync(directContainerClient, blobNames);
-    await ReadBlobsAsync(keyedContainerClient1, blobNames);
+    await ReadBlobsAsync(bcc, blobNames);
 
+    // This will check the queue exists.
     var queue = qsc.GetQueueClient("myqueue");
-    await queue.CreateIfNotExistsAsync();
-    await queue.SendMessageAsync("Hello, world!");
+
+    await qc.SendMessageAsync("Hello, world!");
 
     return blobNames;
 });

playground/AzureStorageEndToEnd/AzureStorageEndToEnd.AppHost/Program.cs

@@ -13,6 +13,7 @@
 blobs.AddBlobContainer("mycontainer2", blobContainerName: "test-container-2");
 
 var queues = storage.AddQueues("queues");
+var myqueue = queues.AddQueue("myqueue", queueName: "my-queue");
 
 var storage2 = builder.AddAzureStorage("storage2").RunAsEmulator(container =>
 {
@@ -25,7 +26,8 @@
        .WithExternalHttpEndpoints()
        .WithReference(blobs).WaitFor(blobs)
        .WithReference(blobContainer2).WaitFor(blobContainer2)
-       .WithReference(queues).WaitFor(queues);
+       .WithReference(queues).WaitFor(queues)
+       .WithReference(myqueue).WaitFor(myqueue);
 
 #if !SKIP_DASHBOARD_REFERENCE
 // This project is only added in playground projects to support development/debugging

tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureStorageExtensionsTests.ResourceNamesBicepValid.verified.bicep

@@ -26,6 +26,10 @@ resource blobs 'Microsoft.Storage/storageAccounts/blobServices@2024-01-01' = {
   parent: storage
 }
 
+resource queues 'Microsoft.Storage/storageAccounts/queueServices@2024-01-01' = {
+  parent: storage
+}
+
 resource myContainer 'Microsoft.Storage/storageAccounts/blobServices/containers@2024-01-01' = {
   name: 'my-blob-container'
   parent: blobs

tests/Aspire.Playground.Tests/ProjectSpecificTests.cs

@@ -91,6 +91,7 @@ await WaitForAllTextAsync(app,
         {
             "Aspire-injected EventHubProducerClient namespace: localhost",
             "Aspire-injected QueueServiceClient URI: http://127.0.0.1:*/devstoreaccount1",
+            "Aspire-injected QueueClient URI: http://127.0.0.1:*/devstoreaccount1/myqueue",
             "Aspire-injected BlobServiceClient URI: http://127.0.0.1:*/devstoreaccount1",
             "Aspire-injected BlobContainerClient URI: http://127.0.0.1:*/devstoreaccount1/myblobcontainer"
         };