Merge pull request #13 from microsoftgraph/chore/update_system_commandline

Chore/update system commandline

Author: calebkiage

msgraph-cli-core

@@ -4,8 +4,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Graph.Cli.Core.Authentication;
-using Microsoft.Graph.Cli.Commands.Authentication;
-using Microsoft.Graph.Cli.Configuration;
+using Microsoft.Graph.Cli.Core.Commands.Authentication;
+using Microsoft.Graph.Cli.Core.Configuration;
 using Microsoft.Graph.Cli.Core.IO;
 using Microsoft.Graph.Cli.Core.Utils;
 using Microsoft.Kiota.Authentication.Azure;
@@ -21,6 +21,7 @@
 using System.Net.Http;
 using System.Reflection;
 using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace Microsoft.Graph.Cli
 {
@@ -65,24 +66,32 @@ static async Task<int> Main(string[] args)
             using var httpClient = KiotaClientFactory.Create(finalHandler);
             var core = new HttpClientRequestAdapter(authProvider, httpClient: httpClient);
             var client = new GraphClient(core);
-            var builder = BuildCommandLine(client);
+            var rootCommand = client.BuildCommand();
+            rootCommand.Description = "Microsoft Graph CLI";
 
+            var commands = new List<Command>();
             var loginCommand = new LoginCommand(authServiceFactory);
-            builder.AddCommand(loginCommand.Build());
+            commands.Add(loginCommand.Build());
 
             var logoutCommand = new LogoutCommand(new LogoutService());
-            builder.AddCommand(logoutCommand.Build());
+            commands.Add(logoutCommand.Build());
+
+            var builder = BuildCommandLine(client, commands);
 
             var parser = builder.UseHost(CreateHostBuilder).UseDefaults().Build();
 
             return await parser.InvokeAsync(args);
         }
 
-        static CommandLineBuilder BuildCommandLine(GraphClient client)
+        static CommandLineBuilder BuildCommandLine(GraphClient client, IEnumerable<Command> commands)
         {
             var rootCommand = client.BuildCommand();
             rootCommand.Description = "Microsoft Graph CLI";
 
+            foreach (var command in commands) {
+                rootCommand.AddCommand(command);
+            }
+
             return new CommandLineBuilder(rootCommand);
         }
 

src/Commands/Authentication/LoginCommand.cs

@@ -27,15 +27,17 @@ public Command BuildGetCommand() {
             var command = new Command("get");
             command.Description = "Get admin";
             // Create options for all the parameters
-            var selectOption = new Option<string[]>("--select", description: "Select properties to be returned");
+            var selectOption = new Option<string[]>("--select", description: "Select properties to be returned") {
+                Arity = ArgumentArity.ZeroOrMore
+            };
             selectOption.IsRequired = false;
-            selectOption.Arity = ArgumentArity.ZeroOrMore;
             command.AddOption(selectOption);
-            var expandOption = new Option<string[]>("--expand", description: "Expand related entities");
+            var expandOption = new Option<string[]>("--expand", description: "Expand related entities") {
+                Arity = ArgumentArity.ZeroOrMore
+            };
             expandOption.IsRequired = false;
-            expandOption.Arity = ArgumentArity.ZeroOrMore;
             command.AddOption(expandOption);
-            command.Handler = CommandHandler.Create<string[], string[]>(async (select, expand) => {
+            command.SetHandler(async (string[] select, string[] expand) => {
                 var requestInfo = CreateGetRequestInformation(q => {
                     q.Select = select;
                     q.Expand = expand;
@@ -48,7 +50,7 @@ public Command BuildGetCommand() {
                 using var reader = new StreamReader(content);
                 var strContent = await reader.ReadToEndAsync();
                 Console.Write(strContent + "\n");
-            });
+            }, selectOption, expandOption);
             return command;
         }
         /// <summary>
@@ -58,10 +60,11 @@ public Command BuildPatchCommand() {
             var command = new Command("patch");
             command.Description = "Update admin";
             // Create options for all the parameters
-            var bodyOption = new Option<string>("--body");
+            var bodyOption = new Option<string>("--body") {
+            };
             bodyOption.IsRequired = true;
             command.AddOption(bodyOption);
-            command.Handler = CommandHandler.Create<string>(async (body) => {
+            command.SetHandler(async (string body) => {
                 using var stream = new MemoryStream(Encoding.UTF8.GetBytes(body));
                 var parseNode = ParseNodeFactoryRegistry.DefaultInstance.GetRootParseNode("application/json", stream);
                 var model = parseNode.GetObjectValue<ApiSdk.Models.Microsoft.Graph.Admin>();
@@ -70,7 +73,7 @@ public Command BuildPatchCommand() {
                 await RequestAdapter.SendNoContentAsync(requestInfo);
                 // Print request output. What if the request has no return?
                 Console.WriteLine("Success");
-            });
+            }, bodyOption);
             return command;
         }
         public Command BuildServiceAnnouncementCommand() {
@@ -105,7 +108,7 @@ public AdminRequestBuilder(Dictionary<string, object> pathParameters, IRequestAd
         /// </summary>
         public RequestInformation CreateGetRequestInformation(Action<GetQueryParameters> q = default, Action<IDictionary<string, string>> h = default, IEnumerable<IRequestOption> o = default) {
             var requestInfo = new RequestInformation {
-                HttpMethod = HttpMethod.GET,
+                HttpMethod = Method.GET,
                 UrlTemplate = UrlTemplate,
                 PathParameters = PathParameters,
             };
@@ -127,7 +130,7 @@ public RequestInformation CreateGetRequestInformation(Action<GetQueryParameters>
         public RequestInformation CreatePatchRequestInformation(ApiSdk.Models.Microsoft.Graph.Admin body, Action<IDictionary<string, string>> h = default, IEnumerable<IRequestOption> o = default) {
             _ = body ?? throw new ArgumentNullException(nameof(body));
             var requestInfo = new RequestInformation {
-                HttpMethod = HttpMethod.PATCH,
+                HttpMethod = Method.PATCH,
                 UrlTemplate = UrlTemplate,
                 PathParameters = PathParameters,
             };

src/Commands/Authentication/LogoutCommand.cs

@@ -37,10 +37,11 @@ public Command BuildCreateCommand() {
             var command = new Command("create");
             command.Description = "A collection of service health information for tenant. This property is a contained navigation property, it is nullable and readonly.";
             // Create options for all the parameters
-            var bodyOption = new Option<string>("--body");
+            var bodyOption = new Option<string>("--body") {
+            };
             bodyOption.IsRequired = true;
             command.AddOption(bodyOption);
-            command.Handler = CommandHandler.Create<string>(async (body) => {
+            command.SetHandler(async (string body) => {
                 using var stream = new MemoryStream(Encoding.UTF8.GetBytes(body));
                 var parseNode = ParseNodeFactoryRegistry.DefaultInstance.GetRootParseNode("application/json", stream);
                 var model = parseNode.GetObjectValue<ServiceHealth>();
@@ -54,7 +55,7 @@ public Command BuildCreateCommand() {
                 using var reader = new StreamReader(content);
                 var strContent = await reader.ReadToEndAsync();
                 Console.Write(strContent + "\n");
-            });
+            }, bodyOption);
             return command;
         }
         /// <summary>
@@ -64,34 +65,42 @@ public Command BuildListCommand() {
             var command = new Command("list");
             command.Description = "A collection of service health information for tenant. This property is a contained navigation property, it is nullable and readonly.";
             // Create options for all the parameters
-            var topOption = new Option<int?>("--top", description: "Show only the first n items");
+            var topOption = new Option<int?>("--top", description: "Show only the first n items") {
+            };
             topOption.IsRequired = false;
             command.AddOption(topOption);
-            var skipOption = new Option<int?>("--skip", description: "Skip the first n items");
+            var skipOption = new Option<int?>("--skip", description: "Skip the first n items") {
+            };
             skipOption.IsRequired = false;
             command.AddOption(skipOption);
-            var searchOption = new Option<string>("--search", description: "Search items by search phrases");
+            var searchOption = new Option<string>("--search", description: "Search items by search phrases") {
+            };
             searchOption.IsRequired = false;
             command.AddOption(searchOption);
-            var filterOption = new Option<string>("--filter", description: "Filter items by property values");
+            var filterOption = new Option<string>("--filter", description: "Filter items by property values") {
+            };
             filterOption.IsRequired = false;
             command.AddOption(filterOption);
-            var countOption = new Option<bool?>("--count", description: "Include count of items");
+            var countOption = new Option<bool?>("--count", description: "Include count of items") {
+            };
             countOption.IsRequired = false;
             command.AddOption(countOption);
-            var orderbyOption = new Option<string[]>("--orderby", description: "Order items by property values");
+            var orderbyOption = new Option<string[]>("--orderby", description: "Order items by property values") {
+                Arity = ArgumentArity.ZeroOrMore
+            };
             orderbyOption.IsRequired = false;
-            orderbyOption.Arity = ArgumentArity.ZeroOrMore;
             command.AddOption(orderbyOption);
-            var selectOption = new Option<string[]>("--select", description: "Select properties to be returned");
+            var selectOption = new Option<string[]>("--select", description: "Select properties to be returned") {
+                Arity = ArgumentArity.ZeroOrMore
+            };
             selectOption.IsRequired = false;
-            selectOption.Arity = ArgumentArity.ZeroOrMore;
             command.AddOption(selectOption);
-            var expandOption = new Option<string[]>("--expand", description: "Expand related entities");
+            var expandOption = new Option<string[]>("--expand", description: "Expand related entities") {
+                Arity = ArgumentArity.ZeroOrMore
+            };
             expandOption.IsRequired = false;
-            expandOption.Arity = ArgumentArity.ZeroOrMore;
             command.AddOption(expandOption);
-            command.Handler = CommandHandler.Create<int?, int?, string, string, bool?, string[], string[], string[]>(async (top, skip, search, filter, count, orderby, select, expand) => {
+            command.SetHandler(async (int? top, int? skip, string search, string filter, bool? count, string[] orderby, string[] select, string[] expand) => {
                 var requestInfo = CreateGetRequestInformation(q => {
                     q.Top = top;
                     q.Skip = skip;
@@ -110,7 +119,7 @@ public Command BuildListCommand() {
                 using var reader = new StreamReader(content);
                 var strContent = await reader.ReadToEndAsync();
                 Console.Write(strContent + "\n");
-            });
+            }, topOption, skipOption, searchOption, filterOption, countOption, orderbyOption, selectOption, expandOption);
             return command;
         }
         /// <summary>
@@ -134,7 +143,7 @@ public HealthOverviewsRequestBuilder(Dictionary<string, object> pathParameters,
         /// </summary>
         public RequestInformation CreateGetRequestInformation(Action<GetQueryParameters> q = default, Action<IDictionary<string, string>> h = default, IEnumerable<IRequestOption> o = default) {
             var requestInfo = new RequestInformation {
-                HttpMethod = HttpMethod.GET,
+                HttpMethod = Method.GET,
                 UrlTemplate = UrlTemplate,
                 PathParameters = PathParameters,
             };
@@ -156,7 +165,7 @@ public RequestInformation CreateGetRequestInformation(Action<GetQueryParameters>
         public RequestInformation CreatePostRequestInformation(ServiceHealth body, Action<IDictionary<string, string>> h = default, IEnumerable<IRequestOption> o = default) {
             _ = body ?? throw new ArgumentNullException(nameof(body));
             var requestInfo = new RequestInformation {
-                HttpMethod = HttpMethod.POST,
+                HttpMethod = Method.POST,
                 UrlTemplate = UrlTemplate,
                 PathParameters = PathParameters,
             };