Update proto (#4008)

* Delete old proto files

* Adding new proto files

* Changing dataType to string

* Use enum for data type

* Send load request with data type

* Null check before assigning to dataType

* Refactoring and testing conversion code

* Naming convention for data type

* Removing redundant checks for data types

* Default behavior test for conversion

* Making undefined the default enum choice

* Explicit check for undefined data type

Author: maiqbal11

src/WebJobs.Script.Grpc/azure-functions-language-worker-protobuf/README.md

@@ -24,7 +24,7 @@ From within the Azure Functions language worker repo:
 
 From within the Azure Functions language worker repo:
 1.	Define remote branch for cleaner git commands
-    -	`git remote add proto-file https://github.com/mhoeger/azure-functions-language-worker-protobuf.git`
+    -	`git remote add proto-file https://github.com/azure/azure-functions-language-worker-protobuf.git`
     -	`git fetch proto-file`
 2.	Merge updates
     -   `git merge -s subtree proto-file/<version branch> --squash --allow-unrelated-histories` 

src/WebJobs.Script.Grpc/azure-functions-language-worker-protobuf/src/proto/FunctionRpc.proto

@@ -301,11 +301,21 @@ message BindingInfo {
       inout = 2;
     }
 
+    // Indicates the type of the data for the binding
+    enum DataType {
+      undefined = 0;
+      string = 1;
+      binary = 2;
+      stream = 3;
+    }
+
   // Type of binding (e.g. HttpTrigger)
   string type = 2;
 
   // Direction of the given binding
   Direction direction = 3;
+
+  DataType data_type = 4;
 }
 
 // Used to send logs back to the Host 

src/WebJobs.Script/Description/Binding/DataType.cs

@@ -8,6 +8,7 @@ namespace Microsoft.Azure.WebJobs.Script.Description
     /// </summary>
     public enum DataType
     {
+        Undefined,
         String,
         Binary,
         Stream

src/WebJobs.Script/Rpc/LanguageWorkerChannel.cs

@@ -334,11 +334,9 @@ internal void SendFunctionLoadRequest(FunctionRegistrationContext context)
 
             foreach (var binding in metadata.Bindings)
             {
-                request.Metadata.Bindings.Add(binding.Name, new BindingInfo
-                {
-                    Direction = (BindingInfo.Types.Direction)binding.Direction,
-                    Type = binding.Type
-                });
+                BindingInfo bindingInfo = binding.ToBindingInfo();
+
+                request.Metadata.Bindings.Add(binding.Name, bindingInfo);
             }
 
             SendStreamingMessage(new StreamingMessage

src/WebJobs.Script/Rpc/MessageExtensions/RpcMessageConversionExtensions.cs

@@ -9,6 +9,7 @@
 using Google.Protobuf;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Azure.WebJobs.Extensions.Http;
+using Microsoft.Azure.WebJobs.Script.Description;
 using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -159,5 +160,21 @@ public static TypedData ToRpc(this object value)
             }
             return typedData;
         }
+
+        public static BindingInfo ToBindingInfo(this BindingMetadata bindingMetadata)
+        {
+            BindingInfo bindingInfo = new BindingInfo
+            {
+                Direction = (BindingInfo.Types.Direction)bindingMetadata.Direction,
+                Type = bindingMetadata.Type
+            };
+
+            if (bindingMetadata.DataType != null)
+            {
+                bindingInfo.DataType = (BindingInfo.Types.DataType)bindingMetadata.DataType;
+            }
+
+            return bindingInfo;
+        }
     }
 }

test/WebJobs.Script.Tests/Rpc/RpcMessageConversionExtensionsTests.cs

@@ -3,6 +3,8 @@
 
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Azure.WebJobs.Script.Description;
+using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
 using Microsoft.Azure.WebJobs.Script.Rpc;
 using Microsoft.WebJobs.Script.Tests;
 using Xunit;
@@ -46,5 +48,42 @@ public void HttpObjects_Query(string queryString, string[] expectedKeys, string[
                 Assert.Equal(rpcRequestObject.Http.Query.GetValueOrDefault(expectedKeys[i]), expectedValues[i]);
             }
         }
+
+        [Theory]
+        [InlineData(BindingDirection.In, "blob", DataType.String)]
+        [InlineData(BindingDirection.Out, "blob", DataType.Binary)]
+        [InlineData(BindingDirection.InOut, "blob", DataType.Stream)]
+        [InlineData(BindingDirection.InOut, "blob", DataType.Undefined)]
+        public void ToBindingInfo_Converts_Correctly(BindingDirection bindingDirection, string type, DataType dataType)
+        {
+            BindingMetadata bindingMetadata = new BindingMetadata
+            {
+                Direction = bindingDirection,
+                Type = type,
+                DataType = dataType
+            };
+
+            BindingInfo bindingInfo = bindingMetadata.ToBindingInfo();
+
+            Assert.Equal(bindingInfo.Direction, (BindingInfo.Types.Direction)bindingMetadata.Direction);
+            Assert.Equal(bindingInfo.Type, bindingMetadata.Type);
+            Assert.Equal(bindingInfo.DataType, (BindingInfo.Types.DataType)bindingMetadata.DataType);
+        }
+
+        [Fact]
+        public void ToBindingInfo_Defaults_EmptyDataType()
+        {
+            BindingMetadata bindingMetadata = new BindingMetadata
+            {
+                Direction = BindingDirection.In,
+                Type = "blob"
+            };
+
+            BindingInfo bindingInfo = bindingMetadata.ToBindingInfo();
+
+            Assert.Equal(bindingInfo.Direction, (BindingInfo.Types.Direction)bindingMetadata.Direction);
+            Assert.Equal(bindingInfo.Type, bindingMetadata.Type);
+            Assert.Equal(bindingInfo.DataType, BindingInfo.Types.DataType.Undefined);
+        }
     }
 }