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
6 changes: 6 additions & 0 deletions src/Microsoft.FeatureManagement/FeatureManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,12 @@ private void BindSettings(IFeatureFilterMetadata filter, FeatureFilterEvaluation
return;
}

// Skip parameter binding if the provider has already supplied a parameters object.
if (context.Settings != null)
{
Comment thread
zhiyuanliang-ms marked this conversation as resolved.
return;
}

if (!(context.Parameters is ConfigurationWrapper) || Cache == null)
{
context.Settings = binder.BindParameters(context.Parameters);
Expand Down
115 changes: 115 additions & 0 deletions tests/Tests.FeatureManagement/FeatureManagementTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1924,6 +1924,121 @@ public async Task TimeWindowFilterThrowsOnInvalidParametersObjectType()

await Assert.ThrowsAsync<ArgumentException>(() => featureManager.IsEnabledAsync("BadFeature"));
}

[Fact]
public async Task TargetingFilterUsesParametersObject()
{
var services = new ServiceCollection();

var definitionProvider = new InMemoryFeatureDefinitionProvider(
new FeatureDefinition[]
{
new FeatureDefinition
{
Name = "TargetingFeature",
EnabledFor = new List<FeatureFilterConfiguration>()
{
new FeatureFilterConfiguration
{
Name = "Microsoft.Targeting",
ParametersObject = new TargetingFilterSettings
{
Audience = new Audience
{
Users = new List<string> { "Jeff" },
Groups = new List<GroupRollout>
{
new GroupRollout
{
Name = "Ring1",
RolloutPercentage = 100
}
},
DefaultRolloutPercentage = 0
}
}
}
}
}
});

services.AddSingleton<IFeatureDefinitionProvider>(definitionProvider)
.AddSingleton<IConfiguration>(new ConfigurationBuilder().Build())
.AddFeatureManagement();

ServiceProvider serviceProvider = services.BuildServiceProvider();

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

//
// Targeted user should be enabled
var targetingContext = new TargetingContext
{
UserId = "Jeff",
Groups = new List<string> { "Ring0" }
};

Assert.True(await featureManager.IsEnabledAsync("TargetingFeature", targetingContext));

//
// User in targeted group should be enabled
targetingContext = new TargetingContext
{
UserId = "NotTargeted",
Groups = new List<string> { "Ring1" }
};

Assert.True(await featureManager.IsEnabledAsync("TargetingFeature", targetingContext));

//
// Non-targeted user should be disabled (0% default rollout)
targetingContext = new TargetingContext
{
UserId = "NotTargeted",
Groups = new List<string> { "Ring0" }
};

Assert.False(await featureManager.IsEnabledAsync("TargetingFeature", targetingContext));
}

[Fact]
public async Task TargetingFilterThrowsOnInvalidParametersObjectType()
{
var services = new ServiceCollection();

var definitionProvider = new InMemoryFeatureDefinitionProvider(
new FeatureDefinition[]
{
new FeatureDefinition
{
Name = "BadFeature",
EnabledFor = new List<FeatureFilterConfiguration>()
{
new FeatureFilterConfiguration
{
Name = "Microsoft.Targeting",
ParametersObject = "wrong type"
}
}
}
});

services.AddSingleton<IFeatureDefinitionProvider>(definitionProvider)
.AddSingleton<IConfiguration>(new ConfigurationBuilder().Build())
.AddFeatureManagement();

ServiceProvider serviceProvider = services.BuildServiceProvider();

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

var targetingContext = new TargetingContext
{
UserId = "Jeff",
Groups = new List<string>()
};

await Assert.ThrowsAsync<ArgumentException>(() => featureManager.IsEnabledAsync("BadFeature", targetingContext).AsTask());
}
}

public class FeatureManagementVariantTest
Expand Down
Loading