Skip to content

Add default sanitizer for resource group name in URI #2386

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 4 commits into from
Apr 13, 2026
+17 −6
Merged

Add default sanitizer for resource group name in URI #2386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd2e5ce
Add default sanitizer for resource group name in URI
alzimmermsft Apr 10, 2026
741d9ff
Take on some feedback
alzimmermsft Apr 10, 2026
f71fd6e
Merge branch 'main' into AddDefaultSanitizerForRGInUri
alzimmermsft Apr 13, 2026
b0a4d08
Move sanitizer addition, fix AppConfig tests
alzimmermsft Apr 13, 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
15 changes: 13 additions & 2 deletions core/Microsoft.Mcp.Core/tests/Microsoft.Mcp.Tests/Client/RecordedCommandTestsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,16 +303,27 @@ private void PopulateDefaultSanitizers()
// Registering a few common sanitizers for values that we know will be universally present and cleaned up
if (EnableDefaultSanitizerAdditions)
{
GeneralRegexSanitizers.Add(new GeneralRegexSanitizer(new GeneralRegexSanitizerBody()
GeneralRegexSanitizers.Add(new(new()
{
Regex = Settings.ResourceBaseName,
Value = "Sanitized",
}));
GeneralRegexSanitizers.Add(new GeneralRegexSanitizer(new GeneralRegexSanitizerBody()
GeneralRegexSanitizers.Add(new(new()
{
Regex = Settings.SubscriptionId,
Value = EmptyGuid,
}));
// Sanitize Resource Group name from the URI. This is needed as there is another default GeneralRegexSanitizer for
// Settings.ResourceBaseName. But there are two issues we hit with that:
// 1. Resource group names often have other characters added to it, like prepending or appending for uniqueness.
// 2. In playback, Settings.ResourceBaseName and Settings.ResourceGroupName are both configured to be 'Sanitized',
// so it won't find the right string.
UriRegexSanitizers.Add(new(new()
{
Value = "Sanitized",
Regex = "/resource[gG]roups/(?<rgname>[\\w\\-.()]{1,90})(?=/|\\?|$)",
GroupForReplace = "rgname"
}));
}
}

Expand Down
6 changes: 3 additions & 3 deletions ...re.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.LiveTests/AppConfigCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ public AppConfigCommandTests(ITestOutputHelper output, TestProxyFixture fixture,
_appConfigService = new AppConfigService(subscriptionService, tenantService, _logger, httpClientFactory);
}

public override List<BodyRegexSanitizer> BodyRegexSanitizers => new()
{
public override List<BodyRegexSanitizer> BodyRegexSanitizers =>
[
new BodyRegexSanitizer(new BodyRegexSanitizerBody() {
Regex = "\"domains\"\\s*:\\s*\\[(?s)(?<domains>.*?)\\]",
GroupForReplace = "domains",
Value = "\"contoso.com\""
})
};
];

public override async ValueTask DisposeAsync()
{
Expand Down
2 changes: 1 addition & 1 deletion tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.LiveTests/assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"AssetsRepo": "Azure/azure-sdk-assets",
"AssetsRepoPrefixPath": "",
"TagPrefix": "Azure.Mcp.Tools.AppConfig.LiveTests",
"Tag": "Azure.Mcp.Tools.AppConfig.LiveTests_db8ee56198"
"Tag": "Azure.Mcp.Tools.AppConfig.LiveTests_d4554e504e"
}