Support output binding when using language worker extensions (Azure#3…

…4783)

* Support output binding when using language worker extensions

* add comment

sdk/tables/Microsoft.Azure.WebJobs.Extensions.Tables/src/TableClientHelpers.cs

@@ -84,7 +84,8 @@ public static void ValidateAzureTableKeyValue(string value)
             if (!IsValidAzureTableKeyValue(value))
             {
                 throw new InvalidOperationException(String.Format(CultureInfo.CurrentCulture,
-                    "'{0}' is not a valid value for a partition key or row key.", value));
+                    "'{0}' is not a valid value for a partition key or row key. " +
+                    "Ensure that the table entity contains valid 'PartitionKey' and 'RowKey' values.", value));
             }
         }
 

sdk/tables/Microsoft.Azure.WebJobs.Extensions.Tables/src/TablesExtensionConfigProvider.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure;
@@ -14,6 +15,7 @@
 using Microsoft.Azure.WebJobs.Host;
 using Microsoft.Azure.WebJobs.Host.Config;
 using Microsoft.Azure.WebJobs.Host.Protocols;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace Microsoft.Azure.WebJobs.Extensions.Tables
@@ -46,6 +48,8 @@ public void Initialize(ExtensionConfigContext context)
 
             binding
                 .AddConverter<JObject, TableEntity>(CreateTableEntityFromJObject)
+                // when using isolated .NET worker (and other language workers), the output attribute data will come in as a byte array
+                .AddConverter<byte[], TableEntity>(CreateTableEntityFromJsonBytes)
                 .AddConverter<TableEntity, JObject>(ConvertEntityToJObject)
                 .AddConverter<ITableEntity, TableEntity>(entity =>
                 {
@@ -178,6 +182,18 @@ private static JObject ConvertEntityToJObject(TableEntity tableEntity)
             return jsonObject;
         }
 
+        private static TableEntity CreateTableEntityFromJsonBytes(byte[] bytes)
+        {
+            JObject jObject = JsonConvert.DeserializeObject<JObject>(
+                Encoding.UTF8.GetString(bytes),
+                new JsonSerializerSettings
+                {
+                    DateParseHandling = DateParseHandling.None
+                });
+
+            return CreateTableEntityFromJObject(jObject);
+        }
+
         private static TableEntity CreateTableEntityFromJObject(JObject entity)
         {
             TableEntity tableEntity = new TableEntity();

sdk/tables/Microsoft.Azure.WebJobs.Extensions.Tables/tests/EntityBindingLiveTests.cs

@@ -284,6 +284,22 @@ public static JObject JObject(object original)
                     ["RowKey"] = RowKey
                 };
             }
+
+            [return: Table(TableNameExpression)]
+            public static byte[] ByteArray(object original)
+            {
+                // This test case is meant to simulate the isolated worker scenario
+                // where the table output attribute data comes in as a byte array
+                var dict = new Dictionary<string, object>
+                {
+                    ["Value"] = original,
+                    ["PartitionKey"] = PartitionKey,
+                    ["RowKey"] = RowKey
+                };
+                // We enrich with OData annotations as this is what the isolated workers would ideally do
+                // and our test cases expect it.
+                return new BinaryData(dict.ToOdataAnnotatedDictionary()).ToArray();
+            }
         }
 
         [RecordedTest]
@@ -396,6 +412,19 @@ public static JObject JObject(object original)
                     ["ETag"] = "*"
                 };
             }
+
+            [return: Table(TableNameExpression)]
+            public static byte[] ByteArray(object original)
+            {
+                var dict = new Dictionary<string, object>
+                {
+                    ["Value"] = original,
+                    ["PartitionKey"] = PartitionKey,
+                    ["RowKey"] = RowKey,
+                    ["ETag"] = "*"
+                };
+                return new BinaryData(dict.ToOdataAnnotatedDictionary()).ToArray();
+            }
         }
 
         [RecordedTest]
@@ -465,6 +494,16 @@ public static JObject JObject(object original)
                     ["Value"] = JToken.FromObject(original)
                 };
             }
+
+            [return: Table(TableNameExpression, PartitionKey, RowKey)]
+            public static byte[] ByteArray(object original)
+            {
+                var dict = new Dictionary<string, object>
+                {
+                    ["Value"] = original
+                };
+                return new BinaryData(dict.ToOdataAnnotatedDictionary()).ToArray();
+            }
         }
 
         [RecordedTest]