Skip to content

Add Functions host support to AzureTableStorageResource #7961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 8, 2025
Merged

Add Functions host support to AzureTableStorageResource #7961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions playground/AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.AppHost/aspire-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@
"ASPNETCORE_URLS": "http://\u002B:{funcapp.bindings.http.targetPort}",
"AzureWebJobsStorage__blobServiceUri": "{funcstorage67c6c.outputs.blobEndpoint}",
"AzureWebJobsStorage__queueServiceUri": "{funcstorage67c6c.outputs.queueEndpoint}",
"AzureWebJobsStorage__tableServiceUri": "{funcstorage67c6c.outputs.tableEndpoint}",
"Aspire__Azure__Storage__Blobs__AzureWebJobsStorage__ServiceUri": "{funcstorage67c6c.outputs.blobEndpoint}",
"Aspire__Azure__Storage__Queues__AzureWebJobsStorage__ServiceUri": "{funcstorage67c6c.outputs.queueEndpoint}",
"Aspire__Azure__Storage__Tables__AzureWebJobsStorage__ServiceUri": "{funcstorage67c6c.outputs.tableEndpoint}",
"myhub__fullyQualifiedNamespace": "{eventhubs.outputs.eventHubsEndpoint}",
"Aspire__Azure__Messaging__EventHubs__EventHubProducerClient__myhub__FullyQualifiedNamespace": "{eventhubs.outputs.eventHubsEndpoint}",
"Aspire__Azure__Messaging__EventHubs__EventHubConsumerClient__myhub__FullyQualifiedNamespace": "{eventhubs.outputs.eventHubsEndpoint}",
Expand Down
4 changes: 4 additions & 0 deletions src/Aspire.Hosting.Azure.Storage/AzureStorageResource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public class AzureStorageResource(string name, Action<AzureResourceInfrastructur

internal const string BlobsConnectionKeyPrefix = "Aspire__Azure__Storage__Blobs";
internal const string QueuesConnectionKeyPrefix = "Aspire__Azure__Storage__Queues";
internal const string TablesConnectionKeyPrefix = "Aspire__Azure__Storage__Tables";

/// <summary>
/// Gets the "blobEndpoint" output reference from the bicep template for the Azure Storage resource.
Expand Down Expand Up @@ -70,15 +71,18 @@ void IResourceWithAzureFunctionsConfig.ApplyAzureFunctionsConfiguration(IDiction
// Injected to support Aspire client integration for Azure Storage.
target[$"{BlobsConnectionKeyPrefix}__{connectionName}__ConnectionString"] = connectionString;
target[$"{QueuesConnectionKeyPrefix}__{connectionName}__ConnectionString"] = connectionString;
target[$"{TablesConnectionKeyPrefix}__{connectionName}__ConnectionString"] = connectionString;
}
else
{
// Injected to support Azure Functions listener initialization.
target[$"{connectionName}__blobServiceUri"] = BlobEndpoint;
target[$"{connectionName}__queueServiceUri"] = QueueEndpoint;
target[$"{connectionName}__tableServiceUri"] = TableEndpoint;
// Injected to support Aspire client integration for Azure Storage.
target[$"{BlobsConnectionKeyPrefix}__{connectionName}__ServiceUri"] = BlobEndpoint;
target[$"{QueuesConnectionKeyPrefix}__{connectionName}__ServiceUri"] = QueueEndpoint;
target[$"{TablesConnectionKeyPrefix}__{connectionName}__ServiceUri"] = TableEndpoint;
}
}
}
19 changes: 18 additions & 1 deletion src/Aspire.Hosting.Azure.Storage/AzureTableStorageResource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Aspire.Hosting.Azure;
/// <param name="name">The name of the resource.</param>
/// <param name="storage">The <see cref="AzureStorageResource"/> that the resource is stored in.</param>
public class AzureTableStorageResource(string name, AzureStorageResource storage)
: Resource(name), IResourceWithConnectionString, IResourceWithParent<AzureStorageResource>
: Resource(name), IResourceWithConnectionString, IResourceWithParent<AzureStorageResource>, IResourceWithAzureFunctionsConfig
{
/// <summary>
/// Gets the parent AzureStorageResource of this AzureTableStorageResource.
Expand All @@ -23,4 +23,21 @@ public class AzureTableStorageResource(string name, AzureStorageResource storage
/// </summary>
public ReferenceExpression ConnectionStringExpression =>
Parent.GetTableConnectionString();

void IResourceWithAzureFunctionsConfig.ApplyAzureFunctionsConfiguration(IDictionary<string, object> target, string connectionName)
{
if (Parent.IsEmulator)
{
var connectionString = Parent.GetEmulatorConnectionString();
target[connectionName] = connectionString;
target[$"{AzureStorageResource.TablesConnectionKeyPrefix}__{connectionName}__ConnectionString"] = connectionString;
}
else
{
// Injected to support Azure Functions listener.
target[$"{connectionName}__tableServiceUri"] = Parent.TableEndpoint;
// Injected to support Aspire client integration for Azure Storage Tables.
target[$"{AzureStorageResource.TablesConnectionKeyPrefix}__{connectionName}__ServiceUri"] = Parent.TableEndpoint; // Updated for consistency
}
}
}