Removing feature flags for multikey and encryption support

Author: fabiocav

src/WebJobs.Script.WebHost/Security/DefaultKeyValueConverterFactory.cs

@@ -23,18 +23,7 @@ public DefaultKeyValueConverterFactory(ScriptSettingsManager settingsManager)
             _encryptionSupported = IsEncryptionSupported();
         }
 
-        private static bool IsEncryptionSupported()
-        {
-            if (WebScriptHostManager.IsAzureEnvironment)
-            {
-                // We're temporarily placing encryption behind a feature toggle until
-                // other consumers (e.g. portal) are updated to work with it.
-                // TODO: Remove this
-                return FeatureFlags.IsEnabled("SecretEncryption");
-            }
-
-            return _settingsManager.GetSetting(AzureWebsiteLocalEncryptionKey) != null;
-        }
+        private static bool IsEncryptionSupported() => WebScriptHostManager.IsAzureEnvironment || _settingsManager.GetSetting(AzureWebsiteLocalEncryptionKey) != null;
 
         public IKeyValueReader GetValueReader(Key key)
         {

src/WebJobs.Script.WebHost/Security/Serialization/ScriptSecretSerializer.cs

@@ -20,20 +20,7 @@ public static class ScriptSecretSerializer
             new ScriptSecretSerializerV1()
         };
 
-        internal static IScriptSecretSerializer DefaultSerializer
-        {
-            get
-            {
-                // This is temporarily behind a feature flag. Once other clients are able to
-                // work with the new version, this should be removed.
-                if (FeatureFlags.IsEnabled("MultiKey"))
-                {
-                    return _secretFormatters.Last();
-                }
-
-                return _secretFormatters.First();
-            }
-        }
+        internal static IScriptSecretSerializer DefaultSerializer => _secretFormatters.Last();
 
         public static ScriptSecrets DeserializeSecrets(ScriptSecretsType secretsType, string secretsJson)
         {

test/WebJobs.Script.Tests/Security/ScriptSecretSerializerTests.cs

@@ -13,27 +13,9 @@ public class ScriptSecretSerializerTests
         private ScriptSettingsManager _settingsManager = ScriptSettingsManager.Instance;
 
         [Fact]
-        public void DefaultSerializer_WhenMultiKeyFeatureIsEnabled_ReturnsV1Serializer()
+        public void DefaultSerializer_WhenMultiKeyFeatureIsNotSet_ReturnsV1Serializer()
         {
-            using (var variables = new TestScopedSettings(_settingsManager, "AzureWebJobsFeatureFlags", "MultiKey"))
-            {
-                Assert.Equal(typeof(ScriptSecretSerializerV1), ScriptSecretSerializer.DefaultSerializer?.GetType());
-            }
-        }
-
-        [Fact]
-        public void DefaultSerializer_WhenMultiKeyFeatureIsDisabled_ReturnsV0Serializer()
-        {
-            using (var variables = new TestScopedSettings(_settingsManager, "AzureWebJobsFeatureFlags", String.Empty))
-            {
-                Assert.Equal(typeof(ScriptSecretSerializerV0), ScriptSecretSerializer.DefaultSerializer?.GetType());
-            }
-        }
-
-        [Fact]
-        public void DefaultSerializer_WhenMultiKeyFeatureIsNotSet_ReturnsV0Serializer()
-        {
-            Assert.Equal(typeof(ScriptSecretSerializerV0), ScriptSecretSerializer.DefaultSerializer?.GetType());
+            Assert.Equal(typeof(ScriptSecretSerializerV1), ScriptSecretSerializer.DefaultSerializer?.GetType());
         }
     }
 }