Switch from Grpc.Core to Grpc.Net.Client (#758)

* Upgraded protobuf versions and removed Grpc.Core dependency * Updated channel and option types used * Change channel credentials * Added http prefix to url * Add valid URL check and explicitly include credentials
Azure · Feb 22, 2022 · df783b3 · df783b3
1 parent 6626477
commit df783b3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/Messaging/MessagingStream.cs b/src/Messaging/MessagingStream.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 
 using Grpc.Core;
+using Grpc.Net.Client;
 using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
 
 namespace Microsoft.Azure.Functions.PowerShellWorker.Messaging
@@ -19,15 +20,24 @@ internal class MessagingStream
 
         internal MessagingStream(string host, int port)
         {
+            // To call unsecured gRPC services, ensure the address starts with 'http' as opposed to 'https'.
+            // For more detail, see https://docs.microsoft.com/en-us/aspnet/core/grpc/client?view=aspnetcore-6.0
+            string uriString = $"http://{host}:{port}";
+            if (!Uri.TryCreate(uriString, UriKind.Absolute, out Uri grpcUri))
+            {
+                throw new InvalidOperationException($"The gRPC channel URI '{uriString}' could not be parsed.");
+            }
+
             const int maxMessageLength = int.MaxValue;
 
-            var channelOptions = new []
+            var channelOptions = new GrpcChannelOptions
             {
-                new ChannelOption(ChannelOptions.MaxReceiveMessageLength, maxMessageLength),
-                new ChannelOption(ChannelOptions.MaxSendMessageLength, maxMessageLength)
+                MaxReceiveMessageSize = maxMessageLength,
+                MaxSendMessageSize = maxMessageLength,
+                Credentials = ChannelCredentials.Insecure
             };
 
-            Channel channel = new Channel(host, port, ChannelCredentials.Insecure, channelOptions);
+            GrpcChannel channel = GrpcChannel.ForAddress(grpcUri, channelOptions);
             _call = new FunctionRpc.FunctionRpcClient(channel).EventStream();
         }
 

diff --git a/src/Microsoft.Azure.Functions.PowerShellWorker.csproj b/src/Microsoft.Azure.Functions.PowerShellWorker.csproj
@@ -20,7 +20,7 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.Core" Version="2.27.0" />
+    <PackageReference Include="Grpc.Core" Version="2.42.0" />
     <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.0.8" />
     <PackageReference Include="CommandLineParser" Version="2.3.0" />
     <PackageReference Include="Google.Protobuf" Version="3.19.4" />