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
1 change: 1 addition & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<PackageVersion Include="Azure.ResourceManager.Storage" Version="1.1.1" />
<PackageVersion Include="Azure.ResourceManager.Authorization" Version="1.1.0-beta.1" />
<PackageVersion Include="Azure.ResourceManager.Redis" Version="1.2.0" />
<PackageVersion Include="Azure.ResourceManager.AppConfiguration" Version="1.1.0-beta.1" />
<!-- ASP.NET Core dependencies -->
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(AspNetCoreVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.OutputCaching.StackExchangeRedis" Version="$(AspNetCoreVersion)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<PackageReference Include="Azure.ResourceManager.Redis" />
<PackageReference Include="Azure.ResourceManager.ServiceBus" />
<PackageReference Include="Azure.ResourceManager.Storage" />
<PackageReference Include="Azure.ResourceManager.AppConfiguration" />
<PackageReference Include="Azure.ResourceManager.Authorization" />
<PackageReference Include="Azure.Identity" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Aspire.Hosting.Azure.Provisioning;
using Aspire.Hosting.Lifecycle;
using Azure.ResourceManager;
using Azure.ResourceManager.AppConfiguration;
using Azure.ResourceManager.KeyVault;
using Azure.ResourceManager.Redis;
using Azure.ResourceManager.Resources;
Expand Down Expand Up @@ -41,6 +42,9 @@ public static IDistributedApplicationBuilder AddAzureProvisioning(this IDistribu

builder.AddAzureProvisioner<AzureRedisResource, AzureRedisProvisioner>();
builder.AddResourceEnumerator(resourceGroup => resourceGroup.GetAllRedis(), resource => resource.Data.Tags);

builder.AddAzureProvisioner<AzureAppConfigurationResource, AppConfigurationProvisoner>();
builder.AddResourceEnumerator(resourceGroup => resourceGroup.GetAppConfigurationStores(), resource => resource.Data.Tags);
return builder;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Diagnostics;
using System.Text.Json.Nodes;
using Aspire.Hosting.ApplicationModel;
using Azure;
using Azure.Core;
using Azure.ResourceManager;
using Azure.ResourceManager.AppConfiguration;
using Azure.ResourceManager.AppConfiguration.Models;
using Azure.ResourceManager.Resources;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;

namespace Aspire.Hosting.Azure.Provisioning;

internal sealed class AppConfigurationProvisoner(ILogger<AppConfigurationProvisoner> logger) : AzureResourceProvisioner<AzureAppConfigurationResource>
{
public override bool ConfigureResource(IConfiguration configuration, AzureAppConfigurationResource resource)
{
if (configuration.GetConnectionString(resource.Name) is string endpoint)
{
resource.Endpoint = endpoint;
return true;
}

return false;
}

public override async Task GetOrCreateResourceAsync(
ArmClient armClient,
SubscriptionResource subscription,
ResourceGroupResource resourceGroup,
Dictionary<string, ArmResource> resourceMap,
AzureLocation location,
AzureAppConfigurationResource resource,
Guid principalId,
JsonObject userSecrets,
CancellationToken cancellationToken)
{
resourceMap.TryGetValue(resource.Name, out var azureResource);

if (azureResource is not null && azureResource is not AppConfigurationStoreResource)
{
logger.LogWarning("Resource {resourceName} is not a app configuration resource. Deleting it.", resource.Name);

await armClient.GetGenericResource(azureResource.Id).DeleteAsync(WaitUntil.Started, cancellationToken).ConfigureAwait(false);
}

var appConfigurationResource = azureResource as AppConfigurationStoreResource;

if (appConfigurationResource is null)
{
var appConfigurationName = Guid.NewGuid().ToString().Replace("-", string.Empty)[0..20];

logger.LogInformation("Creating app configuration {appConfigurationName} in {location}...", appConfigurationName, location);

var appConfigurationData = new AppConfigurationStoreData(location, new AppConfigurationSku("free"));
appConfigurationData.Tags.Add(AzureProvisioner.AspireResourceNameTag, resource.Name);

var sw = Stopwatch.StartNew();
var operation = await resourceGroup.GetAppConfigurationStores().CreateOrUpdateAsync(WaitUntil.Completed, appConfigurationName, appConfigurationData, cancellationToken).ConfigureAwait(false);
appConfigurationResource = operation.Value;
sw.Stop();

logger.LogInformation("App Configuration {appConfigurationName} created in {elapsed}", appConfigurationResource.Data.Name, sw.Elapsed);
}
resource.Endpoint = appConfigurationResource.Data.Endpoint;

var connectionStrings = userSecrets.Prop("ConnectionStrings");
connectionStrings[resource.Name] = resource.Endpoint;

// App Configuration Data Owner
// https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#app-configuration-data-owner
var roleDefinitionId = CreateRoleDefinitionId(subscription, "5ae67dd6-50cb-40e7-96ff-dc2bfa4b606b");

await DoRoleAssignmentAsync(armClient, appConfigurationResource.Id, principalId, roleDefinitionId, cancellationToken).ConfigureAwait(false);
}
}
11 changes: 11 additions & 0 deletions src/Aspire.Hosting.Azure/AzureAppConfigurationResource.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

namespace Aspire.Hosting.ApplicationModel;

public class AzureAppConfigurationResource(string name) : Resource(name), IAzureResource, IResourceWithConnectionString
{
public string? Endpoint { get; set; }

public string? GetConnectionString() => Endpoint;
}
18 changes: 18 additions & 0 deletions src/Aspire.Hosting.Azure/AzureResourceExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -180,4 +180,22 @@ private static void WriteAzureRedisToManifest(Utf8JsonWriter writer)
{
writer.WriteString("type", "azure.redis.v1");
}

/// <summary>
/// Adds an Azure App Configuration resource to the application model.
/// </summary>
/// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>.</param>
/// <param name="name">The name of the resource. This name will be used as the connection string name when referenced in a dependency.</param>
/// <returns>A reference to the <see cref="IResourceBuilder{AzureAppConfigurationResource}"/>.</returns>
public static IResourceBuilder<AzureAppConfigurationResource> AddAzureAppConfiguration(this IDistributedApplicationBuilder builder, string name)
{
var resource = new AzureAppConfigurationResource(name);
return builder.AddResource(resource)
.WithAnnotation(new ManifestPublishingCallbackAnnotation(WriteAzureAppConfigurationToManifest));
}

private static void WriteAzureAppConfigurationToManifest(Utf8JsonWriter writer)
{
writer.WriteString("type", "azure.appconfiguration.v1");
}
}