Preventing null binding data values from flowing into language workers

Author: fabiocav

sample/Node/HttpTrigger-CustomRoute-Get/index.js

@@ -18,7 +18,7 @@ var catalog = [
 module.exports = function (context, req) {
     context.log('Node.js HTTP trigger function processed a request. Name=%s', req.query.name);
 
-    context.log('category: %s id: %s', context.bindingData.category, context.bindingData.id);
+    context.log('category: %s id: %s', context.bindingData.category || '<empty>', context.bindingData.id || '<empty>');
 
     var results = [];
     catalog.forEach(function (product) {

src/WebJobs.Script/Rpc/LanguageWorkerChannel.cs

@@ -405,7 +405,10 @@ public void Invoke(ScriptInvocationContext context)
                     };
                     foreach (var pair in context.BindingData)
                     {
-                        invocationRequest.TriggerMetadata.Add(pair.Key, pair.Value.ToRpc());
+                        if (pair.Value != null)
+                        {
+                            invocationRequest.TriggerMetadata.Add(pair.Key, pair.Value.ToRpc());
+                        }
                     }
                     foreach (var input in context.Inputs)
                     {

test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/SamplesEndToEndTests_Node.cs

@@ -326,6 +326,9 @@ public async Task HttpTrigger_CustomRoute_Get_ReturnsExpectedResponse()
             json = await response.Content.ReadAsStringAsync();
             products = JArray.Parse(json);
             Assert.Equal(2, products.Count);
+            var logs = _fixture.Host.GetLogMessages(LogCategories.CreateFunctionUserCategory("HttpTrigger-CustomRoute-Get"));
+            var log = logs.Single(p => p.FormattedMessage.Contains($"category: electronics id: <empty>"));
+            _fixture.Host.ClearLogMessages();
 
             // test optional route param (category)
             uri = $"api/node/products?code={functionKey}";
@@ -336,6 +339,8 @@ public async Task HttpTrigger_CustomRoute_Get_ReturnsExpectedResponse()
             json = await response.Content.ReadAsStringAsync();
             products = JArray.Parse(json);
             Assert.Equal(3, products.Count);
+            logs = _fixture.Host.GetLogMessages(LogCategories.CreateFunctionUserCategory("HttpTrigger-CustomRoute-Get"));
+            log = logs.Single(p => p.FormattedMessage.Contains($"category: <empty> id: <empty>"));
 
             // test a constraint violation (invalid id)
             uri = $"api/node/products/electronics/notaguid?code={functionKey}";
@@ -350,11 +355,6 @@ public async Task HttpTrigger_CustomRoute_Get_ReturnsExpectedResponse()
             request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("text/plain"));
             response = await _fixture.Host.HttpClient.SendAsync(request);
             Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
-
-            // verify route parameters were part of binding data
-            var logs = _fixture.Host.GetLogMessages(LogCategories.CreateFunctionUserCategory("HttpTrigger-CustomRoute-Get"));
-            var log = logs.Single(p => p.FormattedMessage.Contains($"category: electronics id: {id}"));
-            Assert.NotNull(log);
         }
 
         [Fact(Skip = "http://github.com/Azure/azure-functions-host/issues/2812")]