Fixing issue with host ID trailing dash removal

Author: fabiocav

src/WebJobs.Script/Host/ScriptHost.cs

@@ -1172,8 +1172,7 @@ internal static string GetDefaultHostId(ScriptSettingsManager settingsManager, S
             else if (!string.IsNullOrEmpty(settingsManager.AzureWebsiteUniqueSlotName))
             {
                 // If running on Azure Web App, derive the host ID from unique site slot name
-                // Trim any trailing - as they can cause problems with queue names
-                hostId = settingsManager.AzureWebsiteUniqueSlotName.TrimEnd('-');
+                hostId = settingsManager.AzureWebsiteUniqueSlotName;
             }
 
             if (!string.IsNullOrEmpty(hostId))
@@ -1185,7 +1184,8 @@ internal static string GetDefaultHostId(ScriptSettingsManager settingsManager, S
                 }
             }
 
-            return hostId?.ToLowerInvariant();
+            // Lowercase and trim any trailing '-' as they can cause problems with queue names
+            return hostId?.ToLowerInvariant().TrimEnd('-');
         }
 
         private void OnUnhandledException(object sender, UnhandledExceptionEventArgs e)

test/WebJobs.Script.Tests/ScriptHostTests.cs

@@ -1055,20 +1055,19 @@ public void GetDefaultHostId_SelfHost_ReturnsExpectedResult()
             Assert.Equal($"{sanitizedMachineName}-789851553", hostId);
         }
 
-        [Fact]
-        public void GetDefaultHostId_AzureHost_ReturnsExpectedResult()
+        [Theory]
+        [InlineData("TEST-FUNCTIONS--", "test-functions")]
+        [InlineData("TEST-FUNCTIONS-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "test-functions-xxxxxxxxxxxxxxxxx")]
+        [InlineData("TEST-FUNCTIONS-XXXXXXXXXXXXXXXX-XXXX", "test-functions-xxxxxxxxxxxxxxxx")] /* 32nd character is a '-' */
+        [InlineData(null, null)]
+        public void GetDefaultHostId_AzureHost_ReturnsExpectedResult(string input, string expected)
         {
             var config = new ScriptHostConfiguration();
-            string subdomain = "TEST-FUNCTIONS--";
             var scriptSettingsManagerMock = new Mock<ScriptSettingsManager>(MockBehavior.Strict);
-            scriptSettingsManagerMock.SetupGet(p => p.AzureWebsiteUniqueSlotName).Returns(() => subdomain);
+            scriptSettingsManagerMock.SetupGet(p => p.AzureWebsiteUniqueSlotName).Returns(() => input);
 
             string hostId = ScriptHost.GetDefaultHostId(scriptSettingsManagerMock.Object, config);
-            Assert.Equal("test-functions", hostId);
-
-            subdomain = "TEST-FUNCTIONS-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
-            hostId = ScriptHost.GetDefaultHostId(scriptSettingsManagerMock.Object, config);
-            Assert.Equal("test-functions-xxxxxxxxxxxxxxxxx", hostId);
+            Assert.Equal(expected, hostId);
         }
 
         public class AssemblyMock : Assembly