Enable SyncTriggers cache; Support Disable Config

Author: mathewc

src/WebJobs.Script.WebHost/Extensions/FunctionMetadataExtensions.cs

@@ -69,25 +69,21 @@ public static async Task<FunctionMetadataResponse> ToFunctionMetadataResponse(th
         /// <returns>JObject that represent the trigger for scale controller to consume</returns>
         public static async Task<JObject> ToFunctionTrigger(this FunctionMetadata functionMetadata, ScriptHostConfiguration config)
         {
-            // Only look at the function if it's not disabled
-            if (!functionMetadata.IsDisabled)
-            {
-                // Get function.json path
-                var functionPath = Path.Combine(config.RootScriptPath, functionMetadata.Name);
-                var functionMetadataFilePath = Path.Combine(functionPath, ScriptConstants.FunctionMetadataFileName);
+            // Get function.json path
+            var functionPath = Path.Combine(config.RootScriptPath, functionMetadata.Name);
+            var functionMetadataFilePath = Path.Combine(functionPath, ScriptConstants.FunctionMetadataFileName);
 
-                // Read function.json as a JObject
-                var functionConfig = await GetFunctionConfig(functionMetadataFilePath);
+            // Read function.json as a JObject
+            var functionConfig = await GetFunctionConfig(functionMetadataFilePath);
 
-                // Find the trigger and add functionName to it
-                foreach (JObject binding in (JArray)functionConfig["bindings"])
+            // Find the trigger and add functionName to it
+            foreach (JObject binding in (JArray)functionConfig["bindings"])
+            {
+                var type = (string)binding["type"];
+                if (type.EndsWith("Trigger", StringComparison.OrdinalIgnoreCase))
                 {
-                    var type = (string)binding["type"];
-                    if (type.EndsWith("Trigger", StringComparison.OrdinalIgnoreCase))
-                    {
-                        binding.Add("functionName", functionMetadata.Name);
-                        return binding;
-                    }
+                    binding.Add("functionName", functionMetadata.Name);
+                    return binding;
                 }
             }
 

src/WebJobs.Script.WebHost/Management/FunctionsSyncManager.cs

@@ -25,12 +25,6 @@ namespace Microsoft.Azure.WebJobs.Script.WebHost.Management
 {
     public sealed class FunctionsSyncManager : IFunctionsSyncManager, IDisposable
     {
-        // Until ANT 82 is fully released, the default value is disabled and we continue
-        // to return just the trigger data.
-        // After ANT 82, we will change the default to enabled.
-        // Note that this app setting is honored by both GeoMaster and Runtime.
-        public const string AzureWebsiteArmCacheEnabledDefaultValue = "0";
-
         private const string HubName = "HubName";
         private const string TaskHubName = "taskHubName";
         private const string Connection = "connection";
@@ -66,7 +60,7 @@ internal bool ArmCacheEnabled
         {
             get
             {
-                return _settings.GetSettingOrDefault(EnvironmentSettingNames.AzureWebsiteArmCacheEnabled, AzureWebsiteArmCacheEnabledDefaultValue) == "1";
+                return _settings.GetSettingOrDefault(EnvironmentSettingNames.AzureWebsiteArmCacheEnabled, "1") == "1";
             }
         }
 

src/WebJobs.Script/Config/ScriptSettingsManager.cs

@@ -99,5 +99,18 @@ public virtual void SetSetting(string settingKey, string settingValue)
 
             Environment.SetEnvironmentVariable(settingKey, settingValue);
         }
+
+        public bool SettingIsEnabled(string settingKey)
+        {
+            string value = GetSetting(settingKey);
+            if (!string.IsNullOrEmpty(value) &&
+                (string.Compare(value, "1", StringComparison.OrdinalIgnoreCase) == 0 ||
+                 string.Compare(value, "true", StringComparison.OrdinalIgnoreCase) == 0))
+            {
+                return true;
+            }
+
+            return false;
+        }
     }
 }

src/WebJobs.Script/Host/ScriptHost.cs

@@ -1053,8 +1053,10 @@ private static FunctionMetadata ParseFunctionMetadata(string functionName, JObje
                 }
             }
 
-            // A function can be disabled at the trigger or function level
-            if (IsDisabled(triggerDisabledValue, settingsManager) ||
+            // A function can be disabled at the trigger or function level, or via an
+            // app level per function setting
+            if (settingsManager.SettingIsEnabled($"AzureWebJobs.{functionName}.Disabled") ||
+                IsDisabled(triggerDisabledValue, settingsManager) ||
                 IsDisabled((JValue)configMetadata["disabled"], settingsManager))
             {
                 functionMetadata.IsDisabled = true;
@@ -1980,10 +1982,7 @@ private static bool IsDisabled(JToken isDisabledValue, ScriptSettingsManager set
                 else
                 {
                     string settingName = (string)isDisabledValue;
-                    string value = settingsManager.GetSetting(settingName);
-                    if (!string.IsNullOrEmpty(value) &&
-                        (string.Compare(value, "1", StringComparison.OrdinalIgnoreCase) == 0 ||
-                         string.Compare(value, "true", StringComparison.OrdinalIgnoreCase) == 0))
+                    if (settingsManager.SettingIsEnabled(settingName))
                     {
                         return true;
                     }

test/WebJobs.Script.Tests/Management/FunctionsSyncManagerTests.cs

@@ -188,7 +188,7 @@ public async Task TrySyncTriggers_ConfigurationNotReady_ReturnsFalse()
         public void ArmCacheEnabled_VerifyDefault()
         {
             _scriptSettingsManagerMock.Setup(p => p.GetSetting(EnvironmentSettingNames.AzureWebsiteArmCacheEnabled)).Returns((string)null);
-            Assert.False(_functionsSyncManager.ArmCacheEnabled);
+            Assert.True(_functionsSyncManager.ArmCacheEnabled);
         }
 
         [Theory]

test/WebJobs.Script.Tests/ScriptHostTests.cs

@@ -66,6 +66,11 @@ public void ReadFunctionMetadata_Succeeds()
             var functionDirectories = Directory.EnumerateDirectories(config.RootScriptPath);
             var metadata = ScriptHost.ReadFunctionMetadata(functionDirectories, traceWriter, null, functionErrors, functionWhitelist: config.Functions);
             Assert.Equal(51, metadata.Count);
+
+            var disabledFunctions = metadata.Where(p => p.IsDisabled).OrderBy(p => p.Name).ToArray();
+            Assert.Equal(2, disabledFunctions.Length);
+            Assert.Equal("HttpTrigger-Disabled", disabledFunctions[0].Name);
+            Assert.Equal("SendGrid", disabledFunctions[1].Name);
         }
 
         [Fact]
@@ -1753,10 +1758,13 @@ public override object[] GetCustomAttributes(Type attributeType, bool inherit)
             }
         }
 
-        public class TestFixture
+        public class TestFixture : IDisposable
         {
             public TestFixture()
             {
+                // disable function using app level setting - test verifies this above
+                Environment.SetEnvironmentVariable("AzureWebJobs.SendGrid.Disabled", "1");
+
                 ScriptHostConfiguration config = new ScriptHostConfiguration()
                 {
                     TraceWriter = NullTraceWriter.Instance
@@ -1769,6 +1777,11 @@ public TestFixture()
             }
 
             public ScriptHost Host { get; private set; }
+
+            public void Dispose()
+            {
+                Environment.SetEnvironmentVariable("AzureWebJobs.SendGrid.Disabled", null);
+            }
         }
     }
 }