Jzaballos/4.1.3.hotfix (#8053)

* improve scoping of FunctionRpcService; remove call to CreateDefaultBuilder (#8050)

* Update common.props

* switching ref

* adding using statement

* removing unsupported test from hotfix

Co-authored-by: Brett Samblanet <[email protected]>

Author: VpOfEngineering

build/common.props

@@ -5,7 +5,7 @@
     <LangVersion>latest</LangVersion>
     <MajorVersion>4</MajorVersion>
     <MinorVersion>1</MinorVersion>
-    <PatchVersion>2</PatchVersion>
+    <PatchVersion>3</PatchVersion>
     <BuildNumber Condition="'$(BuildNumber)' == '' ">0</BuildNumber>
     <PreviewVersion></PreviewVersion>        
 

src/WebJobs.Script.Grpc/Server/AspNetCoreGrpcHostBuilder.cs

@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.Azure.WebJobs.Script.Eventing;
+using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
 using Microsoft.Azure.WebJobs.Script.Workers;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -13,24 +14,24 @@ namespace Microsoft.Azure.WebJobs.Script.Grpc
 {
     internal static class AspNetCoreGrpcHostBuilder
     {
-        public static IHostBuilder CreateHostBuilder(IScriptEventManager scriptEventManager, int port) =>
-            Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder()
-                .ConfigureWebHost(webBuilder =>
+        public static IHostBuilder CreateHostBuilder(FunctionRpc.FunctionRpcBase service, IScriptEventManager scriptEventManager, int port) =>
+            new HostBuilder().ConfigureWebHost(webBuilder =>
+            {
+                webBuilder.UseKestrel(options =>
                 {
-                    webBuilder.UseKestrel(options =>
-                      {
-                          options.Listen(IPAddress.Parse(WorkerConstants.HostName), port, listenOptions =>
-                          {
-                              listenOptions.Protocols = HttpProtocols.Http2;
-                          });
-                      });
+                    options.Listen(IPAddress.Parse(WorkerConstants.HostName), port, listenOptions =>
+                    {
+                        listenOptions.Protocols = HttpProtocols.Http2;
+                    });
+                });
 
-                    webBuilder.ConfigureServices(services =>
-                      {
-                          services.AddSingleton(scriptEventManager);
-                      });
+                webBuilder.ConfigureServices(services =>
+                  {
+                      services.AddSingleton(scriptEventManager);
+                      services.AddSingleton(service);
+                  });
 
-                    webBuilder.UseStartup<Startup>();
-                });
+                webBuilder.UseStartup<Startup>();
+            });
     }
 }

src/WebJobs.Script.Grpc/Server/AspNetCoreGrpcServer.cs

@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Hosting.Server.Features;
 using Microsoft.Azure.WebJobs.Script.Eventing;
+using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
 using Microsoft.Azure.WebJobs.Script.Workers;
 using Microsoft.Azure.WebJobs.Script.Workers.Rpc;
 using Microsoft.Extensions.DependencyInjection;
@@ -22,10 +23,10 @@ public class AspNetCoreGrpcServer : IRpcServer, IDisposable, IAsyncDisposable
         private bool _disposed = false;
         private IHost _grpcHost;
 
-        public AspNetCoreGrpcServer(IScriptEventManager scriptEventManager, ILogger<AspNetCoreGrpcServer> logger)
+        public AspNetCoreGrpcServer(FunctionRpc.FunctionRpcBase service, IScriptEventManager scriptEventManager, ILogger<AspNetCoreGrpcServer> logger)
         {
             int port = WorkerUtilities.GetUnusedTcpPort();
-            _grpcHostBuilder = AspNetCoreGrpcHostBuilder.CreateHostBuilder(scriptEventManager, port);
+            _grpcHostBuilder = AspNetCoreGrpcHostBuilder.CreateHostBuilder(service, scriptEventManager, port);
             _logger = logger;
             Uri = new Uri($"http://{WorkerConstants.HostName}:{port}");
         }

src/WebJobs.Script.Grpc/Server/Startup.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
@@ -32,7 +33,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
             app.UseEndpoints(endpoints =>
             {
-                endpoints.MapGrpcService<FunctionRpcService>();
+                endpoints.MapGrpcService<FunctionRpc.FunctionRpcBase>();
             });
         }
     }