Fixing nested JSON binding bug (#412).

Author: mathewc

src/WebJobs.Script/Description/FunctionInvokerBase.cs

@@ -90,7 +90,7 @@ protected virtual void OnScriptFileChanged(object sender, FileSystemEventArgs e)
         /// binding data because all the POCO binders require strong
         /// typing
         /// </summary>
-        protected static Dictionary<string, string> GetBindingData(object value, IBinderEx binder)
+        internal static Dictionary<string, string> GetBindingData(object value, IBinderEx binder)
         {
             // First apply any existing binding data. Any additional binding
             // data coming from the message will take precedence
@@ -108,7 +108,8 @@ protected static Dictionary<string, string> GetBindingData(object value, IBinder
                     // only includes top level properties)
                     JObject parsed = JObject.Parse(json);
                     var additionalBindingData = parsed.Children<JProperty>()
-                        .Where(p => p.Value.Type != JTokenType.Object)
+                        .Where(p => p.Value != null && 
+                        (p.Value.Type != JTokenType.Object & p.Value.Type != JTokenType.Array))
                         .ToDictionary(p => p.Name, p => (string)p);
 
                     if (additionalBindingData != null)

src/WebJobs.Script/Description/PowerShell/PowerShellFunctionInvoker.cs

@@ -8,7 +8,6 @@
 using System.Linq;
 using System.Management.Automation;
 using System.Management.Automation.Runspaces;
-using System.Net.Http;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
@@ -59,41 +58,22 @@ public override async Task Invoke(object[] parameters)
 
             try
             {
-                object convertedInput = input;
-                if (input != null)
-                {
-                    HttpRequestMessage request = input as HttpRequestMessage;
-                    if (request != null)
-                    {
-                        // TODO: Handle other content types? (E.g. byte[])
-                        if (request.Content != null && request.Content.Headers.ContentLength > 0)
-                        {
-                            convertedInput = ((HttpRequestMessage)input).Content.ReadAsStringAsync().Result;
-                        }
-                    }
-                }
-
                 TraceWriter.Info(string.Format("Function started (Id={0})", invocationId));
 
-                string functionInstanceOutputPath = Path.Combine(Path.GetTempPath(), "Functions", "Binding",
-                    invocationId);
-
+                object convertedInput = ConvertInput(input);
                 Dictionary<string, string> bindingData = GetBindingData(convertedInput, binder);
                 bindingData["InvocationId"] = invocationId;
 
                 Dictionary<string, string> environmentVariables = new Dictionary<string, string>();
 
-                await
-                    ProcessInputBindingsAsync(convertedInput, functionInstanceOutputPath, binder, _inputBindings, _outputBindings, bindingData,
-                        environmentVariables);
+                string functionInstanceOutputPath = Path.Combine(Path.GetTempPath(), "Functions", "Binding", invocationId);
+                await ProcessInputBindingsAsync(convertedInput, functionInstanceOutputPath, binder, _inputBindings, _outputBindings, bindingData, environmentVariables);
 
-                InitializeEnvironmentVariables(environmentVariables, functionInstanceOutputPath, input, _outputBindings,
-                    functionExecutionContext);
+                InitializeEnvironmentVariables(environmentVariables, functionInstanceOutputPath, input, _outputBindings, functionExecutionContext);
 
                 PSDataCollection<ErrorRecord> errors = await InvokePowerShellScript(environmentVariables, traceWriter);
 
-                await
-                    ProcessOutputBindingsAsync(functionInstanceOutputPath, _outputBindings, input, binder, bindingData);
+                await ProcessOutputBindingsAsync(functionInstanceOutputPath, _outputBindings, input, binder, bindingData);
 
                 if (errors.Any())
                 {

src/WebJobs.Script/Description/Script/ScriptFunctionInvoker.cs

@@ -8,7 +8,6 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Azure.WebJobs.Host;
 using Microsoft.Azure.WebJobs.Host.Bindings.Runtime;
@@ -86,21 +85,6 @@ internal async Task ExecuteScriptAsync(string path, string arguments, object[] i
             FunctionStartedEvent startedEvent = new FunctionStartedEvent(functionExecutionContext.InvocationId, Metadata);
             _metrics.BeginEvent(startedEvent);
 
-            // perform any required input conversions
-            object convertedInput = input;
-            if (input != null)
-            {
-                HttpRequestMessage request = input as HttpRequestMessage;
-                if (request != null)
-                {
-                    // TODO: Handle other content types? (E.g. byte[])
-                    if (request.Content != null && request.Content.Headers.ContentLength > 0)
-                    {
-                        convertedInput = ((HttpRequestMessage)input).Content.ReadAsStringAsync().Result;
-                    }
-                }
-            }
-
             TraceWriter.Info(string.Format("Function started (Id={0})", invocationId));
 
             string workingDirectory = Path.GetDirectoryName(_scriptFilePath);
@@ -109,6 +93,7 @@ internal async Task ExecuteScriptAsync(string path, string arguments, object[] i
             Dictionary<string, string> environmentVariables = new Dictionary<string, string>();
             InitializeEnvironmentVariables(environmentVariables, functionInstanceOutputPath, input, _outputBindings, functionExecutionContext);
 
+            object convertedInput = ConvertInput(input);
             Dictionary<string, string> bindingData = GetBindingData(convertedInput, binder);
             bindingData["InvocationId"] = invocationId;
 

src/WebJobs.Script/Description/ScriptFunctionInvokerBase.cs

@@ -125,6 +125,25 @@ protected static async Task ProcessOutputBindingsAsync(string functionInstanceOu
             }
         }
 
+        protected static object ConvertInput(object input)
+        {
+            if (input != null)
+            {
+                // perform any required input conversions
+                HttpRequestMessage request = input as HttpRequestMessage;
+                if (request != null)
+                {
+                    // TODO: Handle other content types? (E.g. byte[])
+                    if (request.Content != null && request.Content.Headers.ContentLength > 0)
+                    {
+                        return ((HttpRequestMessage)input).Content.ReadAsStringAsync().Result;
+                    }
+                }
+            }
+
+            return input;
+        }
+
         protected void InitializeEnvironmentVariables(Dictionary<string, string> environmentVariables, string functionInstanceOutputPath, object input, Collection<FunctionBinding> outputBindings, ExecutionContext executionContext)
         {
             environmentVariables["InvocationId"] = executionContext.InvocationId.ToString();

test/WebJobs.Script.Tests/CompositeTraceWriterTests.cs

@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using System.Linq;
 using Microsoft.Azure.WebJobs.Host;
-using Microsoft.Azure.WebJobs.Script;
 using Xunit;
 
 namespace Microsoft.Azure.WebJobs.Script.Tests

test/WebJobs.Script.Tests/FunctionInvokerBaseTests.cs

@@ -0,0 +1,45 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Azure.WebJobs.Host.Bindings;
+using Microsoft.Azure.WebJobs.Host.Bindings.Runtime;
+using Microsoft.Azure.WebJobs.Script.Description;
+using Moq;
+using Xunit;
+
+namespace Microsoft.Azure.WebJobs.Script.Tests
+{
+    public class FunctionInvokerBaseTests
+    {
+        [Fact]
+        public void GetBindingData_HandlesNestedJsonPayloads()
+        {
+            string input = "{ 'test': 'testing', 'baz': 123, 'nested': [ { 'nesting': 'yes' } ] }";
+
+            var binderMock = new Mock<IBinderEx>(MockBehavior.Strict);
+
+            var ambientBindingData = new Dictionary<string, object>
+            {
+                { "foo", "Value1" },
+                { "bar", "Value2" },
+                { "baz", "Value3" }
+            };
+            FunctionBindingContext functionContext = new FunctionBindingContext(Guid.NewGuid(), CancellationToken.None, new TestTraceWriter(TraceLevel.Verbose));
+            AmbientBindingContext bindingContext = new AmbientBindingContext(functionContext, ambientBindingData);
+            binderMock.SetupGet(p => p.BindingContext).Returns(bindingContext);
+
+            var bindingData = FunctionInvokerBase.GetBindingData(input, binderMock.Object);
+
+            Assert.Equal("Value1", bindingData["foo"]);
+            Assert.Equal("Value2", bindingData["bar"]);
+            Assert.Equal("testing", bindingData["test"]);
+
+            // input data overrides ambient data
+            Assert.Equal("123", bindingData["baz"]);
+        }
+    }
+}

test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj

@@ -282,6 +282,7 @@
     <Compile Include="FunctionDescriptorProviderTests.cs" />
     <Compile Include="FunctionGeneratorTests.cs" />
     <Compile Include="Description\DotNet\CSharp\PackageAssemblyResolverTests.cs" />
+    <Compile Include="FunctionInvokerBaseTests.cs" />
     <Compile Include="MetricsEventManagerTests.cs" />
     <Compile Include="PowerShellInvokerTests.cs" />
     <Compile Include="Properties\Resources.Designer.cs">