Updating packages, removing storage extension references from WebHost…

…, test fixes and other cleanup.
yuka1984 · Aug 6, 2018 · e63a1e0 · e63a1e0
1 parent f95f2ec
commit e63a1e0
Show file tree

Hide file tree

Showing 23 changed files with 53 additions and 1,263 deletions.
diff --git a/sample/host.json b/sample/host.json
@@ -29,6 +29,5 @@
         "healthCheckThreshold": 6,
         "counterThreshold": 0.80
     },
-  "functionTimeout": "00:05:00",
-  "functions": [ "HttpTrigger-Csharp", "ManualTrigger-CSharp" ]
+    "functionTimeout": "00:05:00"
 }
diff --git a/src/WebJobs.Script.WebHost/Controllers/FunctionsController.cs b/src/WebJobs.Script.WebHost/Controllers/FunctionsController.cs
@@ -32,15 +32,13 @@ namespace Microsoft.Azure.WebJobs.Script.WebHost.Controllers
     public class FunctionsController : Controller
     {
         private readonly IWebFunctionsManager _functionsManager;
-        private readonly ScriptHostManager _scriptHostManager;
         private readonly IWebJobsRouter _webJobsRouter;
         private readonly ILogger _logger;
         private static readonly Regex FunctionNameValidationRegex = new Regex(@"^[a-z][a-z0-9_\-]{0,127}$(?<!^host$)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
-        public FunctionsController(IWebFunctionsManager functionsManager, WebScriptHostManager scriptHostManager, IWebJobsRouter webJobsRouter, ILoggerFactory loggerFactory)
+        public FunctionsController(IWebFunctionsManager functionsManager, IWebJobsRouter webJobsRouter, ILoggerFactory loggerFactory)
         {
             _functionsManager = functionsManager;
-            _scriptHostManager = scriptHostManager;
             _webJobsRouter = webJobsRouter;
             _logger = loggerFactory?.CreateLogger(ScriptConstants.LogCategoryFunctionsController);
         }

diff --git a/src/WebJobs.Script.WebHost/Controllers/HostController.cs b/src/WebJobs.Script.WebHost/Controllers/HostController.cs
@@ -12,6 +12,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.WebApiCompatShim;
 using Microsoft.Azure.WebJobs.Host;
+using Microsoft.Azure.WebJobs.Host.Executors;
 using Microsoft.Azure.WebJobs.Script.WebHost.Authentication;
 using Microsoft.Azure.WebJobs.Script.WebHost.Filters;
 using Microsoft.Azure.WebJobs.Script.WebHost.Management;
@@ -53,14 +54,14 @@ public HostController(IOptions<ScriptWebHostOptions> webHostSettings,
         [Route("admin/host/status")]
         [Authorize(Policy = PolicyNames.AdminAuthLevelOrInternal)]
         [TypeFilter(typeof(EnableDebugModeFilter))]
-        public IActionResult GetHostStatus([FromServices] IScriptHostManager scriptHostManager)
+        public async Task<IActionResult> GetHostStatus([FromServices] IScriptHostManager scriptHostManager, [FromServices] IHostIdProvider hostIdProvider)
         {
             var status = new HostStatus
             {
                 State = scriptHostManager.State.ToString(),
                 Version = ScriptHost.Version,
                 VersionDetails = Utility.GetInformationalVersion(typeof(ScriptHost)),
-                Id = _hostOptions.Value.HostId
+                Id = await hostIdProvider.GetHostIdAsync(CancellationToken.None)
             };
 
             var lastError = scriptHostManager.LastError;

diff --git a/src/WebJobs.Script.WebHost/ScriptHostBuilderExtensions.cs b/src/WebJobs.Script.WebHost/ScriptHostBuilderExtensions.cs
@@ -97,7 +97,6 @@ public static IHostBuilder AddScriptHostCore(this IHostBuilder builder, IOptions
              {
                  o.AppDirectory = webHostOptions.Value.ScriptPath;
              })
-             .AddAzureStorage()
              .AddHttp(o =>
              {
                  o.SetResponse = HttpBinding.SetResponse;

diff --git a/src/WebJobs.Script.WebHost/WebHostResolver.cs b/src/WebJobs.Script.WebHost/WebHostResolver.cs
diff --git a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj
@@ -47,11 +47,11 @@
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Buffering" Version="0.4.0-preview2-28189" />
+    <PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.1.0-beta9" />
     <PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.0.5350001-beta-fc119b98" />
     <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.1.0-a-oob-2-1-oob-17035" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.0-beta7-11390" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="3.0.0-beta7-11390" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Logging" Version="3.0.0-beta7-11390" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="3.0.0-beta7-11395" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Logging" Version="3.0.0-beta7-11395" />
     <PackageReference Include="Microsoft.Azure.WebSites.DataProtection" Version="2.1.88-alpha" />
     <PackageReference Include="System.Net.Primitives" Version="4.3.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="8.6.0" />

diff --git a/src/WebJobs.Script.WebHost/WebScriptHostManager.cs b/src/WebJobs.Script.WebHost/WebScriptHostManager.cs