Skip to content

Adjust to the behavior of the evaluation of contextual filter for unrecogniazed context type #314

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 3 commits into from
Nov 17, 2023
Merged

Adjust to the behavior of the evaluation of contextual filter for unrecogniazed context type #314

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
1296749
if filter name can be found, exception will not be thrown
zhiyuanliang-ms Nov 15, 2023
ed89f69
Merge branch 'main' into zhiyuanliang/fix-contextual-filter-evaluation
zhiyuanliang-ms Nov 15, 2023
37c713e
Merge branch 'main' into zhiyuanliang/fix-contextual-filter-evaluation
zhiyuanliang-ms Nov 16, 2023
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
8 changes: 8 additions & 0 deletions src/Microsoft.FeatureManagement/FeatureManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,14 @@ private async Task<bool> IsEnabledAsync<TContext>(string feature, TContext appCo

if (filter == null)
{
if (_featureFilters.Any(f => IsMatchingName(f.GetType(), featureFilterConfiguration.Name)))
{
//
// Cannot find the appropriate registered feature filter which matches the filter name and the provided context type.
// But there is a registered feature filter which matches the filter name.
continue;
}

string errorMessage = $"The feature filter '{featureFilterConfiguration.Name}' specified for feature '{feature}' was not found.";

if (!_options.IgnoreMissingFeatureFilters)
Expand Down
26 changes: 17 additions & 9 deletions tests/Tests.FeatureManagement/FeatureManagement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,25 +237,33 @@ public async Task AllowsDuplicatedFilterAlias()
});

Assert.Equal($"Multiple contextual feature filters match the configured filter named '{duplicatedFilterName}' and context type '{typeof(DummyContext)}'.", ex.Message);
}

services = new ServiceCollection();
[Fact]
public async Task SkipsContextualFilterEvaluationForUnrecognizedContext()
{
string featureName = Features.FeatureUsesFiltersWithDuplicatedAlias;

IConfiguration config = new ConfigurationBuilder().AddJsonFile("appsettings.json").Build();

var services = new ServiceCollection();

services
.AddSingleton(config)
.AddFeatureManagement()
.AddFeatureFilter<ContextualDuplicatedAliasFeatureFilterWithAccountContext>();

serviceProvider = services.BuildServiceProvider();
ServiceProvider serviceProvider = services.BuildServiceProvider();

featureManager = serviceProvider.GetRequiredService<IFeatureManager>();
IFeatureManager featureManager = serviceProvider.GetRequiredService<IFeatureManager>();

ex = await Assert.ThrowsAsync<FeatureManagementException>(
async () =>
{
await featureManager.IsEnabledAsync(featureName);
});
var appContext = new AppContext();

var dummyContext = new DummyContext();

Assert.Equal($"The feature filter '{duplicatedFilterName}' specified for feature '{featureName}' was not found.", ex.Message);
Assert.True(await featureManager.IsEnabledAsync(featureName));

Assert.True(await featureManager.IsEnabledAsync(featureName, dummyContext));
}

[Fact]
Expand Down