Adding HostId to HostStatus endpoint

Author: mathewc

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

@@ -85,7 +85,10 @@ public FunctionStatus GetFunctionStatus(string name)
         [Route("admin/host/status")]
         public HostStatus GetHostStatus()
         {
-            HostStatus status = new HostStatus();
+            HostStatus status = new HostStatus
+            {
+                Id = _scriptHostManager.Instance?.ScriptConfig.HostConfig.HostId
+            };
 
             var lastError = _scriptHostManager.LastError;
             if (lastError != null)

src/WebJobs.Script.WebHost/Models/HostStatus.cs

@@ -14,7 +14,13 @@ public HostStatus()
         }
 
         /// <summary>
-        /// Gets the host version.
+        /// Gets or sets the host id.
+        /// </summary>
+        [JsonProperty(PropertyName = "id", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the host version.
         /// </summary>
         [JsonProperty(PropertyName = "version", DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string Version { get; set; }

test/WebJobs.Script.Tests/SamplesEndToEndTests.cs

@@ -814,6 +814,8 @@ public async Task HostStatus_Succeeds()
 
             AssemblyFileVersionAttribute fileVersionAttr = typeof(HostStatus).Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>();
             string expectedVersion = fileVersionAttr.Version;
+            string expectedId = "5a709861cab44e68bfed5d2c2fe7fc0c";
+            Assert.Equal(expectedId, jsonContent["id"].ToString());
             Assert.Equal(expectedVersion, jsonContent["version"].ToString());
 
             // Now ensure XML content works
@@ -828,6 +830,8 @@ public async Task HostStatus_Succeeds()
             XDocument doc = XDocument.Parse(content);
             var node = doc.Descendants(XName.Get("Version", ns)).Single();
             Assert.Equal(expectedVersion, node.Value);
+            node = doc.Descendants(XName.Get("Id", ns)).Single();
+            Assert.Equal(expectedId, node.Value);
 
             node = doc.Descendants(XName.Get("Errors", ns)).Single();
             Assert.True(node.IsEmpty);