Skip to content

Avoid redundant validation for cached TargetingFilterSettings #387

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
zhiyuanliang-ms merged 3 commits into from
Mar 28, 2024
Merged

Avoid redundant validation for cached TargetingFilterSettings #387

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01598e2
do validation during binding parameters
zhiyuanliang-ms Mar 7, 2024
9824b91
adjust method order
zhiyuanliang-ms Mar 28, 2024
6417c3c
Merge branch 'preview' into zhiyuanliang/validate-target-filter-setti…
zhiyuanliang-ms Mar 28, 2024
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
9 changes: 8 additions & 1 deletion src/Microsoft.FeatureManagement/Targeting/ContextualTargetingFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,14 @@ public ContextualTargetingFilter(IOptions<TargetingEvaluationOptions> options, I
/// <returns><see cref="TargetingFilterSettings"/> that can later be used in targeting.</returns>
public object BindParameters(IConfiguration filterParameters)
{
return filterParameters.Get<TargetingFilterSettings>() ?? new TargetingFilterSettings();
TargetingFilterSettings settings = filterParameters.Get<TargetingFilterSettings>() ?? new TargetingFilterSettings();

if (!TargetingEvaluator.TryValidateSettings(settings, out string paramName, out string reason))
{
throw new ArgumentException(reason, paramName);
}

return settings;
}

/// <summary>
Expand Down
7 changes: 1 addition & 6 deletions src/Microsoft.FeatureManagement/Targeting/TargetingEvaluator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ public static bool IsTargeted(ITargetingContext targetingContext, TargetingFilte
throw new ArgumentNullException(nameof(targetingContext));
}

if (!TryValidateSettings(settings, out string paramName, out string reason))
{
throw new ArgumentException(reason, paramName);
}

if (settings.Audience.Exclusion != null)
{
//
Expand Down Expand Up @@ -236,7 +231,7 @@ public static bool IsTargeted(
/// <param name="paramName">The name of the invalid setting, if any.</param>
/// <param name="reason">The reason that the setting is invalid.</param>
/// <returns>True if the provided settings are valid. False if the provided settings are invalid.</returns>
private static bool TryValidateSettings(TargetingFilterSettings targetingSettings, out string paramName, out string reason)
public static bool TryValidateSettings(TargetingFilterSettings targetingSettings, out string paramName, out string reason)
{
paramName = null;

Expand Down
10 changes: 9 additions & 1 deletion src/Microsoft.FeatureManagement/Targeting/TargetingFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Microsoft.FeatureManagement.Targeting;
using System;
using System.Threading.Tasks;

Expand Down Expand Up @@ -40,7 +41,14 @@ public TargetingFilter(IOptions<TargetingEvaluationOptions> options, ITargetingC
/// <returns><see cref="TargetingFilterSettings"/> that can later be used in targeting.</returns>
public object BindParameters(IConfiguration filterParameters)
{
return filterParameters.Get<TargetingFilterSettings>() ?? new TargetingFilterSettings();
TargetingFilterSettings settings = filterParameters.Get<TargetingFilterSettings>() ?? new TargetingFilterSettings();

if (!TargetingEvaluator.TryValidateSettings(settings, out string paramName, out string reason))
{
throw new ArgumentException(reason, paramName);
}

return settings;
}

/// <summary>
Expand Down