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
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ namespace Microsoft.FeatureManagement
/// </summary>
sealed class ConfigurationDynamicFeatureDefinitionProvider : IDynamicFeatureDefinitionProvider, IDisposable
{
public const string DynamicFeatureDefinitionsSectionName = "DynamicFeatures";
private const string FeatureManagementSectionName = "FeatureManagement";
private const string DynamicFeatureDefinitionsSectionName= "DynamicFeatures";
private const string FeatureVariantsSectionName = "Variants";
private readonly IConfiguration _configuration;
private readonly ConcurrentDictionary<string, DynamicFeatureDefinition> _dynamicFeatureDefinitions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,18 @@ private IEnumerable<IConfigurationSection> GetFeatureFlagDefinitionSections()

IConfigurationSection featureFlagsSection = featureManagementChildren.FirstOrDefault(s => s.Key == FeatureFlagDefinitionsSectionName);

//
// Check for mixed schema to avoid confusing scenario where feature flags defined in separate sources with different schemas don't mix.
if (featureFlagsSection != null &&
featureManagementChildren.Any(section =>
!section.Key.Equals(FeatureFlagDefinitionsSectionName) &&
!section.Key.Equals(ConfigurationDynamicFeatureDefinitionProvider.DynamicFeatureDefinitionsSectionName)))
{
throw new FeatureManagementException(
FeatureManagementError.InvalidConfiguration,
"Detected feature flags defined using different feature management schemas.");
}

//
// Support backward compatability where feature flag definitions were directly under the feature management section
return featureFlagsSection == null ?
Expand Down
7 changes: 6 additions & 1 deletion src/Microsoft.FeatureManagement/FeatureManagementError.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ public enum FeatureManagementError
/// <summary>
/// A dynamic feature does not have a default feature variant configured.
/// </summary>
MissingDefaultFeatureVariant
MissingDefaultFeatureVariant,

/// <summary>
/// A configuration error is present in the feature management system.
/// </summary>
InvalidConfiguration
}
}