Updating FunctionsNetHost to handle the new "functions-" prefix cmdline args. (#1901)

* Adding support for new "functions-" prefixed arguments.

* update global.json to use net8 rc1

* PR feedback fixes
 - Removed fallback code using old arguments.
 - Validating the URL value passed in for "functions-uri" and throwing a more meaningful message when it is not valid.

Author: kshyju

host/src/FunctionsNetHost/Grpc/GrpcClient.cs

@@ -33,7 +33,7 @@ internal GrpcClient(GrpcWorkerStartupOptions grpcWorkerStartupOptions, AppLoader
 
         internal async Task InitAsync()
         {
-            var endpoint = $"http://{_grpcWorkerStartupOptions.Host}:{_grpcWorkerStartupOptions.Port}";
+            var endpoint = _grpcWorkerStartupOptions.ServerUri.AbsoluteUri;
             Logger.LogTrace($"Grpc service endpoint:{endpoint}");
 
             var functionRpcClient = CreateFunctionRpcClient(endpoint);

host/src/FunctionsNetHost/Grpc/GrpcWorkerStartupOptions.cs

@@ -5,9 +5,7 @@ namespace FunctionsNetHost.Grpc
 {
     internal sealed class GrpcWorkerStartupOptions
     {
-        public string? Host { get; set; }
-
-        public int Port { get; set; }
+        public Uri ServerUri { get; set; }
 
         public string? WorkerId { get; set; }
 

host/src/FunctionsNetHost/Program.cs

@@ -16,7 +16,6 @@ static async Task Main(string[] args)
 
                 var workerStartupOptions = await GetStartupOptionsFromCmdLineArgs(args);
 
-
                 using var appLoader = new AppLoader();
                 var grpcClient = new GrpcClient(workerStartupOptions, appLoader);
 
@@ -30,30 +29,36 @@ static async Task Main(string[] args)
 
         private static async Task<GrpcWorkerStartupOptions> GetStartupOptionsFromCmdLineArgs(string[] args)
         {
-            var hostOption = new Option<string>("--host");
-            var portOption = new Option<int>("--port");
-            var workerOption = new Option<string>("--workerId");
-            var grpcMsgLengthOption = new Option<int>("--grpcMaxMessageLength");
-            var requestIdOption = new Option<string>("--requestId");
+            var uriOption = new Option<string>("--functions-uri") { IsRequired = true };
+            var requestIdOption = new Option<string>("--functions-request-id") { IsRequired = true };
+            var workerIdOption = new Option<string>("--functions-worker-id") { IsRequired = true };
+            var grpcMaxMessageLengthOption = new Option<int>("--functions-grpc-max-message-length") { IsRequired = true };
+
+            var rootCommand = new RootCommand
+            {
+                TreatUnmatchedTokensAsErrors = false
+            };
 
-            var rootCommand = new RootCommand();
-            rootCommand.AddOption(portOption);
-            rootCommand.AddOption(hostOption);
-            rootCommand.AddOption(workerOption);
-            rootCommand.AddOption(grpcMsgLengthOption);
+            rootCommand.AddOption(uriOption);
             rootCommand.AddOption(requestIdOption);
+            rootCommand.AddOption(workerIdOption);
+            rootCommand.AddOption(grpcMaxMessageLengthOption);
 
             var workerStartupOptions = new GrpcWorkerStartupOptions();
 
-            rootCommand.SetHandler((host, port, workerId, grpcMsgLength, requestId) =>
+            rootCommand.SetHandler((context) =>
             {
-                workerStartupOptions.Host = host;
-                workerStartupOptions.Port = port;
-                workerStartupOptions.WorkerId = workerId;
-                workerStartupOptions.GrpcMaxMessageLength = grpcMsgLength;
-                workerStartupOptions.RequestId = requestId;
-            },
-                hostOption, portOption, workerOption, grpcMsgLengthOption, requestIdOption);
+                var uriString = context.ParseResult.GetValueForOption(uriOption);
+                if (!Uri.TryCreate(uriString, UriKind.Absolute, out var endpointUri))
+                {
+                    throw new UriFormatException($"'{uriString}' is not a valid value for argument '{uriOption.Name}'. Value should be a valid URL.");
+                }
+
+                workerStartupOptions.ServerUri = endpointUri;
+                workerStartupOptions.GrpcMaxMessageLength = context.ParseResult.GetValueForOption(grpcMaxMessageLengthOption);
+                workerStartupOptions.RequestId = context.ParseResult.GetValueForOption(requestIdOption);
+                workerStartupOptions.WorkerId = context.ParseResult.GetValueForOption(workerIdOption);
+            });
 
             Logger.LogTrace($"raw args:{string.Join(" ", args)}");
 

host/src/FunctionsNetHost/global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100-preview.6.23330.14",
+    "version": "8.0.100-rc.1.23455.8",
     "allowPrerelease": true,
     "rollForward": "latestMinor"
   }