Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,6 @@ public static IResourceBuilder<AzureStorageResource> AddAzureStorage(this IDistr
}
}

if (azureResource.TableStorageResource is not null)
{
var tableService = azureResource.TableStorageResource.ToProvisioningEntity();
tableService.Parent = storageAccount;
infrastructure.Add(tableService);
}

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 });
Expand Down Expand Up @@ -470,8 +463,6 @@ public static IResourceBuilder<AzureTableStorageResource> AddTableService(this I
name ??= builder.Resource.Name + "-tables";

var resource = new AzureTableStorageResource(name, builder.Resource);
builder.Resource.TableStorageResource = resource;

return builder.ApplicationBuilder.AddResource(resource);
}

Expand Down
1 change: 0 additions & 1 deletion src/Aspire.Hosting.Azure.Storage/AzureStorageResource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ public class AzureStorageResource(string name, Action<AzureResourceInfrastructur

internal AzureBlobStorageResource? BlobStorageResource { get; set; }
internal AzureQueueStorageResource? QueueStorageResource { get; set; }
internal AzureTableStorageResource? TableStorageResource { get; set; }

internal List<AzureBlobStorageContainerResource> BlobContainers { get; } = [];

Expand Down
11 changes: 0 additions & 11 deletions src/Aspire.Hosting.Azure.Storage/AzureTableStorageResource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.

using Aspire.Hosting.ApplicationModel;
using Azure.Provisioning;

namespace Aspire.Hosting.Azure;

Expand Down Expand Up @@ -41,14 +40,4 @@ void IResourceWithAzureFunctionsConfig.ApplyAzureFunctionsConfiguration(IDiction
target[$"{AzureStorageResource.TablesConnectionKeyPrefix}__{connectionName}__ServiceUri"] = Parent.TableEndpoint; // Updated for consistency
}
}

/// <summary>
/// Converts the current instance to a provisioning entity.
/// </summary>
/// <returns>A <see cref="global::Azure.Provisioning.Storage.TableService"/> instance.</returns>
internal global::Azure.Provisioning.Storage.TableService ToProvisioningEntity()
{
global::Azure.Provisioning.Storage.TableService service = new(Infrastructure.NormalizeBicepIdentifier(Name));
return service;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,10 @@ resource queue 'Microsoft.Storage/storageAccounts/queueServices@2024-01-01' = {
parent: storage
}

resource table 'Microsoft.Storage/storageAccounts/tableServices@2024-01-01' = {
parent: storage
}

output blobEndpoint string = storage.properties.primaryEndpoints.blob

output queueEndpoint string = storage.properties.primaryEndpoints.queue

output tableEndpoint string = storage.properties.primaryEndpoints.table

output name string = storage.name
output name string = storage.name
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ resource queue2 'Microsoft.Storage/storageAccounts/queueServices/queues@2024-01-
parent: queueService2
}

resource tableService2 'Microsoft.Storage/storageAccounts/tableServices@2024-01-01' = {
parent: storage
}

output blobEndpoint string = storage.properties.primaryEndpoints.blob

output queueEndpoint string = storage.properties.primaryEndpoints.queue
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,10 @@ resource myqueue 'Microsoft.Storage/storageAccounts/queueServices/queues@2024-01
parent: myqueues
}

resource mytables 'Microsoft.Storage/storageAccounts/tableServices@2024-01-01' = {
parent: storage
}

output blobEndpoint string = storage.properties.primaryEndpoints.blob

output queueEndpoint string = storage.properties.primaryEndpoints.queue

output tableEndpoint string = storage.properties.primaryEndpoints.table

output name string = storage.name
output name string = storage.name
Loading