Fix name collision in indexer cache (#2645)

Azure · Feb 2, 2021 · edb5eda · edb5eda
1 parent 21d9d4e
commit edb5eda
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/src/Microsoft.Azure.WebJobs.Host/Indexers/FunctionIndex.cs b/src/Microsoft.Azure.WebJobs.Host/Indexers/FunctionIndex.cs
@@ -34,9 +34,17 @@ public void Add(IFunctionDefinition function, FunctionDescriptor descriptor, Met
             _functionsByMethod.Add(method, function);
 
             // For compat, accept either the short name ("Class.Name") or log name (just "Name")
-            _functionsByName.Add(descriptor.LogName, function);
-            if (descriptor.ShortName != descriptor.LogName)
+            if (!_functionsByName.ContainsKey(descriptor.LogName))
             {
+                // since there can be duplicate method names across job classes, it's first one
+                // wins for this cache
+                _functionsByName.Add(descriptor.LogName, function);
+            }
+            if (descriptor.ShortName != descriptor.LogName &&
+                !_functionsByName.ContainsKey(descriptor.ShortName))
+            {
+                // we do a duplicate check here as well for completeness, though a conflict here
+                // is much less likely (could only happen if functions are coming from multiple assemblies).
                 _functionsByName.Add(descriptor.ShortName, function);
             }
 

diff --git a/test/Microsoft.Azure.WebJobs.Host.FunctionalTests/Indexers/FunctionIndexerTests.cs b/test/Microsoft.Azure.WebJobs.Host.FunctionalTests/Indexers/FunctionIndexerTests.cs
@@ -262,6 +262,41 @@ public void IsJobMethod_ReturnsFalse_IfMethodHasNoSdkAttributes()
             Assert.Equal(false, actual);
         }
 
+        [Fact]
+        public async Task IndexMethod_SameName_Succeeds()
+        {
+            FunctionIndex index = new FunctionIndex();
+            FunctionIndexer product = CreateProductUnderTest();
+
+            await product.IndexMethodAsync(typeof(ClassA).GetMethod("Test"), index, CancellationToken.None);
+            await product.IndexMethodAsync(typeof(ClassB).GetMethod("Test"), index, CancellationToken.None);
+
+            var functions = index.ReadAll().ToArray();
+            Assert.Equal(2, functions.Length);
+
+            Assert.Equal("ClassA.Test", index.LookupByName("Test").Descriptor.ShortName);
+            Assert.Equal("ClassA.Test", index.LookupByName("ClassA.Test").Descriptor.ShortName);
+            Assert.Equal("ClassB.Test", index.LookupByName("ClassB.Test").Descriptor.ShortName);
+        }
+
+        public class ClassA
+        {
+            [NoAutomaticTrigger]
+            public void Test(string test, ILogger logger)
+            {
+                logger.LogInformation("Test invoked!");
+            }
+        }
+
+        public class ClassB
+        {
+            [NoAutomaticTrigger]
+            public void Test(string test, ILogger logger)
+            {
+                logger.LogInformation("Test invoked!");
+            }
+        }
+
         private class TestExtensionBindingProvider : IBindingProvider
         {
             public Task<IBinding> TryCreateAsync(BindingProviderContext context)