Some minor refactorings

Author: mathewc

src/WebJobs.Script.WebHost/Controllers/AdminController.cs

@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
@@ -14,8 +13,6 @@
 using System.Web.Http.Controllers;
 using Microsoft.Azure.WebJobs.Extensions.Http;
 using Microsoft.Azure.WebJobs.Host;
-using Microsoft.Azure.WebJobs.Host.Config;
-using Microsoft.Azure.WebJobs.Script.Config;
 using Microsoft.Azure.WebJobs.Script.Description;
 using Microsoft.Azure.WebJobs.Script.WebHost.Filters;
 using Microsoft.Azure.WebJobs.Script.WebHost.Models;
@@ -183,35 +180,18 @@ public override Task<HttpResponseMessage> ExecuteAsync(HttpControllerContext con
         [HttpGet]
         [HttpPost]
         [AllowAnonymous]
-        public async Task<HttpResponseMessage> ExtensionHook(string name, CancellationToken token)
+        public async Task<HttpResponseMessage> ExtensionWebHookHandler(string name, CancellationToken token)
         {
             var provider = this._scriptHostManager.BindingWebHookProvider;
 
-            var hook = provider.GetHandlerOrNull(name);
-            if (hook != null)
+            var handler = provider.GetHandlerOrNull(name);
+            if (handler != null)
             {
-                var response = await hook.ConvertAsync(this.Request, token);
+                var response = await handler.ConvertAsync(this.Request, token);
                 return response;
             }
 
             return new HttpResponseMessage(HttpStatusCode.NotFound);
         }
-
-        // Provides the URL for accessing the admin/hook route.
-        internal static Uri GetRouteForExtensionHook(string name)
-        {
-            var settings = ScriptSettingsManager.Instance;
-
-            var hostName = settings.GetSetting(EnvironmentSettingNames.AzureWebsiteHostName);
-            if (hostName == null)
-            {
-                return null;
-            }
-
-            bool isLocalhost = hostName.StartsWith("localhost:", StringComparison.OrdinalIgnoreCase);
-            var scheme = isLocalhost ? "http" : "https";
-
-            return new Uri($"{scheme}://{hostName}/admin/extensions/{name}");
-        }
     }
 }

src/WebJobs.Script.WebHost/WebHooks/WebJobsSdkExtensionHookProvider.cs

@@ -3,9 +3,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Net.Http;
 using Microsoft.Azure.WebJobs.Host.Config;
-using Microsoft.Azure.WebJobs.Script.WebHost.Controllers;
+using Microsoft.Azure.WebJobs.Script.Config;
 using HttpHandler = Microsoft.Azure.WebJobs.IAsyncConverter<System.Net.Http.HttpRequestMessage, System.Net.Http.HttpResponseMessage>;
 
 namespace Microsoft.Azure.WebJobs.Script.WebHost
@@ -38,7 +37,23 @@ public Uri GetUrl(IExtensionConfigProvider extension)
             string name = extensionType.Name;
             _customHttpHandlers[name] = handler;
 
-            return AdminController.GetRouteForExtensionHook(name);
+            return GetExtensionWebHookRoute(name);
+        }
+
+        // Provides the URL for accessing the admin extensions WebHook route.
+        internal static Uri GetExtensionWebHookRoute(string name)
+        {
+            var settings = ScriptSettingsManager.Instance;
+            var hostName = settings.GetSetting(EnvironmentSettingNames.AzureWebsiteHostName);
+            if (hostName == null)
+            {
+                return null;
+            }
+
+            bool isLocalhost = hostName.StartsWith("localhost:", StringComparison.OrdinalIgnoreCase);
+            var scheme = isLocalhost ? "http" : "https";
+
+            return new Uri($"{scheme}://{hostName}/admin/extensions/{name}");
         }
     }
 }

src/WebJobs.Script/Config/ScriptHostConfiguration.cs

@@ -3,10 +3,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.IO;
 using Microsoft.ApplicationInsights.WindowsServer.Channel.Implementation;
 using Microsoft.Azure.WebJobs.Host;
-using Microsoft.Azure.WebJobs.Host.Loggers;
 using Microsoft.Azure.WebJobs.Logging;
 using Microsoft.Azure.WebJobs.Script.Extensibility;
 
@@ -22,6 +22,7 @@ public ScriptHostConfiguration()
             RootScriptPath = Environment.CurrentDirectory;
             RootLogPath = Path.Combine(Path.GetTempPath(), "Functions");
             LogFilter = new LogCategoryFilter();
+            RootExtensionsPath = ConfigurationManager.AppSettings[EnvironmentSettingNames.AzureWebJobsExtensionsPath];
         }
 
         /// <summary>
@@ -39,6 +40,12 @@ public ScriptHostConfiguration()
         /// </summary>
         public string RootLogPath { get; set; }
 
+        /// <summary>
+        /// Gets or sets the root path to search for binding
+        /// extensions.
+        /// </summary>
+        public string RootExtensionsPath { get; set; }
+
         /// <summary>
         /// Gets or sets the custom TraceWriter to add to the trace pipeline
         /// </summary>

src/WebJobs.Script/EnvironmentSettingNames.cs

@@ -20,8 +20,6 @@ public static class EnvironmentSettingNames
         public const string CompilationReleaseMode = "AzureWebJobsDotNetReleaseCompilation";
         public const string AzureWebJobsDisableHomepage = "AzureWebJobsDisableHomepage";
         public const string TypeScriptCompilerPath = "AzureWebJobs_TypeScriptPath";
-
-        // Optional env var that can be set to a local file path containing custom binding extensions.
         public const string AzureWebJobsExtensionsPath = "AzureWebJobs_ExtensionsPath";
         public const string AzureWebsiteAppCountersName = "WEBSITE_COUNTERS_APP";
         public const string AzureWebJobsSecretStorageType = "AzureWebJobsSecretStorageType";

src/WebJobs.Script/Host/ScriptHost.cs

@@ -283,7 +283,6 @@ protected virtual void Initialize()
                     throw new FormatException(string.Format("Unable to parse {0} file.", ScriptConstants.HostMetadataFileName), ex);
                 }
 
-                ScriptConfig.HostConfig.HostConfigMetadata = hostConfig;
                 ApplyConfiguration(hostConfig, ScriptConfig);
 
                 if (string.IsNullOrEmpty(ScriptConfig.HostConfig.HostId))
@@ -451,13 +450,12 @@ private IMetricsLogger CreateMetricsLogger()
             return metricsLogger;
         }
 
-        // Scan the extensions directory and Load custom extension.
         private void LoadCustomExtensions()
         {
-            var bindingRoot = ConfigurationManager.AppSettings[EnvironmentSettingNames.AzureWebJobsExtensionsPath];
-            if (!string.IsNullOrWhiteSpace(bindingRoot))
+            string extensionsPath = ScriptConfig.RootExtensionsPath;
+            if (!string.IsNullOrWhiteSpace(extensionsPath))
             {
-                foreach (var dir in Directory.EnumerateDirectories(bindingRoot))
+                foreach (var dir in Directory.EnumerateDirectories(extensionsPath))
                 {
                     foreach (var path in Directory.EnumerateFiles(dir, "*.dll"))
                     {
@@ -506,9 +504,7 @@ private void LoadExtensions(Assembly assembly, string locationHint)
         }
 
         // Load a single extension
-        private void LoadExtension(
-            IExtensionConfigProvider instance,
-            string locationHint = null)
+        private void LoadExtension(IExtensionConfigProvider instance, string locationHint = null)
         {
             JobHostConfiguration config = this.ScriptConfig.HostConfig;
 
@@ -1112,7 +1108,9 @@ internal static void ValidateHttpFunction(string functionName, HttpTriggerAttrib
 
         internal static void ApplyConfiguration(JObject config, ScriptHostConfiguration scriptConfig)
         {
-            JobHostConfiguration hostConfig = scriptConfig.HostConfig;
+            var hostConfig = scriptConfig.HostConfig;
+
+            hostConfig.HostConfigMetadata = config;
 
             JArray functions = (JArray)config["functions"];
             if (functions != null && functions.Count > 0)