Add SignalR to http group, always include group name (#9833)

* Add SignalR to http group, explicitly list functions with their own group

* Always include grouping in sync triggers

* Use ':' for group separator

Author: jviau

src/WebJobs.Script/Extensions/BindingMetadataExtensions.cs

@@ -12,6 +12,7 @@ public static class BindingMetadataExtensions
     {
         private const string HttpTriggerKey = "httpTrigger";
         private const string EventGridTriggerKey = "eventGridTrigger";
+        private const string SignalRTriggerKey = "signalRTrigger";
         private const string BlobTriggerKey = "blobTrigger";
 
         private static readonly HashSet<string> DurableTriggers = new(StringComparer.OrdinalIgnoreCase)
@@ -42,7 +43,7 @@ public static bool IsHttpTrigger(this BindingMetadata binding)
         /// <param name="binding">The binding metadata to check.</param>
         /// <returns><c>true</c> if a webhook trigger, <c>false</c> otherwise.</returns>
         /// <remarks>
-        /// Known webhook triggers includes Event Grid and Event Grid sourced blob triggers.
+        /// Known webhook triggers includes SignalR, Event Grid and Event Grid sourced blob triggers.
         /// </remarks>
         public static bool IsWebHookTrigger(this BindingMetadata binding)
         {
@@ -51,7 +52,8 @@ public static bool IsWebHookTrigger(this BindingMetadata binding)
                 throw new ArgumentNullException(nameof(binding));
             }
 
-            if (string.Equals(EventGridTriggerKey, binding.Type, StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(EventGridTriggerKey, binding.Type, StringComparison.OrdinalIgnoreCase)
+                || string.Equals(SignalRTriggerKey, binding.Type, StringComparison.OrdinalIgnoreCase))
             {
                 return true;
             }

src/WebJobs.Script/Extensions/FunctionMetadataExtensions.cs

@@ -65,7 +65,7 @@ public static bool IsLegacyBlobTriggerFunction(this FunctionMetadata metadata)
         /// Gets the function group for the specified <see cref="FunctionMetadata"/>.
         /// </summary>
         /// <param name="metadata">The function metadata.</param>
-        /// <returns>The function group for this metadata or <c>null</c> if no group specified.</returns>
+        /// <returns>The function group for this metadata.</returns>
         public static string GetFunctionGroup(this FunctionMetadata metadata)
         {
             if (metadata == null)
@@ -92,7 +92,8 @@ public static string GetFunctionGroup(this FunctionMetadata metadata)
                 }
             }
 
-            return null;
+            // A function with no specified group will be assigned to a group of itself.
+            return $"function:{metadata.Name}";
         }
 
         public static string GetFunctionId(this FunctionMetadata metadata)

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

@@ -72,6 +72,7 @@ public void IsHttpTrigger_ReturnsExpectedValue(string type, bool expected)
 
         [Theory]
         [InlineData("eventGridTrigger", true)]
+        [InlineData("signalRTrigger", true)]
         [InlineData("blobTrigger", true, "eventGrid")]
         [InlineData("blobTrigger", false, "other")]
         [InlineData("httpTrigger", false)]

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

@@ -146,15 +146,13 @@ public async Task ToFunctionTrigger_Grouping_ReturnsExpected(string trigger, str
                 RootScriptPath = _testRootScriptPath
             };
 
+            group ??= $"function:{functionMetadata.Name}";
             var result = await functionMetadata.ToFunctionTrigger(options, isFlexConsumption: true);
             Assert.Equal("TestFunction1", result["functionName"].Value<string>());
             Assert.Equal(trigger, result["type"].Value<string>());
 
-            Assert.Equal(group != null, result.TryGetValue("functionGroup", out JToken functionGroup));
-            if (functionGroup is not null)
-            {
-                Assert.Equal(group, functionGroup.Value<string>());
-            }
+            Assert.True(result.TryGetValue("functionGroup", out JToken functionGroup));
+            Assert.Equal(group, functionGroup.Value<string>());
         }
 
         [Theory]