Update to match CLI v1 (#42)

* Update to match CLI v1

* Update generated code

Author: calebkiage

.azure-pipelines/release-cli.yaml

@@ -70,9 +70,9 @@ stages:
         condition: and(succeeded(), ne('${{ parameters.simulate }}', 'true'))
         steps:
         - task: UseDotNet@2
-          displayName: 'Use .NET 7'
+          displayName: 'Use .NET 8'
           inputs:
-            version: 7.x
+            version: 8.x
 
         # Restore NuGet packages (enables cache by default)
         - template: templates/nuget-packages.yaml
@@ -114,10 +114,10 @@ stages:
           # maxParallel: 2
         steps:
           - task: UseDotNet@2
-            displayName: 'Use .NET 7'
+            displayName: 'Use .NET 8'
             condition: and(succeeded(), ne('${{ parameters.simulate }}', 'true'))
             inputs:
-              version: 7.x
+              version: 8.x
 
           - ${{ if ne(parameters.simulate, 'true') }}:
             - template: templates/nuget-packages.yaml
@@ -179,9 +179,9 @@ stages:
         condition: and(succeeded(), ne('${{ parameters.simulate }}', 'true'))
         steps:
         - task: UseDotNet@2
-          displayName: 'Use .NET 7'
+          displayName: 'Use .NET 8'
           inputs:
-            version: 7.x
+            version: 8.x
 
         # Restore NuGet packages (enables cache by default)
         - template: templates/nuget-packages.yaml
@@ -410,10 +410,10 @@ stages:
 
           # Nuget tool doesn't work with multi-stage builds
           - task: UseDotNet@2
-            displayName: 'Use .NET 7'
-            condition: and(succeeded(), ne('${{ parameters.simulate }}', 'true'), eq(variables['IS_NUGET'], 'true'))
+            displayName: 'Use .NET 8'
+            condition: and(false, succeeded(), ne('${{ parameters.simulate }}', 'true'), eq(variables['IS_NUGET'], 'true'))
             inputs:
-              version: 7.x
+              version: 8.x
 
           - ${{ if ne(parameters.simulate, 'true') }}:
             - template: templates/nuget-packages.yaml
@@ -426,13 +426,13 @@ stages:
             inputs:
               projects: './src/msgraph-beta-cli.csproj'
               arguments: " --no-restore --configuration $(buildConfiguration) --no-incremental"
-            condition: and(succeeded(), ne('${{ parameters.simulate }}', 'true'), eq(variables['IS_NUGET'], 'true'))
+            condition: and(false, succeeded(), ne('${{ parameters.simulate }}', 'true'), eq(variables['IS_NUGET'], 'true'))
 
           - pwsh: |
               New-Item '$(ARTIFACTS_PATH)' -ItemType Directory -Force
               echo "Test file" > '$(ARTIFACTS_PATH)/mgc-beta.dll'
               echo "Test file2" > '$(ARTIFACTS_PATH)/mgc-beta.txt'
-            condition: and(succeeded(), eq('${{ parameters.simulate }}', 'true'), eq(variables['IS_NUGET'], 'true'))
+            condition: and(false, succeeded(), eq('${{ parameters.simulate }}', 'true'), eq(variables['IS_NUGET'], 'true'))
             displayName: Simulate nuget build
 
           - task: DownloadPipelineArtifact@2
@@ -448,7 +448,7 @@ stages:
               script: |
                 $path = '$(ARTIFACTS_PATH)'
                 if ('$(IS_NUGET)'.ToLower() -eq 'true' -and ('${{ parameters.simulate }}'.ToLower() -ne 'true')) {
-                  $path = './src/obj/$(buildConfiguration)/net7.0'
+                  $path = './src/obj/$(buildConfiguration)/net8.0'
                 }
                 Write-Verbose "Checking if $path has files"
                 $hasArtifacts = Test-Path $path/* -PathType Leaf
@@ -489,7 +489,7 @@ stages:
                 $destDir = '$(ARTIFACTS_PATH)-src'
                 $sourceDir = '$(ARTIFACTS_PATH)'
                 Expand-EsrpArtifacts -SourceDir $sourceDir -OutputDir $destDir -FileNameTemplate '$(fileNameTemplate)' -BranchOrTagName '$(branchOrTagName)' -RuntimeIdentifier '$(rid)' -PackageType $(packageType) -TarCompression $(compressionProgram) -Cleanup
-                Move-Item -Path $destDir -Destination $sourceDir -Verbose
+                Move-Item -Path $destDir -Destination $sourceDir
 
                 Move-NonExecutableItems -SourcePath $sourceDir -ExecutableItemNames mgc-beta,mgc-beta.exe
               verbosePreference: '$(OUTPUT_PREFERENCE)'
@@ -514,12 +514,12 @@ stages:
           - pwsh: |
               Write-Host "##vso[task.setvariable variable=ESRP_FILE_PATTERN]$(pattern)"
             displayName: Compute ESRP filter pattern Windows/Nuget
-            condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'True'), or(startsWith(variables['RUNTIME_ID'], 'win'), eq(variables['IS_NUGET'], 'true')))
+            condition: and(false, succeeded(), eq(variables['SHOULD_SIGN'], 'True'), or(startsWith(variables['RUNTIME_ID'], 'win'), eq(variables['IS_NUGET'], 'true')))
 
           # ESRP needs .NET 6
           - task: UseDotNet@2
             displayName: 'Change to .NET 6'
-            condition: and(succeeded(), ne('${{ parameters.simulate }}', 'true'), eq(variables['IS_NUGET'], 'true'))
+            condition: and(false, succeeded(), ne('${{ parameters.simulate }}', 'true'), eq(variables['IS_NUGET'], 'true'))
             inputs:
               version: 6.x
 
@@ -553,7 +553,7 @@ stages:
               dotnet pack ./src/msgraph-beta-cli.csproj --configuration $(buildConfiguration) --output $(SIGN_PATH) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg -v d
             workingDirectory: $(Build.SourcesDirectory)
             displayName: DotNet pack (nuget)
-            condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'True'), ne('${{ parameters.simulate }}', 'true'), eq(variables['Is_NUGET'], 'true'))
+            condition: and(false, succeeded(), eq(variables['SHOULD_SIGN'], 'True'), ne('${{ parameters.simulate }}', 'true'), eq(variables['IS_NUGET'], 'true'))
 
           - task: EsrpCodeSigning@2
             displayName: 'ESRP CodeSigning (Sign Nuget)'
@@ -566,12 +566,12 @@ stages:
               Pattern: "*.nupkg"
               inlineOperation: $(inlineNugetSignOperation)
               SessionTimeout: 20
-            condition: and(succeeded(), ne('${{ parameters.simulate }}', 'true'), eq(variables['SHOULD_SIGN'], 'True'), eq(variables['IS_NUGET'], 'true'))
+            condition: and(false, succeeded(), ne('${{ parameters.simulate }}', 'true'), eq(variables['SHOULD_SIGN'], 'True'), eq(variables['IS_NUGET'], 'true'))
 
           - pwsh: |
               $artifactsPath = '$(SIGN_PATH)'
               Write-Host "##vso[task.setvariable variable=WORKING_DIR]$artifactsPath"
-            condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'True'), eq(variables['IS_NUGET'], 'true'))
+            condition: and(false, succeeded(), eq(variables['SHOULD_SIGN'], 'True'), eq(variables['IS_NUGET'], 'true'))
 
           - task: PowerShell@2
             displayName: Simulate ESRP
@@ -691,7 +691,9 @@ stages:
         displayName: Deploy Nuget
         dependsOn: []
         environment: microsoftgraph-nuget-org
-        condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), eq('${{ parameters.forceNugetPublish }}', 'true')))
+        # Disable nuget deployment until performance is improved.
+        condition: false
+        # condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), eq('${{ parameters.forceNugetPublish }}', 'true')))
         strategy:
           runOnce:
             deploy:

.azure-pipelines/templates/prepare-unsigned-executable-darwin.yaml

@@ -23,7 +23,7 @@ parameters:
 steps:
   - pwsh: |
       Write-Host "##vso[task.setvariable variable=IS_ENABLED]${{ parameters.enabled }}"
-    displayName: Check prepare-unsigned-executable-darwin.yaml enabled
+    displayName: Check enabled
     condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'True'))
 
   - pwsh: |

Dockerfile

@@ -3,7 +3,7 @@
 #   2. Use the \\?\ prefix when specifying the path in the docker build command. e.g.
 #      docker build \\?\C:\path -f .\Dockerfile
 # See https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation
-FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build-env
 
 ARG MSGRAPH_NUGET_URL=https://nuget.pkg.github.com/microsoftgraph/index.json
 
@@ -16,7 +16,7 @@ WORKDIR /app/msgraph-beta-cli
 
 RUN dotnet publish -p:PublishSingleFile=false -p:PublishReadyToRun=true -p:PublishReadyToRunShowWarnings=true ./src/msgraph-beta-cli.csproj --configuration Release --no-self-contained --runtime linux-musl-x64 --output /app/output
 
-FROM mcr.microsoft.com/dotnet/runtime:7.0-alpine as runtime
+FROM mcr.microsoft.com/dotnet/runtime:8.0-alpine as runtime
 
 # Change this password by providing a different value when running the container
 ENV KEYRING_PASSWORD="password"

src/Program.cs

@@ -28,6 +28,8 @@
 using Microsoft.Kiota.Abstractions;
 using Microsoft.Kiota.Abstractions.Authentication;
 using Microsoft.Kiota.Cli.Commons.Extensions;
+using Microsoft.Kiota.Cli.Commons.Http;
+using Microsoft.Kiota.Cli.Commons.Http.Headers;
 using Microsoft.Kiota.Http.HttpClientLibrary;
 using Microsoft.Kiota.Serialization.Form;
 using Microsoft.Kiota.Serialization.Json;
@@ -42,10 +44,51 @@ class Program
 
         static async Task<int> Main(string[] args)
         {
-            Console.InputEncoding = Encoding.Unicode;
-            Console.OutputEncoding = Encoding.Unicode;
+            Console.InputEncoding = Encoding.UTF8;
+            Console.OutputEncoding = Encoding.UTF8;
+            // Replace `me ...` with `users ... --user-id me`
+            if (args.Length > 0 && args[0] == "me")
+            {
+                var hasHelp = Array.Exists(args, static x => x == "--help" || x == "-h" || x == "/?");
+                var newArgs = hasHelp ? args : new string[args.Length + 2];
+                newArgs[0] = "users";
+                for (var i = 1; i < args.Length; i++)
+                {
+                    newArgs[i] = args[i];
+                }
+                if (newArgs.Length > args.Length)
+                {
+                    newArgs[args.Length] = "--user-id";
+                    newArgs[args.Length + 1] = "me";
+                    args = newArgs;
+                }
+            }
+
             var builder = BuildCommandLine()
-                .UseDefaults()
+                .UseVersionOption()
+                .UseHelp()
+                .UseEnvironmentVariableDirective()
+                .UseParseDirective()
+                .UseSuggestDirective()
+                .RegisterWithDotnetSuggest()
+                .UseTypoCorrections()
+                .UseParseErrorReporting()
+                .CancelOnProcessTermination()
+                .UseExceptionHandler((ex, context) =>
+                {
+                    var message = GetExceptionMessage(ex);
+                    var exitCode = GetExceptionExitCode(ex);
+
+                    if (!string.IsNullOrEmpty(message))
+                    {
+                        Console.ResetColor();
+                        Console.ForegroundColor = ConsoleColor.Red;
+                        context.Console.Error.WriteLine(message);
+                        Console.ResetColor();
+                    }
+
+                    context.ExitCode = exitCode;
+                })
                 .UseHost(CreateHostBuilder)
                 .UseRequestAdapter(ic =>
                 {
@@ -58,7 +101,9 @@ static async Task<int> Main(string[] args)
                     }
                     adapter.BaseUrl = adapter.BaseUrl?.TrimEnd('/');
                     return adapter;
-                }).RegisterCommonServices();
+                })
+                .RegisterCommonServices()
+                .RegisterHeadersOption(() => InMemoryHeadersStore.Instance);
             builder.AddMiddleware(async (ic, next) =>
             {
                 var host = ic.GetHost();
@@ -69,46 +114,38 @@ static async Task<int> Main(string[] args)
                 ic.BindingContext.AddService(_ => host.Services.GetRequiredService<LogoutService>());
                 await next(ic);
             });
-            builder.UseExceptionHandler((ex, context) =>
+
+            try
+            {
+                var parser = builder.Build();
+                return await parser.InvokeAsync(args);
+            }
+            finally
             {
-                var message = ex switch
+                listener?.Dispose();
+            }
+        }
+
+        static string? GetExceptionMessage<E>(E ex) where E: Exception {
+            return ex switch
                 {
                     _ when ex is AuthenticationRequiredException => "Token acquisition failed. Run mgc-beta login command first to get an access token.",
                     _ when ex is TaskCanceledException => string.Empty,
                     ODataError _e when ex is ODataError => $"Error {_e.ResponseStatusCode}({_e.Error?.Code}) from API:\n  {_e.Error?.Message}",
                     ApiException _e when ex is ApiException => $"Error {_e.ResponseStatusCode} from API.",
+                    AuthenticationFailedException e => $"Authentication failed: {e.Message}",
+                    Identity.Client.MsalException e => $"Authentication failed: {e.Message}",
                     _ => ex.Message
                 };
+        }
 
-                var exitCode = ex switch
+        static int GetExceptionExitCode<E>(E ex) where E: Exception => ex switch
                 {
                     _ when ex is AuthenticationRequiredException => 1,
                     _ when ex is TaskCanceledException => 0,
                     _ => -1
                 };
 
-                if (!string.IsNullOrEmpty(message))
-                {
-                    Console.ResetColor();
-                    Console.ForegroundColor = ConsoleColor.Red;
-                    context.Console.Error.WriteLine(message);
-                    Console.ResetColor();
-                }
-
-                context.ExitCode = exitCode;
-            });
-
-            try
-            {
-                var parser = builder.Build();
-                return await parser.InvokeAsync(args);
-            }
-            finally
-            {
-                listener?.Dispose();
-            }
-        }
-
         static CommandLineBuilder BuildCommandLine()
         {
             var rootCommand = new GraphClient().BuildRootCommand();
@@ -120,7 +157,14 @@ static CommandLineBuilder BuildCommandLine()
             builder.AddMiddleware(async (ic, next) =>
             {
                 debugEnabled = ic.ParseResult.GetValueForOption<bool>(debugOption);
-                listener = AzureEventSourceListener.CreateConsoleLogger(debugEnabled ? EventLevel.LogAlways : EventLevel.Warning);
+                if (debugEnabled)
+                {
+                    listener = CreateStdErrLogger(EventLevel.LogAlways);
+                }
+                else
+                {
+                    listener = CreateStdErrLogger(EventLevel.Error);
+                }
                 await next(ic);
             });
 
@@ -152,7 +196,8 @@ static IHostBuilder CreateHostBuilder(string[] args) =>
                         GraphServiceLibraryClientVersion = $"{assemblyVersion?.Major ?? 0}.{assemblyVersion?.Minor ?? 0}.{assemblyVersion?.Build ?? 0}",
                         GraphServiceTargetVersion = "beta"
                     };
-                    return GraphCliClientFactory.GetDefaultClient(options, version: "beta", loggingHandler: p.GetRequiredService<LoggingHandler>());
+                    var headersHandler = new NativeHttpHeadersHandler(() => InMemoryHeadersStore.Instance, p.GetService<ILogger<NativeHttpHeadersHandler>>());
+                    return GraphCliClientFactory.GetDefaultClient(options, version: options.GraphServiceTargetVersion, loggingHandler: p.GetRequiredService<LoggingHandler>(), middlewares: new[] { headersHandler });
                 });
                 services.AddSingleton<IAuthenticationProvider>(p =>
                 {
@@ -193,6 +238,9 @@ static IHostBuilder CreateHostBuilder(string[] args) =>
             }).ConfigureLogging((ctx, logBuilder) =>
             {
                 logBuilder.SetMinimumLevel(LogLevel.Warning);
+                logBuilder.ClearProviders();
+                // Log everything to stderr.
+                logBuilder.AddConsole(c => c.LogToStandardErrorThreshold = LogLevel.Trace);
                 // Allow runtime selection of log level
                 logBuilder.AddFilter("Microsoft.Graph.Cli", level => level >= (debugEnabled ? LogLevel.Debug : LogLevel.Warning));
             });
@@ -209,5 +257,14 @@ static void ConfigureAppConfiguration(IConfigurationBuilder builder, string[] ar
             builder.AddJsonFile(authCache.GetAuthenticationCacheFilePath(), optional: true, reloadOnChange: true);
             builder.AddEnvironmentVariables(prefix: "MGC_");
         }
+
+        static AzureEventSourceListener CreateStdErrLogger(EventLevel level = EventLevel.Informational)
+        {
+            return new AzureEventSourceListener(delegate (EventWrittenEventArgs eventData, string text)
+            {
+                // By default, AzureEventSourceListener.CreateConsoleLogger logs to stdout. Use stderr instead.
+                Console.Error.WriteLine("[{1}] {0}: {2}", eventData.EventSource.Name, eventData.Level, text);
+            }, level);
+        }
     }
 }