Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ private static async Task ExceptionMiddleware(
{
context.ExitCode = ExitCodes.Error;

await context.BindingContext.GetRequiredService<IAnsiConsole>().Error.WriteLineAsync(message);
context.BindingContext.GetRequiredService<IAnsiConsole>().MarkupLine(message);
}
catch (Exception ex) when (ex is OperationCanceledException or TaskCanceledException)
{
}
catch (Exception exception)
{
context.ExitCode = ExitCodes.Error;
await context.BindingContext.GetRequiredService<IAnsiConsole>().Error.WriteLineAsync(exception.Message);
context.BindingContext.GetRequiredService<IAnsiConsole>().WriteLine(exception.Message);
throw;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ async Task PublishClient(StatusContext? ctx)
break;

case IClientVersionPublishFailed { Errors: var clientErrors }:
console.Error.WriteLine("Client publish failed");
console.WriteLine("Client publish failed");
console.PrintErrorsAndExit(clientErrors);
stopSignal.OnNext(Unit.Default);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ async Task ValidateClient(StatusContext? ctx)
switch (x.Data?.OnClientVersionValidationUpdate)
{
case IClientVersionValidationFailed { Errors: var schemaErrors }:
console.Error.WriteLine("The client is invalid:");
console.WriteLine("The client is invalid:");
console.PrintErrorsAndExit(schemaErrors);
stopSignal.OnNext(Unit.Default);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ await ComposeAsync(
}
else
{
console.Error.WriteLine($"❌ The path `{sourceSchemaPath}` does not exist.");
console.WriteLine($"❌ The path `{sourceSchemaPath}` does not exist.");
return 1;
}
}
Expand Down Expand Up @@ -369,7 +369,7 @@ await ComposeAsync(
}
catch (Exception ex) when (ex is not OperationCanceledException)
{
console.Error.WriteLine($"❌ Error during recomposition: {ex.Message}");
console.WriteLine($"❌ Error during recomposition: {ex.Message}");
}
finally
{
Expand Down Expand Up @@ -416,7 +416,7 @@ private static async Task<int> ComposeAsync(
compositionSettings,
cancellationToken);

var writer = result.IsSuccess ? console.Out : console.Error;
var writer = console.Out;

WriteCompositionLog(
compositionLog,
Expand All @@ -432,7 +432,7 @@ private static async Task<int> ComposeAsync(
{
foreach (var error in result.Errors)
{
console.Error.WriteLine(error.Message);
console.WriteLine(error.Message);
}

return 1;
Expand All @@ -446,7 +446,7 @@ private static async Task<int> ComposeAsync(
}
catch (Exception e)
{
console.Error.WriteLine(e.Message);
console.WriteLine(e.Message);
return 1;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ await FusionPublishHelpers.UploadFusionArchiveAsync(
}
catch (Exception exception)
{
console.Error.WriteLine(exception.Message);
console.WriteLine(exception.Message);

if (!string.IsNullOrEmpty(requestId))
{
Expand Down Expand Up @@ -445,7 +445,7 @@ await FusionPublishHelpers.ReleaseDeploymentSlot(
}
catch (Exception exception)
{
console.Error.WriteLine(exception.Message);
console.WriteLine(exception.Message);

if (!string.IsNullOrEmpty(requestId))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -342,18 +342,16 @@ public static async Task<bool> ComposeAsync(
compositionSettings,
cancellationToken);

var writer = new AnsiStreamWriter(result.IsSuccess ? console.Out : console.Error);

FusionComposeCommand.WriteCompositionLog(
compositionLog,
writer,
new AnsiStreamWriter(Console.Out),
Comment thread
glen-84 marked this conversation as resolved.
false);

if (result.IsFailure)
{
foreach (var error in result.Errors)
{
console.Error.WriteLine(error.Message);
console.WriteLine(error.Message);
}

return false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ async Task ValidateSchemaAsync(StatusContext? ctx, Stream schemaStream)
switch (x.Data?.OnSchemaVersionValidationUpdate)
{
case ISchemaVersionValidationFailed { Errors: var schemaErrors }:
console.Error.WriteLine("The schema is invalid:");
console.WriteLine("The schema is invalid:");
console.PrintErrorsAndExit(schemaErrors);
stopSignal.OnNext(Unit.Default);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ async Task<int> ValidateAsync(StatusContext? ctx)
return ExitCodes.Success;
}

console.Error.WriteLine("The validation failed:");
console.WriteLine("The validation failed:");
if (failed is not null)
{
console.PrintErrorsAndExit(failed.Errors);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ async Task PublishSchema(StatusContext? ctx)
break;

case ISchemaVersionPublishFailed { Errors: var schemaErrors }:
console.Error.WriteLine("Schema publish failed");
console.WriteLine("Schema publish failed");
console.PrintErrorsAndExit(schemaErrors);
stopSignal.OnNext(Unit.Default);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ async Task ValidateSchema(StatusContext? ctx)
switch (x.Data?.OnSchemaVersionValidationUpdate)
{
case ISchemaVersionValidationFailed { Errors: var schemaErrors }:
console.Error.WriteLine("The schema is invalid:");
console.WriteLine("The schema is invalid:");
console.PrintErrorsAndExit(schemaErrors);
stopSignal.OnNext(Unit.Default);
break;
Expand Down
40 changes: 20 additions & 20 deletions src/Nitro/CommandLine/src/CommandLine/Helpers/ConsoleHelpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public static void EnsureNoErrors<T>(
if (result.Errors is { Count: > 0 })
{
var firstError = result.Errors[0];
console.Error.WriteLine($"{firstError.Message} ({firstError.Code})");
console.WriteLine($"{firstError.Message} ({firstError.Code})");

throw new ExitException();
}
Expand All @@ -23,7 +23,7 @@ public static T EnsureData<T>(this IAnsiConsole console, IOperationResult<T> res
{
if (result.Data is null)
{
console.Error.WriteLine($"{Errors.BA00001Message} ({Errors.BA00001})");
console.WriteLine($"{Errors.BA00001Message} ({Errors.BA00001})");

throw new ExitException();
}
Expand Down Expand Up @@ -91,8 +91,8 @@ private static void PrintError(
this IAnsiConsole console,
IStagesHavePublishedDependenciesError error)
{
console.Error.WriteLine(error.Message);
console.Error.WriteLine();
console.WriteLine(error.Message);
console.WriteLine();

foreach (var stage in error.Stages)
{
Expand Down Expand Up @@ -121,7 +121,7 @@ private static void PrintError(this IAnsiConsole console, IPersistedQueryValidat
console.WarningLine(
$"There were errors on client {error.Client?.Name.AsHighlight()} [dim](ID: {error.Client?.Id})[/]");

console.Error.WriteLine(error.Message);
console.WriteLine(error.Message);

var node = new Tree("");
foreach (var query in error.Queries)
Expand Down Expand Up @@ -153,10 +153,10 @@ private static void PrintError(
this IAnsiConsole console,
IInvalidGraphQLSchemaError error)
{
console.Error.ErrorLine(
console.ErrorLine(
"The schema you are trying to publish is invalid. Please fix the following errors:");

console.Error.WriteLine(error.Message);
console.WriteLine(error.Message);

var node = new Tree("");
foreach (var query in error.Errors)
Expand All @@ -173,27 +173,27 @@ private static void PrintMutationError(this IAnsiConsole ansiConsole, object err
switch (error)
{
case IOperationsAreNotAllowedError err:
ansiConsole.Error.WriteLine(err.Message);
ansiConsole.WriteLine(err.Message);
break;

case IConcurrentOperationError err:
ansiConsole.Error.WriteLine(err.Message);
ansiConsole.WriteLine(err.Message);
break;

case IUnexpectedProcessingError err:
ansiConsole.Error.WriteLine(err.Message);
ansiConsole.WriteLine(err.Message);
break;

case IProcessingTimeoutError err:
ansiConsole.Error.WriteLine(err.Message);
ansiConsole.WriteLine(err.Message);
break;

case ISchemaVersionChangeViolationError err:
ansiConsole.PrintError(err);
break;

case ISchemaVersionSyntaxError err:
ansiConsole.Error.WriteLine(err.Message);
ansiConsole.WriteLine(err.Message);
break;

case IPersistedQueryValidationError err:
Expand All @@ -205,23 +205,23 @@ private static void PrintMutationError(this IAnsiConsole ansiConsole, object err
break;

case IApiNotFoundError err:
ansiConsole.Error.WriteLine(err.Message);
ansiConsole.WriteLine(err.Message);
break;

case IMockSchemaNonUniqueNameError err:
ansiConsole.Error.WriteLine(err.Message);
ansiConsole.WriteLine(err.Message);
break;

case IMockSchemaNotFoundError err:
ansiConsole.Error.WriteLine(err.Message);
ansiConsole.WriteLine(err.Message);
break;

case IStageNotFoundError err:
ansiConsole.Error.WriteLine(err.Message);
ansiConsole.WriteLine(err.Message);
break;

case ISubgraphInvalidError err:
ansiConsole.Error.WriteLine(err.Message);
ansiConsole.WriteLine(err.Message);
break;

case IInvalidGraphQLSchemaError err:
Expand All @@ -233,19 +233,19 @@ private static void PrintMutationError(this IAnsiConsole ansiConsole, object err
break;

case IInvalidFusionSourceSchemaArchiveError err:
ansiConsole.Error.WriteLine(
ansiConsole.WriteLine(
"The server received an invalid archive. "
+ "This indicates a bug in the tooling. "
+ "Please notify ChilliCream."
+ "Error received: " + err.Message);
break;

case IError err:
ansiConsole.Error.WriteLine(err.Message);
ansiConsole.WriteLine(err.Message);
break;

default:
ansiConsole.Error.WriteLine("Unexpected Error");
ansiConsole.WriteLine("Unexpected Error");
break;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ private void FormatObjectResult(ObjectResult objectResult)

var serializedObj = JsonSerializer.Serialize(obj, obj.GetType(), JsonSourceGenerationContext.Default);

console.Write(new JsonText(serializedObj));
console.Write(serializedObj);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ private static async Task Middleware(
{
var resultHolder = context.BindingContext.GetRequiredService<ResultHolder>();
var formatters = context.BindingContext.GetServices<IResultFormatter>();
var format = context.ParseResult.GetValueForOption(Opt<OutputFormatOption>.Instance);
var format =
context.ParseResult.FindResultFor(Opt<OutputFormatOption>.Instance)?.GetValueOrDefault<OutputFormat>();
var isInteractive = format is null;
var extendedConsole =
context.BindingContext.GetRequiredService<IAnsiConsole>() as IExtendedConsole ??
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ public async Task Compose_FromNonExistentFiles()
Assert.Equal(1, exitCode);
Assert.Matches(
"^❌ Source schema file '[^']*non-existent-1.graphqls' does not exist.$",
testConsole.Error.ToString()!.ReplaceLineEndings("\n"));
testConsole.Out.ToString()!.ReplaceLineEndings("\n"));
}

[Fact]
Expand Down Expand Up @@ -370,7 +370,7 @@ public async Task Compose_InvalidExample2_FromWorkingDirectory_ToStdOutWithWarni

// assert
Assert.Equal(1, exitCode);
testConsole.Error.ToString()!.ReplaceLineEndings("\n").MatchSnapshot();
testConsole.Out.ToString()!.ReplaceLineEndings("\n").MatchSnapshot();
}

[Fact]
Expand Down
Loading