Skip to content

Commit 7451a7e

Browse files
committed
fixup! AzureStorage auto create blob containers
1 parent 2c945f7 commit 7451a7e

File tree

3 files changed

+8
-18
lines changed

3 files changed

+8
-18
lines changed

src/Aspire.Hosting.Azure.Storage/AzureBlobStorageResource.cs

-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ public class AzureBlobStorageResource(string name, AzureStorageResource storage)
1616
IResourceWithParent<AzureStorageResource>,
1717
IResourceWithAzureFunctionsConfig
1818
{
19-
internal List<AzureBlobStorageContainerResource> BlobContainers { get; } = [];
20-
2119
/// <summary>
2220
/// Gets the parent AzureStorageResource of this AzureBlobStorageResource.
2321
/// </summary>

src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs

+7-15
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,11 @@ public static IResourceBuilder<AzureStorageResource> AddAzureStorage(this IDistr
8383

8484
var azureResource = (AzureStorageResource)infrastructure.AspireResource;
8585

86-
foreach (var blobStorageResources in azureResource.Blobs)
86+
foreach (var blobContainer in azureResource.BlobContainers)
8787
{
88-
foreach (var blobContainer in blobStorageResources.BlobContainers)
89-
{
90-
var cdkBlobContainer = blobContainer.ToProvisioningEntity();
91-
cdkBlobContainer.Parent = blobs;
92-
infrastructure.Add(cdkBlobContainer);
93-
}
88+
var cdkBlobContainer = blobContainer.ToProvisioningEntity();
89+
cdkBlobContainer.Parent = blobs;
90+
infrastructure.Add(cdkBlobContainer);
9491
}
9592

9693
// We need to output name to externalize role assignments.
@@ -159,12 +156,9 @@ public static IResourceBuilder<AzureStorageResource> RunAsEmulator(this IResourc
159156
throw new DistributedApplicationException($"ResourceReadyEvent was published for the '{builder.Resource.Name}' resource but the connection string was null.");
160157
}
161158

162-
foreach (var blobStorageResources in builder.Resource.Blobs)
159+
foreach (var blobContainer in builder.Resource.BlobContainers)
163160
{
164-
foreach (var blobContainer in blobStorageResources.BlobContainers)
165-
{
166-
await blobServiceClient.GetBlobContainerClient(blobContainer.BlobContainerName).CreateIfNotExistsAsync(cancellationToken: ct).ConfigureAwait(false);
167-
}
161+
await blobServiceClient.GetBlobContainerClient(blobContainer.BlobContainerName).CreateIfNotExistsAsync(cancellationToken: ct).ConfigureAwait(false);
168162
}
169163
});
170164

@@ -314,8 +308,6 @@ public static IResourceBuilder<AzureBlobStorageResource> AddBlobs(this IResource
314308
ArgumentException.ThrowIfNullOrEmpty(name);
315309

316310
var resource = new AzureBlobStorageResource(name, builder.Resource);
317-
builder.Resource.Blobs.Add(resource);
318-
319311
return builder.ApplicationBuilder.AddResource(resource);
320312
}
321313

@@ -335,7 +327,7 @@ public static IResourceBuilder<AzureBlobStorageContainerResource> AddBlobContain
335327

336328
AzureBlobStorageContainerResource resource = new(name, blobContainerName, builder.Resource);
337329

338-
builder.Resource.BlobContainers.Add(resource);
330+
builder.Resource.Parent.BlobContainers.Add(resource);
339331

340332
return builder.ApplicationBuilder.AddResource(resource);
341333
}

src/Aspire.Hosting.Azure.Storage/AzureStorageResource.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class AzureStorageResource(string name, Action<AzureResourceInfrastructur
2323
private EndpointReference EmulatorQueueEndpoint => new(this, "queue");
2424
private EndpointReference EmulatorTableEndpoint => new(this, "table");
2525

26-
internal List<AzureBlobStorageResource> Blobs { get; } = [];
26+
internal List<AzureBlobStorageContainerResource> BlobContainers { get; } = [];
2727

2828
/// <summary>
2929
/// Gets the "blobEndpoint" output reference from the bicep template for the Azure Storage resource.

0 commit comments

Comments
 (0)