Fixing issue with function name processing

Author: fabiocav

src/WebJobs.Script/Host/ScriptHost.cs

@@ -158,9 +158,9 @@ public void NotifyDebug()
             }
         }
 
-        internal void AddFunctionError(string functionName, string error)
+        internal void AddFunctionError(string functionName, string error, bool isFunctionShortName = false)
         {
-            functionName = Utility.GetFunctionShortName(functionName);
+            functionName = isFunctionShortName ? functionName : Utility.GetFunctionShortName(functionName);
 
             Collection<string> functionErrors = new Collection<string>();
             if (!FunctionErrors.TryGetValue(functionName, out functionErrors))
@@ -601,7 +601,7 @@ private Collection<FunctionDescriptor> ReadFunctions(IEnumerable<FunctionDescrip
                         continue;
                     }
 
-                    functionName = Path.GetFileNameWithoutExtension(scriptDir);
+                    functionName = Path.GetFileName(scriptDir);
 
                     if (ScriptConfig.Functions != null &&
                         !ScriptConfig.Functions.Contains(functionName, StringComparer.OrdinalIgnoreCase))
@@ -635,7 +635,7 @@ private Collection<FunctionDescriptor> ReadFunctions(IEnumerable<FunctionDescrip
                 catch (Exception ex)
                 {
                     // log any unhandled exceptions and continue
-                    AddFunctionError(functionName, Utility.FlattenException(ex, includeSource: false));
+                    AddFunctionError(functionName, Utility.FlattenException(ex, includeSource: false), isFunctionShortName: true);
                 }
             }
 

test/WebJobs.Script.Tests/ScriptHostTests.cs

@@ -293,6 +293,47 @@ public void Create_InvalidHostJson_ThrowsInformativeException()
             Assert.Equal("Invalid property identifier character: ~. Path '', line 2, position 4.", ex.InnerException.Message);
         }
 
+        [Theory]
+        [InlineData("host")]
+        [InlineData("-function")]
+        [InlineData("_function")]
+        [InlineData("function test")]
+        [InlineData("function.test")]
+        [InlineData("function0.1")]
+        public void Create_InvalidFunctionNames_DoesNotCreateFunctionAndLogsFailure(string functionName)
+        {
+            string rootPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+            string invalidFunctionNamePath = Path.Combine(rootPath, functionName);
+            try
+            {
+                Directory.CreateDirectory(invalidFunctionNamePath);
+
+                JObject config = new JObject();
+                config["id"] = ID;
+
+                File.WriteAllText(Path.Combine(rootPath, ScriptConstants.HostMetadataFileName), config.ToString());
+                File.WriteAllText(Path.Combine(invalidFunctionNamePath, ScriptConstants.FunctionMetadataFileName), string.Empty);
+
+                ScriptHostConfiguration scriptConfig = new ScriptHostConfiguration()
+                {
+                    RootScriptPath = rootPath
+                };
+
+                var scriptHost = ScriptHost.Create(_settingsManager, scriptConfig);
+
+                Assert.Equal(1, scriptHost.FunctionErrors.Count);
+                Assert.Equal(functionName, scriptHost.FunctionErrors.First().Key);
+                Assert.Equal($"'{functionName}' is not a valid function name.", scriptHost.FunctionErrors.First().Value.First());
+            }
+            finally
+            {
+                if (Directory.Exists(rootPath))
+                {
+                    Directory.Delete(rootPath, true);
+                }
+            }
+        }
+
         [Fact]
         public void ApplyConfiguration_TopLevel()
         {
@@ -612,6 +653,8 @@ public void TryGetFunctionFromException_FunctionMatch()
         [InlineData("-function")]
         [InlineData("_function")]
         [InlineData("function test")]
+        [InlineData("function.test")]
+        [InlineData("function0.1")]
         public void ValidateFunctionName_ThrowsOnInvalidName(string functionName)
         {
             var ex = Assert.Throws<InvalidOperationException>(() =>