Remove explicit function grouping (#9956) (#9989)

* Remove explicit function grouping

* Fix unit tests

Author: jviau

src/WebJobs.Script/Extensions/FunctionMetadataExtensions.cs

@@ -15,7 +15,6 @@ public static class FunctionMetadataExtensions
         private const string IsDisabledKey = "IsDisabled";
         private const string IsCodelessKey = "IsCodeless";
         private const string FunctionIdKey = "FunctionId";
-        private const string FunctionGroupKey = "FunctionGroup";
         private const string HttpTriggerKey = "HttpTrigger";
         private const string HttpOutputKey = "Http";
         private const string BlobTriggerType = "blobTrigger";
@@ -73,11 +72,6 @@ public static string GetFunctionGroup(this FunctionMetadata metadata)
                 throw new ArgumentNullException(nameof(metadata));
             }
 
-            if (metadata.Properties.TryGetValue(FunctionGroupKey, out object group))
-            {
-                return group.ToString();
-            }
-
             // Ensure http and durable triggers are grouped together.
             foreach (BindingMetadata binding in metadata.InputBindings)
             {

test/WebJobs.Script.Tests/Description/FunctionGroupListenerDecoratorTests.cs

@@ -6,6 +6,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
+using Newtonsoft.Json.Linq;
 using Xunit;
 using FuncDescriptor = Microsoft.Azure.WebJobs.Host.Protocols.FunctionDescriptor;
 
@@ -16,14 +17,21 @@ public class FunctionGroupListenerDecoratorTests
         private readonly ILogger<FunctionGroupListenerDecorator> _logger
             = NullLogger<FunctionGroupListenerDecorator>.Instance;
 
+        private enum FuncGroup
+        {
+            None,
+            Http,
+            Other,
+        }
+
         [Fact]
         public void Decorate_NoTargetGroupConfigured_ReturnsOriginalListener()
         {
             // Arrange
             IFunctionDefinition definition = Mock.Of<IFunctionDefinition>();
             IListener original = Mock.Of<IListener>();
             IFunctionMetadataManager metadata = Mock.Of<IFunctionMetadataManager>();
-            IEnvironment environment = CreateEnvironment(null);
+            IEnvironment environment = CreateEnvironment(FuncGroup.None);
 
             var context = new ListenerDecoratorContext(definition, original.GetType(), original);
             var decorator = new FunctionGroupListenerDecorator(metadata, environment, _logger);
@@ -42,7 +50,7 @@ public void Decorate_MetadataNotFound_ReturnsOriginalListener()
             IFunctionDefinition definition = CreateDefinition("test");
             IListener original = Mock.Of<IListener>();
             IFunctionMetadataManager metadata = Mock.Of<IFunctionMetadataManager>();
-            IEnvironment environment = CreateEnvironment("test-group");
+            IEnvironment environment = CreateEnvironment(FuncGroup.Http);
 
             var context = new ListenerDecoratorContext(definition, original.GetType(), original);
             var decorator = new FunctionGroupListenerDecorator(metadata, environment, _logger);
@@ -60,8 +68,8 @@ public void Decorate_GroupMatch_ReturnsOriginalListener()
             // Arrange
             IFunctionDefinition definition = CreateDefinition("test");
             IListener original = Mock.Of<IListener>();
-            IFunctionMetadataManager metadata = CreateMetadataManager("test", "test-group");
-            IEnvironment environment = CreateEnvironment("test-group");
+            IFunctionMetadataManager metadata = CreateMetadataManager("test", true);
+            IEnvironment environment = CreateEnvironment(FuncGroup.Http);
 
             var context = new ListenerDecoratorContext(definition, original.GetType(), original);
             var decorator = new FunctionGroupListenerDecorator(metadata, environment, _logger);
@@ -79,8 +87,8 @@ public void Decorate_GroupDoesNotMatch_ReturnsNoOpListener()
             // Arrange
             IFunctionDefinition definition = CreateDefinition("test");
             IListener original = Mock.Of<IListener>();
-            IFunctionMetadataManager metadata = CreateMetadataManager("test", "test-group");
-            IEnvironment environment = CreateEnvironment("other-group");
+            IFunctionMetadataManager metadata = CreateMetadataManager("test", true);
+            IEnvironment environment = CreateEnvironment(FuncGroup.Other);
 
             var context = new ListenerDecoratorContext(definition, original.GetType(), original);
             var decorator = new FunctionGroupListenerDecorator(metadata, environment, _logger);
@@ -98,22 +106,45 @@ private static IFunctionDefinition CreateDefinition(string name)
             return Mock.Of<IFunctionDefinition>(m => m.Descriptor == descriptor);
         }
 
-        private static IFunctionMetadataManager CreateMetadataManager(string name, string group)
+        private static IFunctionMetadataManager CreateMetadataManager(string name, bool group)
         {
+            string trigger = group ? "httpTrigger" : "otherTrigger";
             var metadata = new FunctionMetadata()
             {
-                Properties = { ["FunctionGroup"] = group },
+                Name = "TestFunction1",
+                Bindings =
+                {
+                    new BindingMetadata
+                    {
+                        Name = "input",
+                        Type = trigger,
+                        Direction = BindingDirection.In,
+                        Raw = new JObject()
+                        {
+                            ["name"] = "input",
+                            ["type"] = trigger,
+                            ["direction"] = "in",
+                        },
+                    }
+                }
             };
 
             var mock = new Mock<IFunctionMetadataManager>();
             mock.Setup(p => p.TryGetFunctionMetadata(name, out metadata, false)).Returns(true);
             return mock.Object;
         }
 
-        private static IEnvironment CreateEnvironment(string group)
+        private static IEnvironment CreateEnvironment(FuncGroup group)
         {
+            string groupStr = group switch
+            {
+                FuncGroup.Http => "http",
+                FuncGroup.Other => "other",
+                _ => null,
+            };
+
             var environment = new Mock<IEnvironment>(MockBehavior.Strict);
-            environment.Setup(p => p.GetEnvironmentVariable(EnvironmentSettingNames.FunctionsTargetGroup)).Returns(group);
+            environment.Setup(p => p.GetEnvironmentVariable(EnvironmentSettingNames.FunctionsTargetGroup)).Returns(groupStr);
             return environment.Object;
         }
     }

test/WebJobs.Script.Tests/Extensions/FunctionMetadataExtensionsTests.cs

@@ -155,48 +155,6 @@ public async Task ToFunctionTrigger_Grouping_ReturnsExpected(string trigger, str
             Assert.Equal(group, functionGroup.Value<string>());
         }
 
-        [Theory]
-        [InlineData("httpTrigger", "other0")]
-        [InlineData("orchestrationTrigger", "other1")]
-        [InlineData("activityTrigger", "other2")]
-        [InlineData("entityTrigger", "other3")]
-        [InlineData("otherTrigger", "other4")]
-        public async Task ToFunctionTrigger_ExplicitGrouping_ReturnsExpected(string trigger, string group)
-        {
-            var functionMetadata = new FunctionMetadata
-            {
-                Name = "TestFunction1",
-                Bindings =
-                {
-                    new BindingMetadata
-                    {
-                        Name = "input",
-                        Type = trigger,
-                        Direction = BindingDirection.In,
-                        Raw = new JObject()
-                        {
-                            ["name"] = "input",
-                            ["type"] = trigger,
-                            ["direction"] = "in",
-                        },
-                    }
-                },
-                Properties =
-                {
-                   ["FunctionGroup"] = group,
-                },
-            };
-            var options = new ScriptJobHostOptions
-            {
-                RootScriptPath = _testRootScriptPath
-            };
-
-            var result = await functionMetadata.ToFunctionTrigger(options, isFlexConsumption: true);
-            Assert.Equal("TestFunction1", result["functionName"].Value<string>());
-            Assert.Equal(group, result["functionGroup"].Value<string>());
-            Assert.Equal(trigger, result["type"].Value<string>());
-        }
-
         [Fact]
         public async Task ToFunctionMetadataResponse_WithoutFiles_ReturnsExpected()
         {