Merge branch 'hostidconfigremoval' into dev

Author: fabiocav

schemas/json/host.json

@@ -5,12 +5,6 @@
     "type": "object",
 
     "properties": {
-        "id": {
-            "description": "The unique ID for this job host. Can be a lower case GUID with dashes removed",
-            "type": "string",
-            "minLength": 1
-        },
-
         "functions": {
             "description": "The list of functions the host should load.",
             "type": "array",

src/WebJobs.Script.WebHost/Resources/Functions/host.json

@@ -1,4 +1,3 @@
 {
-    "version": "2.0",
-    "id": "placeholder-host"
+    "version": "2.0"
 }

src/WebJobs.Script/Config/ConfigurationSectionNames.cs

@@ -10,5 +10,6 @@ public static class ConfigurationSectionNames
         public const string Logging = "logging";
         public const string Aggregator = "aggregator";
         public const string HealthMonitor = "healthMonitor";
+        public const string HostIdPath = WebHost + ":hostid";
     }
 }

src/WebJobs.Script/Config/HostJsonFileConfigurationSource.cs

@@ -44,7 +44,7 @@ private class HostJsonFileConfigurationProvider : ConfigurationProvider
         {
             private static readonly string[] WellKnownHostJsonProperties = new[]
             {
-                "version", "id", "functionTimeout", "functions", "http", "watchDirectories", "queues", "serviceBus",
+                "version", "functionTimeout", "functions", "http", "watchDirectories", "queues", "serviceBus",
                 "eventHub", "singleton", "logging", "aggregator", "healthMonitor"
             };
 
@@ -166,13 +166,6 @@ private JObject LoadHostConfigurationFile()
                 _logger.LogInformation(readingFileMessage);
                 _logger.LogInformation(readFileMessage);
 
-                // TODO: DI (FACAVAL) Move this to a more appropriate place
-                // If they set the host id in the JSON, emit a warning that this could cause issues and they shouldn't do it.
-                if (hostConfigObject["id"] != null)
-                {
-                    _logger.LogWarning("Host id explicitly set in the host.json. It is recommended that you remove the \"id\" property in your host.json.");
-                }
-
                 // TODO: DI (FACAVAL) Move to setup
                 //if (string.IsNullOrEmpty(_hostOptions.HostId))
                 //{

src/WebJobs.Script/Host/ScriptHost.cs

@@ -20,6 +20,7 @@
 using Microsoft.Azure.WebJobs.Host.Listeners;
 using Microsoft.Azure.WebJobs.Logging;
 using Microsoft.Azure.WebJobs.Script.Config;
+using Microsoft.Azure.WebJobs.Script.Configuration;
 using Microsoft.Azure.WebJobs.Script.Description;
 using Microsoft.Azure.WebJobs.Script.Diagnostics;
 using Microsoft.Azure.WebJobs.Script.Eventing;
@@ -51,6 +52,7 @@ public class ScriptHost : JobHost, IScriptJobHost
         private readonly Stopwatch _stopwatch = new Stopwatch();
         private readonly string _currentRuntimelanguage;
         private readonly IOptions<JobHostOptions> _hostOptions;
+        private readonly IConfiguration _configuration;
         private readonly ScriptTypeLocator _typeLocator;
         private readonly IDebugStateProvider _debugManager;
         private readonly ICollection<IScriptBindingProvider> _bindingProviders;
@@ -101,6 +103,7 @@ public ScriptHost(IOptions<JobHostOptions> options,
 
             _instanceId = Guid.NewGuid().ToString();
             _hostOptions = options;
+            _configuration = configuration;
             _storageConnectionString = configuration.GetWebJobsConnectionString(ConnectionStringNames.Storage);
             _distributedLockManager = distributedLockManager;
             _functionMetadataManager = functionMetadataManager;
@@ -271,6 +274,12 @@ public async Task InitializeAsync()
 
         private async Task LogInitializationAsync()
         {
+            // If the host id is explicitly set, emit a warning that this could cause issues and shouldn't be done
+            if (_configuration[ConfigurationSectionNames.HostIdPath] != null)
+            {
+                _logger.LogWarning("Host id explicitly set in configuration. This is not a recommended configuration and may lead to unexpected behavior.");
+            }
+
             string extensionVersion = _environment.GetEnvironmentVariable(EnvironmentSettingNames.FunctionsExtensionVersion);
             string hostId = await _hostIdProvider.GetHostIdAsync(CancellationToken.None);
             string message = $"Starting Host (HostId={hostId}, InstanceId={InstanceId}, Version={Version}, ProcessId={Process.GetCurrentProcess().Id}, AppDomainId={AppDomain.CurrentDomain.Id}, Debug={InDebugMode}, FunctionsExtensionVersion={extensionVersion})";

src/WebJobs.Script/Host/ScriptHostIdProvider.cs

@@ -7,7 +7,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Azure.WebJobs.Host.Executors;
-using Microsoft.Azure.WebJobs.Script.Config;
 using Microsoft.Azure.WebJobs.Script.Configuration;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
@@ -16,7 +15,6 @@ namespace Microsoft.Azure.WebJobs.Script
 {
     public class ScriptHostIdProvider : IHostIdProvider
     {
-        private const string HostIdPath = ConfigurationSectionNames.JobHost + ":id";
         private readonly IConfiguration _config;
         private readonly IEnvironment _environment;
         private readonly IOptionsMonitor<ScriptApplicationHostOptions> _options;
@@ -30,7 +28,7 @@ public ScriptHostIdProvider(IConfiguration config, IEnvironment environment, IOp
 
         public Task<string> GetHostIdAsync(CancellationToken cancellationToken)
         {
-            return Task.FromResult(_config[HostIdPath] ?? GetDefaultHostId(_environment, _options.CurrentValue));
+            return Task.FromResult(_config[ConfigurationSectionNames.HostIdPath] ?? GetDefaultHostId(_environment, _options.CurrentValue));
         }
 
         internal static string GetDefaultHostId(IEnvironment environment, ScriptApplicationHostOptions scriptOptions)

test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/host.json

@@ -1,4 +1,3 @@
 {
-    "version":  "2.0",
-    "id": "function-tests-csharp"
+    "version":  "2.0"
 }

test/WebJobs.Script.Tests.Integration/TestScripts/DirectLoad/host.json

@@ -1,4 +1,3 @@
 {
-    "version": "2.0",
-    "id": "function-tests-dotnet-direct"
+    "version": "2.0"
 }

test/WebJobs.Script.Tests.Integration/TestScripts/DotNet/host.json

@@ -1,4 +1,3 @@
 {
-    "version": "2.0",
-    "id": "function-tests-dotnet"
+    "version": "2.0"
 }

test/WebJobs.Script.Tests.Integration/TestScripts/FSharp/host.json

@@ -1,4 +1,3 @@
 {
-    "version": "2.0",
-    "id": "function-tests-fsharp"
+    "version": "2.0"
 }