Merge pull request #655 from Azure/rossgrambo/featureFlagId

Removes FeatureFlagId

Author: rossgrambo

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/FeatureManagement/FeatureManagementConstants.cs

@@ -41,7 +41,6 @@ internal class FeatureManagementConstants
 
         // Telemetry metadata keys
         public const string ETag = "ETag";
-        public const string FeatureFlagId = "FeatureFlagId";
         public const string FeatureFlagReference = "FeatureFlagReference";
         public const string AllocationId = "AllocationId";
 

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/FeatureManagement/FeatureManagementKeyValueAdapter.cs

@@ -310,10 +310,6 @@ private List<KeyValuePair<string, string>> ProcessMicrosoftSchemaFeatureFlag(Fea
                         }
                     }
 
-                    string featureFlagId = CalculateFeatureFlagId(setting.Key, setting.Label);
-
-                    keyValues.Add(new KeyValuePair<string, string>($"{telemetryPath}:{FeatureManagementConstants.Metadata}:{FeatureManagementConstants.FeatureFlagId}", featureFlagId));
-
                     if (endpoint != null)
                     {
                         string featureFlagReference = $"{endpoint.AbsoluteUri}kv/{setting.Key}{(!string.IsNullOrWhiteSpace(setting.Label) ? $"?label={setting.Label}" : "")}";
@@ -1373,19 +1369,5 @@ private FeatureTelemetry ParseFeatureTelemetry(ref Utf8JsonReader reader, string
 
             return featureTelemetry;
         }
-
-        private static string CalculateFeatureFlagId(string key, string label)
-        {
-            byte[] featureFlagIdHash;
-
-            // Convert the value consisting of key, newline character, and label to a byte array using UTF8 encoding to hash it using SHA 256
-            using (HashAlgorithm hashAlgorithm = SHA256.Create())
-            {
-                featureFlagIdHash = hashAlgorithm.ComputeHash(Encoding.UTF8.GetBytes($"{key}\n{(string.IsNullOrWhiteSpace(label) ? null : label)}"));
-            }
-
-            // Convert the hashed byte array to Base64Url
-            return featureFlagIdHash.ToBase64Url();
-        }
     }
 }

tests/Tests.AzureAppConfiguration/FeatureManagementTests.cs

@@ -15,8 +15,6 @@
 using System.Collections.Generic;
 using System.Diagnostics.Tracing;
 using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
@@ -2151,19 +2149,6 @@ public void WithTelemetry()
             Assert.Equal("Tag2Value", config["feature_management:feature_flags:0:telemetry:metadata:Tags.Tag2"]);
             Assert.Equal("c3c231fd-39a0-4cb6-3237-4614474b92c1", config["feature_management:feature_flags:0:telemetry:metadata:ETag"]);
 
-            byte[] featureFlagIdHash;
-
-            using (HashAlgorithm hashAlgorithm = SHA256.Create())
-            {
-                featureFlagIdHash = hashAlgorithm.ComputeHash(Encoding.UTF8.GetBytes($"{FeatureManagementConstants.FeatureFlagMarker}TelemetryFeature1\nlabel"));
-            }
-
-            string featureFlagId = Convert.ToBase64String(featureFlagIdHash)
-                .TrimEnd('=')
-                .Replace('+', '-')
-                .Replace('/', '_');
-
-            Assert.Equal(featureFlagId, config["feature_management:feature_flags:0:telemetry:metadata:FeatureFlagId"]);
             Assert.Equal($"{TestHelpers.PrimaryConfigStoreEndpoint}kv/{FeatureManagementConstants.FeatureFlagMarker}TelemetryFeature1?label=label", config["feature_management:feature_flags:0:telemetry:metadata:FeatureFlagReference"]);
 
             Assert.Equal("True", config["feature_management:feature_flags:1:telemetry:enabled"]);
@@ -2189,24 +2174,10 @@ public void WithAllocationId()
                 })
                 .Build();
 
-            byte[] featureFlagIdHash;
-
-            using (HashAlgorithm hashAlgorithm = SHA256.Create())
-            {
-                featureFlagIdHash = hashAlgorithm.ComputeHash(Encoding.UTF8.GetBytes($"{FeatureManagementConstants.FeatureFlagMarker}TelemetryVariant\n"));
-            }
-
-            string featureFlagId = Convert.ToBase64String(featureFlagIdHash)
-                .TrimEnd('=')
-                .Replace('+', '-')
-                .Replace('/', '_');
-
             // Validate TelemetryVariant
             Assert.Equal("True", config["feature_management:feature_flags:0:telemetry:enabled"]);
             Assert.Equal("TelemetryVariant", config["feature_management:feature_flags:0:id"]);
 
-            Assert.Equal(featureFlagId, config["feature_management:feature_flags:0:telemetry:metadata:FeatureFlagId"]);
-
             Assert.Equal($"{TestHelpers.PrimaryConfigStoreEndpoint}kv/{FeatureManagementConstants.FeatureFlagMarker}TelemetryVariant", config["feature_management:feature_flags:0:telemetry:metadata:FeatureFlagReference"]);
 
             Assert.Equal("MExY1waco2tqen4EcJKK", config["feature_management:feature_flags:0:telemetry:metadata:AllocationId"]);
@@ -2223,8 +2194,6 @@ public void WithAllocationId()
             Assert.Equal("True", config["feature_management:feature_flags:2:telemetry:enabled"]);
             Assert.Equal("Greeting", config["feature_management:feature_flags:2:id"]);
 
-            Assert.Equal("63pHsrNKDSi5Zfe_FvZPSegwbsEo5TS96hf4k7cc4Zw", config["feature_management:feature_flags:2:telemetry:metadata:FeatureFlagId"]);
-
             Assert.Equal($"{TestHelpers.PrimaryConfigStoreEndpoint}kv/{FeatureManagementConstants.FeatureFlagMarker}Greeting", config["feature_management:feature_flags:2:telemetry:metadata:FeatureFlagReference"]);
 
             Assert.Equal("L0m7_ulkdsaQmz6dSw4r", config["feature_management:feature_flags:2:telemetry:metadata:AllocationId"]);