Merge branch 'master' into dev

Author: brettsam

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

@@ -25,6 +25,7 @@
 using Microsoft.Azure.WebJobs.Script.WebHost.Security;
 using Microsoft.Azure.WebJobs.Script.WebHost.Security.Authorization;
 using Microsoft.Azure.WebJobs.Script.WebHost.Security.Authorization.Policies;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
@@ -47,7 +48,6 @@ public class HostController : Controller
         private readonly IEnvironment _environment;
         private readonly IScriptHostManager _scriptHostManager;
         private readonly IFunctionsSyncManager _functionsSyncManager;
-        private readonly IExtensionBundleManager _extensionBundleManager;
 
         public HostController(IOptions<ScriptApplicationHostOptions> applicationHostOptions,
             IOptions<JobHostOptions> hostOptions,
@@ -56,8 +56,7 @@ public HostController(IOptions<ScriptApplicationHostOptions> applicationHostOpti
             IWebFunctionsManager functionsManager,
             IEnvironment environment,
             IScriptHostManager scriptHostManager,
-            IFunctionsSyncManager functionsSyncManager,
-            IExtensionBundleManager extensionBundleManager)
+            IFunctionsSyncManager functionsSyncManager)
         {
             _applicationHostOptions = applicationHostOptions;
             _hostOptions = hostOptions;
@@ -67,14 +66,13 @@ public HostController(IOptions<ScriptApplicationHostOptions> applicationHostOpti
             _environment = environment;
             _scriptHostManager = scriptHostManager;
             _functionsSyncManager = functionsSyncManager;
-            _extensionBundleManager = extensionBundleManager;
         }
 
         [HttpGet]
         [Route("admin/host/status")]
         [Authorize(Policy = PolicyNames.AdminAuthLevelOrInternal)]
         [TypeFilter(typeof(EnableDebugModeFilter))]
-        public async Task<IActionResult> GetHostStatus([FromServices] IScriptHostManager scriptHostManager, [FromServices] IHostIdProvider hostIdProvider)
+        public async Task<IActionResult> GetHostStatus([FromServices] IScriptHostManager scriptHostManager, [FromServices] IHostIdProvider hostIdProvider, [FromServices] IServiceProvider serviceProvider = null)
         {
             var status = new HostStatus
             {
@@ -85,14 +83,18 @@ public async Task<IActionResult> GetHostStatus([FromServices] IScriptHostManager
                 ProcessUptime = (long)(DateTime.UtcNow - Process.GetCurrentProcess().StartTime).TotalMilliseconds
             };
 
-            var bundleInfo = await _extensionBundleManager.GetExtensionBundleDetails();
-            if (bundleInfo != null)
+            var bundleManager = serviceProvider.GetService<IExtensionBundleManager>();
+            if (bundleManager != null)
             {
-                status.ExtensionBundle = new Models.ExtensionBundle()
+                var bundleInfo = await bundleManager.GetExtensionBundleDetails();
+                if (bundleInfo != null)
                 {
-                    Id = bundleInfo.Id,
-                    Version = bundleInfo.Version
-                };
+                    status.ExtensionBundle = new Models.ExtensionBundle()
+                    {
+                        Id = bundleInfo.Id,
+                        Version = bundleInfo.Version
+                    };
+                }
             }
 
             var lastError = scriptHostManager.LastError;

src/WebJobs.Script/ScriptHostBuilderExtensions.cs

@@ -107,13 +107,13 @@ public static IHostBuilder AddScriptHostCore(this IHostBuilder builder, ScriptAp
 
                 var extensionBundleOptions = GetExtensionBundleOptions(context);
                 var bundleManager = new ExtensionBundleManager(extensionBundleOptions, SystemEnvironment.Instance, loggerFactory);
+                webJobsBuilder.Services.AddSingleton<IExtensionBundleManager>(_ => bundleManager);
                 if (!skipHostInitialization)
                 {
                     // Only set our external startup if we're not suppressing host initialization
                     // as we don't want to load user assemblies otherwise.
                     webJobsBuilder.UseScriptExternalStartup(applicationHostOptions, loggerFactory, bundleManager);
                 }
-                webJobsBuilder.Services.AddSingleton<IExtensionBundleManager>(_ => bundleManager);
 
                 configureWebJobs?.Invoke(webJobsBuilder);
             }, o => o.AllowPartialHostStartup = true);

test/WebJobs.Script.Tests/Controllers/Admin/HostControllerTests.cs

@@ -54,7 +54,7 @@ public HostControllerTests()
             _functionsSyncManager = new Mock<IFunctionsSyncManager>(MockBehavior.Strict);
             _extensionBundleManager = new Mock<IExtensionBundleManager>(MockBehavior.Strict);
 
-            _hostController = new HostController(optionsWrapper, hostOptions, loggerFactory, mockAuthorizationService.Object, mockWebFunctionsManager.Object, _mockEnvironment.Object, _mockScriptHostManager.Object, _functionsSyncManager.Object, _extensionBundleManager.Object);
+            _hostController = new HostController(optionsWrapper, hostOptions, loggerFactory, mockAuthorizationService.Object, mockWebFunctionsManager.Object, _mockEnvironment.Object, _mockScriptHostManager.Object, _functionsSyncManager.Object);
 
             _appOfflineFilePath = Path.Combine(_scriptPath, ScriptConstants.AppOfflineFileName);
             if (File.Exists(_appOfflineFilePath))