fixup! AzureStorage auto create queues

RussKie · RussKie · commit 3d8bc03b2d45 · 2025-05-22T12:17:20.000+10:00
diff --git a/src/Aspire.Hosting.Azure.Storage/AzureBlobStorageResource.cs b/src/Aspire.Hosting.Azure.Storage/AzureBlobStorageResource.cs
@@ -39,13 +39,7 @@ internal ReferenceExpression GetConnectionString(string? blobContainerName)
         }
 
         ReferenceExpressionBuilder builder = new();
-        builder.Append($"{Endpoint}=\"{ConnectionStringExpression}\";");
-
-        if (!string.IsNullOrEmpty(blobContainerName))
-        {
-            builder.Append($"{ContainerName}={blobContainerName};");
-        }
-
+        builder.Append($"{Endpoint}=\"{ConnectionStringExpression}\";{ContainerName}={blobContainerName};");
         return builder.Build();
     }
 
diff --git a/src/Aspire.Hosting.Azure.Storage/AzureQueueStorageQueueResource.cs b/src/Aspire.Hosting.Azure.Storage/AzureQueueStorageQueueResource.cs
@@ -10,7 +10,7 @@
 namespace Aspire.Hosting;
 
 /// <summary>
-/// A resource that represents an Azure Blob Storage queue.
+/// A resource that represents an Azure Storage queue.
 /// </summary>
 /// <param name="name">The name of the resource.</param>
 /// <param name="queueName">The name of the queue.</param>
@@ -25,7 +25,7 @@ public class AzureQueueStorageQueueResource(string name, string queueName, Azure
     public string QueueName { get; } = ThrowIfNullOrEmpty(queueName);
 
     /// <summary>
-    /// Gets the connection string template for the manifest for the Azure Blob Storage container resource.
+    /// Gets the connection string template for the manifest for the Azure Storage queue resource.
     /// </summary>
     public ReferenceExpression ConnectionStringExpression => Parent.GetConnectionString(QueueName);
 
diff --git a/src/Aspire.Hosting.Azure.Storage/AzureQueueStorageResource.cs b/src/Aspire.Hosting.Azure.Storage/AzureQueueStorageResource.cs
@@ -39,13 +39,7 @@ internal ReferenceExpression GetConnectionString(string? queueName)
         }
 
         ReferenceExpressionBuilder builder = new();
-        builder.Append($"{Endpoint}=\"{ConnectionStringExpression}\";");
-
-        if (!string.IsNullOrEmpty(queueName))
-        {
-            builder.Append($"{QueueName}={queueName};");
-        }
-
+        builder.Append($"{Endpoint}=\"{ConnectionStringExpression}\";{QueueName}={queueName};");
         return builder.Build();
     }
 
diff --git a/src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs b/src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs
@@ -72,38 +72,43 @@ public static IResourceBuilder<AzureStorageResource> AddAzureStorage(this IDistr
                     Tags = { { "aspire-resource-name", infrastructure.AspireResource.Name } }
                 });
 
-            var blobs = new BlobService("blobs")
-            {
-                Parent = storageAccount
-            };
-            infrastructure.Add(blobs);
-
-            var queues = new QueueService("queues")
-            {
-                Parent = storageAccount
-            };
-            infrastructure.Add(queues);
-
-            infrastructure.Add(new ProvisioningOutput("blobEndpoint", typeof(string)) { Value = storageAccount.PrimaryEndpoints.BlobUri });
-            infrastructure.Add(new ProvisioningOutput("queueEndpoint", typeof(string)) { Value = storageAccount.PrimaryEndpoints.QueueUri });
-            infrastructure.Add(new ProvisioningOutput("tableEndpoint", typeof(string)) { Value = storageAccount.PrimaryEndpoints.TableUri });
-
             var azureResource = (AzureStorageResource)infrastructure.AspireResource;
 
-            foreach (var blobContainer in azureResource.BlobContainers)
+            if (azureResource.BlobContainers.Count > 0)
             {
-                var cdkBlobContainer = blobContainer.ToProvisioningEntity();
-                cdkBlobContainer.Parent = blobs;
-                infrastructure.Add(cdkBlobContainer);
+                var blobs = new BlobService("blobs")
+                {
+                    Parent = storageAccount
+                };
+                infrastructure.Add(blobs);
+
+                foreach (var blobContainer in azureResource.BlobContainers)
+                {
+                    var cdkBlobContainer = blobContainer.ToProvisioningEntity();
+                    cdkBlobContainer.Parent = blobs;
+                    infrastructure.Add(cdkBlobContainer);
+                }
             }
 
-            foreach (var queue in azureResource.Queues)
+            if (azureResource.Queues.Count > 0)
             {
-                var cdkQueue = queue.ToProvisioningEntity();
-                cdkQueue.Parent = queues;
-                infrastructure.Add(cdkQueue);
+                var queues = new QueueService("queues")
+                {
+                    Parent = storageAccount
+                };
+                infrastructure.Add(queues);
+                foreach (var queue in azureResource.Queues)
+                {
+                    var cdkQueue = queue.ToProvisioningEntity();
+                    cdkQueue.Parent = queues;
+                    infrastructure.Add(cdkQueue);
+                }
             }
 
+            infrastructure.Add(new ProvisioningOutput("blobEndpoint", typeof(string)) { Value = storageAccount.PrimaryEndpoints.BlobUri });
+            infrastructure.Add(new ProvisioningOutput("queueEndpoint", typeof(string)) { Value = storageAccount.PrimaryEndpoints.QueueUri });
+            infrastructure.Add(new ProvisioningOutput("tableEndpoint", typeof(string)) { Value = storageAccount.PrimaryEndpoints.TableUri });
+
             // We need to output name to externalize role assignments.
             infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = storageAccount.Name });
         };
diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureBicepResourceTests.AddAzureStorageViaPublishMode.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureBicepResourceTests.AddAzureStorageViaPublishMode.verified.bicep
@@ -23,15 +23,6 @@ resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {
   }
 }
 
-resource blobs 'Microsoft.Storage/storageAccounts/blobServices@2024-01-01' = {
-  name: 'default'
-  parent: storage
-}
-
-resource queues 'Microsoft.Storage/storageAccounts/queueServices@2024-01-01' = {
-  parent: storage
-}
-
 output blobEndpoint string = storage.properties.primaryEndpoints.blob
 
 output queueEndpoint string = storage.properties.primaryEndpoints.queue
diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureBicepResourceTests.AddAzureStorageViaPublishModeEnableAllowSharedKeyAccessOverridesDefaultFalse.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureBicepResourceTests.AddAzureStorageViaPublishModeEnableAllowSharedKeyAccessOverridesDefaultFalse.verified.bicep
@@ -23,15 +23,6 @@ resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {
   }
 }
 
-resource blobs 'Microsoft.Storage/storageAccounts/blobServices@2024-01-01' = {
-  name: 'default'
-  parent: storage
-}
-
-resource queues 'Microsoft.Storage/storageAccounts/queueServices@2024-01-01' = {
-  parent: storage
-}
-
 output blobEndpoint string = storage.properties.primaryEndpoints.blob
 
 output queueEndpoint string = storage.properties.primaryEndpoints.queue
diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureBicepResourceTests.AddAzureStorageViaRunMode.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureBicepResourceTests.AddAzureStorageViaRunMode.verified.bicep
@@ -23,15 +23,6 @@ resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {
   }
 }
 
-resource blobs 'Microsoft.Storage/storageAccounts/blobServices@2024-01-01' = {
-  name: 'default'
-  parent: storage
-}
-
-resource queues 'Microsoft.Storage/storageAccounts/queueServices@2024-01-01' = {
-  parent: storage
-}
-
 output blobEndpoint string = storage.properties.primaryEndpoints.blob
 
 output queueEndpoint string = storage.properties.primaryEndpoints.queue
diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureBicepResourceTests.AddAzureStorageViaRunModeAllowSharedKeyAccessOverridesDefaultFalse.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureBicepResourceTests.AddAzureStorageViaRunModeAllowSharedKeyAccessOverridesDefaultFalse.verified.bicep
@@ -23,15 +23,6 @@ resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {
   }
 }
 
-resource blobs 'Microsoft.Storage/storageAccounts/blobServices@2024-01-01' = {
-  name: 'default'
-  parent: storage
-}
-
-resource queues 'Microsoft.Storage/storageAccounts/queueServices@2024-01-01' = {
-  parent: storage
-}
-
 output blobEndpoint string = storage.properties.primaryEndpoints.blob
 
 output queueEndpoint string = storage.properties.primaryEndpoints.queue
diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureEnvironmentResourceTests.AzurePublishingContext_CapturesParametersAndOutputsCorrectly_WithSnapshot#01.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureEnvironmentResourceTests.AzurePublishingContext_CapturesParametersAndOutputsCorrectly_WithSnapshot#01.verified.bicep
@@ -25,15 +25,6 @@ resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {
   }
 }
 
-resource blobs 'Microsoft.Storage/storageAccounts/blobServices@2024-01-01' = {
-  name: 'default'
-  parent: storage
-}
-
-resource queues 'Microsoft.Storage/storageAccounts/queueServices@2024-01-01' = {
-  parent: storage
-}
-
 output blobEndpoint string = storage.properties.primaryEndpoints.blob
 
 output queueEndpoint string = storage.properties.primaryEndpoints.queue
diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureStorageExtensionsTests.ResourceNamesBicepValid.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureStorageExtensionsTests.ResourceNamesBicepValid.verified.bicep
@@ -26,15 +26,15 @@ 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
 }
 
+resource queues 'Microsoft.Storage/storageAccounts/queueServices@2024-01-01' = {
+  parent: storage
+}
+
 resource myqueue 'Microsoft.Storage/storageAccounts/queueServices/queues@2024-01-01' = {
   name: 'my-queue'
   parent: queues
diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingStorageAccountWithResourceGroup.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingStorageAccountWithResourceGroup.verified.bicep
@@ -7,15 +7,6 @@ resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' existing = {
   name: existingResourceName
 }
 
-resource blobs 'Microsoft.Storage/storageAccounts/blobServices@2024-01-01' = {
-  name: 'default'
-  parent: storage
-}
-
-resource queues 'Microsoft.Storage/storageAccounts/queueServices@2024-01-01' = {
-  parent: storage
-}
-
 output blobEndpoint string = storage.properties.primaryEndpoints.blob
 
 output queueEndpoint string = storage.properties.primaryEndpoints.queue
diff --git a/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingStorageAccountWithResourceGroupAndStaticArguments.verified.bicep b/tests/Aspire.Hosting.Azure.Tests/Snapshots/ExistingAzureResourceTests.SupportsExistingStorageAccountWithResourceGroupAndStaticArguments.verified.bicep
@@ -5,15 +5,6 @@ resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' existing = {
   name: 'existingResourcename'
 }
 
-resource blobs 'Microsoft.Storage/storageAccounts/blobServices@2024-01-01' = {
-  name: 'default'
-  parent: storage
-}
-
-resource queues 'Microsoft.Storage/storageAccounts/queueServices@2024-01-01' = {
-  parent: storage
-}
-
 output blobEndpoint string = storage.properties.primaryEndpoints.blob
 
 output queueEndpoint string = storage.properties.primaryEndpoints.queue

Original file line number	Diff line number	Diff line change
`@@ -39,13 +39,7 @@ internal ReferenceExpression GetConnectionString(string? blobContainerName)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`ReferenceExpressionBuilder builder = new();`
`42`		`- builder.Append($"{Endpoint}=\"{ConnectionStringExpression}\";");`
`43`		`-`
`44`		`- if (!string.IsNullOrEmpty(blobContainerName))`
`45`		`- {`
`46`		`- builder.Append($"{ContainerName}={blobContainerName};");`
`47`		`- }`
`48`		`-`
	`42`	`+ builder.Append($"{Endpoint}=\"{ConnectionStringExpression}\";{ContainerName}={blobContainerName};");`
`49`	`43`	`return builder.Build();`
`50`	`44`	`}`
`51`	`45`
Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,6 @@ resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`-resource blobs 'Microsoft.Storage/storageAccounts/blobServices@2024-01-01' = {`
`27`		`- name: 'default'`
`28`		`- parent: storage`
`29`		`-}`
`30`		`-`
`31`		`-resource queues 'Microsoft.Storage/storageAccounts/queueServices@2024-01-01' = {`
`32`		`- parent: storage`
`33`		`-}`
`34`		`-`
`35`	`26`	`output blobEndpoint string = storage.properties.primaryEndpoints.blob`
`36`	`27`
`37`	`28`	`output queueEndpoint string = storage.properties.primaryEndpoints.queue`
Original file line number	Diff line number	Diff line change
`@@ -25,15 +25,6 @@ resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`-resource blobs 'Microsoft.Storage/storageAccounts/blobServices@2024-01-01' = {`
`29`		`- name: 'default'`
`30`		`- parent: storage`
`31`		`-}`
`32`		`-`
`33`		`-resource queues 'Microsoft.Storage/storageAccounts/queueServices@2024-01-01' = {`
`34`		`- parent: storage`
`35`		`-}`
`36`		`-`
`37`	`28`	`output blobEndpoint string = storage.properties.primaryEndpoints.blob`
`38`	`29`
`39`	`30`	`output queueEndpoint string = storage.properties.primaryEndpoints.queue`