Skip to content

Set AppConfigurationAudience based on Cloud configuration when creating App Configuration SDK clients #2279

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
alzimmermsft merged 3 commits into from
Mar 30, 2026
Merged

Set AppConfigurationAudience based on Cloud configuration when creating App Configuration SDK clients #2279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6777c5f
Set AppConfigurationAudience based on Cloud configuration when creati…
alzimmermsft Mar 30, 2026
a83f20a
Pass tenant to credential retrieval
alzimmermsft Mar 30, 2026
1b191f5
Fix method typo
alzimmermsft Mar 30, 2026
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
3 changes: 3 additions & 0 deletions servers/Azure.Mcp.Server/changelog-entries/1774886640626.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
changes:
- section: "Bugs Fixed"
description: "Configure AppConfigurationAudience when creating AppConfiguration SDK clients"
Comment thread
alzimmermsft marked this conversation as resolved.
30 changes: 20 additions & 10 deletions tools/Azure.Mcp.Tools.AppConfig/src/Services/AppConfigService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Azure.Mcp.Core.Models.Identity;
using Azure.Mcp.Core.Options;
using Azure.Mcp.Core.Services.Azure;
using Azure.Mcp.Core.Services.Azure.Authentication;
using Azure.Mcp.Core.Services.Azure.Subscription;
using Azure.Mcp.Core.Services.Azure.Tenant;
using Azure.Mcp.Tools.AppConfig.Models;
Expand Down Expand Up @@ -168,7 +169,7 @@ public async Task DeleteKeyValue(

private async Task<ConfigurationClient> GetConfigurationClient(string accountName, string subscription, string? tenant, RetryPolicyOptions? retryPolicy, CancellationToken cancellationToken)
{
var configStore = await FindAppConfigStore(subscription, accountName, subscription, retryPolicy, cancellationToken);
var configStore = await FindAppConfigStore(subscription, tenant, accountName, subscription, retryPolicy, cancellationToken);
var endpoint = configStore.Endpoint;
if (string.IsNullOrEmpty(endpoint))
{
Expand All @@ -177,8 +178,9 @@ private async Task<ConfigurationClient> GetConfigurationClient(string accountNam

EndpointValidator.ValidateAzureServiceEndpoint(endpoint, "appconfig");

var credential = await GetCredential(cancellationToken);
var credential = await GetCredential(tenant, cancellationToken);
var options = new ConfigurationClientOptions();
options.Audience = GetAppConfigurationAudience();
AddDefaultPolicies(options);

var endpointUri = new Uri(endpoint);
Expand All @@ -191,25 +193,22 @@ private async Task<ConfigurationClient> GetConfigurationClient(string accountNam

private async Task<AppConfigurationAccount> FindAppConfigStore(
string subscription,
string? tenant,
string accountName,
string subscriptionIdentifier,
RetryPolicyOptions? retryPolicy,
CancellationToken cancellationToken)
{
var account = await ExecuteSingleResourceQueryAsync(
return await ExecuteSingleResourceQueryAsync(
"Microsoft.AppConfiguration/configurationStores",
resourceGroup: null, // all resource groups
subscription: subscription,
retryPolicy: retryPolicy,
converter: ConvertToAppConfigurationAccountModel,
additionalFilter: $"name =~ '{EscapeKqlString(accountName)}'",
cancellationToken: cancellationToken);

if (account == null)
{
throw new KeyNotFoundException($"App Configuration store '{accountName}' not found for subscription '{subscriptionIdentifier}'.");
}
return account;
tenant: tenant,
cancellationToken: cancellationToken)
?? throw new KeyNotFoundException($"App Configuration store '{accountName}' not found for subscription '{subscriptionIdentifier}'.");
}

/// <summary>
Expand Down Expand Up @@ -266,4 +265,15 @@ private static AppConfigurationAccount ConvertToAppConfigurationAccountModel(Jso
}
};
}

private AppConfigurationAudience GetAppConfigurationAudience()
{
return TenantService.CloudConfiguration.CloudType switch
{
AzureCloudConfiguration.AzureCloud.AzurePublicCloud => AppConfigurationAudience.AzurePublicCloud,
AzureCloudConfiguration.AzureCloud.AzureChinaCloud => AppConfigurationAudience.AzureChina,
AzureCloudConfiguration.AzureCloud.AzureUSGovernmentCloud => AppConfigurationAudience.AzureGovernment,
_ => AppConfigurationAudience.AzurePublicCloud
};
}
}