Skip to content

Remove variant config ref #614

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 2 commits into from
Dec 16, 2024
Merged

Remove variant config ref #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6bb7ac
remove variant config ref
zhiyuanliang-ms Dec 13, 2024
abe10c9
update testcase
zhiyuanliang-ms Dec 13, 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
1 change: 0 additions & 1 deletion ...osoft.Extensions.Configuration.AzureAppConfiguration/Constants/RequestTracingConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ internal class RequestTracingConstants
public const string FeatureFlagUsesTelemetryTag = "Telemetry";
public const string FeatureFlagUsesSeedTag = "Seed";
public const string FeatureFlagMaxVariantsKey = "MaxVariants";
public const string FeatureFlagUsesVariantConfigurationReferenceTag = "ConfigRef";

public const string DiagnosticHeaderActivityName = "Azure.CustomDiagnosticHeaders";
public const string CorrelationContextHeader = "Correlation-Context";
Expand Down
14 changes: 1 addition & 13 deletions ...ft.Extensions.Configuration.AzureAppConfiguration/FeatureManagement/FeatureFlagTracing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ internal class FeatureFlagTracing
public bool UsesTargetingFilter { get; set; } = false;
public bool UsesSeed { get; set; } = false;
public bool UsesTelemetry { get; set; } = false;
public bool UsesVariantConfigurationReference { get; set; } = false;
public int MaxVariants { get; set; }

public bool UsesAnyFeatureFilter()
Expand All @@ -35,7 +34,7 @@ public bool UsesAnyFeatureFilter()

public bool UsesAnyTracingFeature()
{
return UsesSeed || UsesTelemetry || UsesVariantConfigurationReference;
return UsesSeed || UsesTelemetry;
}

public void ResetFeatureFlagTracing()
Expand All @@ -46,7 +45,6 @@ public void ResetFeatureFlagTracing()
UsesTargetingFilter = false;
UsesSeed = false;
UsesTelemetry = false;
UsesVariantConfigurationReference = false;
MaxVariants = 0;
}

Expand Down Expand Up @@ -147,16 +145,6 @@ public string CreateFeaturesString()
sb.Append(RequestTracingConstants.FeatureFlagUsesSeedTag);
}

if (UsesVariantConfigurationReference)
{
if (sb.Length > 0)
{
sb.Append(RequestTracingConstants.Delimiter);
}

sb.Append(RequestTracingConstants.FeatureFlagUsesVariantConfigurationReferenceTag);
}

if (UsesTelemetry)
{
if (sb.Length > 0)
Expand Down
1 change: 0 additions & 1 deletion ...sions.Configuration.AzureAppConfiguration/FeatureManagement/FeatureManagementConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ internal class FeatureManagementConstants
public const string Parameters = "parameters";
public const string Variant = "variant";
public const string ConfigurationValue = "configuration_value";
public const string ConfigurationReference = "configuration_reference";
public const string StatusOverride = "status_override";
public const string DefaultWhenDisabled = "default_when_disabled";
public const string DefaultWhenEnabled = "default_when_enabled";
Expand Down
25 changes: 0 additions & 25 deletions ...Configuration.AzureAppConfiguration/FeatureManagement/FeatureManagementKeyValueAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,6 @@ private List<KeyValuePair<string, string>> ProcessMicrosoftSchemaFeatureFlag(Fea
(string.IsNullOrEmpty(kvp.Key) ? "" : $":{kvp.Key}"), kvp.Value));
}

if (featureVariant.ConfigurationReference != null)
{
_featureFlagTracing.UsesVariantConfigurationReference = true;

keyValues.Add(new KeyValuePair<string, string>($"{variantsPath}:{FeatureManagementConstants.ConfigurationReference}", featureVariant.ConfigurationReference));
}

if (featureVariant.StatusOverride != null)
{
keyValues.Add(new KeyValuePair<string, string>($"{variantsPath}:{FeatureManagementConstants.StatusOverride}", featureVariant.StatusOverride));
Expand Down Expand Up @@ -1157,24 +1150,6 @@ private FeatureVariant ParseFeatureVariant(ref Utf8JsonReader reader, string set
break;
}

case FeatureManagementConstants.ConfigurationReference:
{
if (reader.Read() && reader.TokenType == JsonTokenType.String)
{
featureVariant.ConfigurationReference = reader.GetString();
}
else if (reader.TokenType != JsonTokenType.Null)
{
throw CreateFeatureFlagFormatException(
FeatureManagementConstants.ConfigurationReference,
settingKey,
reader.TokenType.ToString(),
JsonTokenType.String.ToString());
}

break;
}

case FeatureManagementConstants.ConfigurationValue:
{
if (reader.Read())
Expand Down
2 changes: 0 additions & 2 deletions ...rosoft.Extensions.Configuration.AzureAppConfiguration/FeatureManagement/FeatureVariant.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ internal class FeatureVariant

public JsonElement ConfigurationValue { get; set; }

public string ConfigurationReference { get; set; }

public string StatusOverride { get; set; }
}
}
7 changes: 2 additions & 5 deletions tests/Tests.AzureAppConfiguration/FeatureManagementTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,6 @@ public class FeatureManagementTests
},
{
""name"": ""Small"",
""configuration_reference"": ""ShoppingCart:Small"",
""status_override"": ""Disabled""
}
],
Expand Down Expand Up @@ -1868,7 +1867,6 @@ public void WithVariants()
Assert.Equal("Big", config["feature_management:feature_flags:0:variants:0:name"]);
Assert.Equal("600px", config["feature_management:feature_flags:0:variants:0:configuration_value"]);
Assert.Equal("Small", config["feature_management:feature_flags:0:variants:1:name"]);
Assert.Equal("ShoppingCart:Small", config["feature_management:feature_flags:0:variants:1:configuration_reference"]);
Assert.Equal("Disabled", config["feature_management:feature_flags:0:variants:1:status_override"]);
Assert.Equal("Small", config["feature_management:feature_flags:0:allocation:default_when_disabled"]);
Assert.Equal("Small", config["feature_management:feature_flags:0:allocation:default_when_enabled"]);
Expand Down Expand Up @@ -2023,7 +2021,7 @@ public void ThrowsOnIncorrectJsonTypes()
var settings = new List<ConfigurationSetting>()
{
CreateFeatureFlag("Feature1", variantsJsonString: @"[{""name"": 1}]"),
CreateFeatureFlag("Feature2", variantsJsonString: @"[{""configuration_reference"": true}]"),
CreateFeatureFlag("Feature2", requirementType: "2"),
CreateFeatureFlag("Feature3", variantsJsonString: @"[{""status_override"": []}]"),
CreateFeatureFlag("Feature4", seed: "{}"),
CreateFeatureFlag("Feature5", defaultWhenDisabled: "5"),
Expand All @@ -2038,8 +2036,7 @@ public void ThrowsOnIncorrectJsonTypes()
CreateFeatureFlag("Feature14", telemetryEnabled: "14"),
CreateFeatureFlag("Feature15", telemetryMetadataJsonString: @"{""key"": 15}"),
CreateFeatureFlag("Feature16", clientFiltersJsonString: @"[{""name"": 16}]"),
CreateFeatureFlag("Feature17", clientFiltersJsonString: @"{""key"": [{""name"": ""name"", ""parameters"": 17}]}"),
CreateFeatureFlag("Feature18", requirementType: "18")
CreateFeatureFlag("Feature17", clientFiltersJsonString: @"{""key"": [{""name"": ""name"", ""parameters"": 17}]}")
};

var mockResponse = new Mock<Response>();
Expand Down