Update argument parsing and make namespace name consistent (#12)

Author: daxian-dbw

src/Azure.Functions.PowerShell.Worker.Messaging/FunctionMessagingClient.cs

@@ -10,7 +10,7 @@
 using Grpc.Core;
 using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
 
-namespace Azure.Functions.PowerShell.Worker.Messaging
+namespace Microsoft.Azure.Functions.PowerShellWorker.Messaging
 {
     public class FunctionMessagingClient : IDisposable
     {

src/Azure.Functions.PowerShell.Worker/Azure.Functions.PowerShell.Worker.csproj

@@ -11,8 +11,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
-    <PackageReference Include="Microsoft.PowerShell.SDK" Version="6.0.4" />
+    <PackageReference Include="Microsoft.PowerShell.SDK" Version="6.1.0-rc.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="CommandLineParser" Version="2.3.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Azure.Functions.PowerShell.Worker/StartupArguments.cs

@@ -5,7 +5,7 @@
 
 using System;
 
-using Azure.Functions.PowerShell.Worker.Messaging;
+using Microsoft.Azure.Functions.PowerShellWorker.Messaging;
 using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
 using Microsoft.Extensions.Logging;
 

src/Azure.Functions.PowerShell.Worker/Utility/RpcLogger.cs

@@ -5,9 +5,11 @@
 
 using System;
 using System.Threading.Tasks;
+using System.Management.Automation;
 using System.Management.Automation.Runspaces;
 
-using Azure.Functions.PowerShell.Worker.Messaging;
+using CommandLine;
+using Microsoft.Azure.Functions.PowerShellWorker.Messaging;
 using Microsoft.Azure.Functions.PowerShellWorker.PowerShell.Host;
 using Microsoft.Azure.Functions.PowerShellWorker.Requests;
 using Microsoft.Azure.Functions.PowerShellWorker.Utility;
@@ -29,12 +31,17 @@ static void InitPowerShell()
 
             s_runspace = RunspaceFactory.CreateRunspace(host);
             s_runspace.Open();
-            s_ps = System.Management.Automation.PowerShell.Create(InitialSessionState.CreateDefault());
+            s_ps = System.Management.Automation.PowerShell.Create();
             s_ps.Runspace = s_runspace;
 
-            s_ps.AddScript("$PSHOME");
-            //s_ps.AddCommand("Set-ExecutionPolicy").AddParameter("ExecutionPolicy", ExecutionPolicy.Unrestricted).AddParameter("Scope", ExecutionPolicyScope.Process);
-            s_ps.Invoke<string>();
+            if (Platform.IsWindows)
+            {
+                s_ps.AddCommand("Set-ExecutionPolicy")
+                    .AddParameter("ExecutionPolicy", "Unrestricted")
+                    .AddParameter("Scope", "Process")
+                    .Invoke();
+                s_ps.Commands.Clear();
+            }
 
             // Add HttpResponseContext namespace so users can reference
             // HttpResponseContext without needing to specify the full namespace
@@ -44,21 +51,23 @@ static void InitPowerShell()
 
         public async static Task Main(string[] args)
         {
-            StartupArguments startupArguments = StartupArguments.Parse(args);
+            WorkerArguments arguments = null;
+            Parser.Default.ParseArguments<WorkerArguments>(args)
+                .WithParsed(ops => arguments = ops)
+                .WithNotParsed(err => Environment.Exit(1));
 
             // Initialize Rpc client, logger, and PowerShell
-            s_client = new FunctionMessagingClient(startupArguments.Host, startupArguments.Port);
+            s_client = new FunctionMessagingClient(arguments.Host, arguments.Port);
             s_logger = new RpcLogger(s_client);
             InitPowerShell();
 
             // Send StartStream message
             var streamingMessage = new StreamingMessage() {
-                RequestId = startupArguments.RequestId,
-                StartStream = new StartStream() { WorkerId = startupArguments.WorkerId }
+                RequestId = arguments.RequestId,
+                StartStream = new StartStream() { WorkerId = arguments.WorkerId }
             };
 
             await s_client.WriteAsync(streamingMessage);
-
             await ProcessEvent();
         }
 
@@ -105,4 +114,22 @@ static async Task ProcessEvent()
             }
         }
     }
-}
+
+    internal class WorkerArguments
+    {
+        [Option("host", Required = true, HelpText = "IP Address used to connect to the Host via gRPC.")]
+        public string Host { get; set; }
+
+        [Option("port", Required = true, HelpText = "Port used to connect to the Host via gRPC.")]
+        public int Port { get; set; }
+
+        [Option("workerId", Required = true, HelpText = "Worker ID assigned to this language worker.")]
+        public string WorkerId { get; set; }
+
+        [Option("requestId", Required = true, HelpText = "Request ID used for gRPC communication with the Host.")]
+        public string RequestId { get; set; }
+
+        [Option("grpcMaxMessageLength", Required = true, HelpText = "gRPC Maximum message size.")]
+        public int MaxMessageLength { get; set; }
+    }
+}