Returning correct exit code on failure

Author: bowencode

Core/Cosmos.DataTransfer.Core/Program.cs

@@ -41,7 +41,7 @@ public static async Task<int> Main(string[] args)
                     Sink = ctx.BindingContext.ParseResult.GetValueForOption(rootCommand.Options.ElementAt(1)) as string,
                     Settings = ctx.BindingContext.ParseResult.GetValueForOption(rootCommand.Options.ElementAt(2)) as FileInfo
                 };
-                await handler.InvokeAsync(ctx);
+                ctx.ExitCode = await handler.InvokeAsync(ctx);
             }
         });
 

Core/Cosmos.DataTransfer.Core/RunCommand.cs

@@ -101,6 +101,7 @@ public async Task<int> InvokeAsync(InvocationContext context)
                     var sinkConfig = GetSinkConfig(combinedConfig);
                     var operationConfigs = combinedConfig.GetSection("Operations");
                     var operations = operationConfigs?.GetChildren().ToList();
+                    bool succeeded = true;
                     if (operations?.Any() == true)
                     {
                         foreach (var operationConfig in operations)
@@ -117,19 +118,19 @@ public async Task<int> InvokeAsync(InvocationContext context)
                             {
                                 sinkBuilder.AddConfiguration(operationSink);
                             }
-                            await ExecuteDataTransferOperation(source,
-                                sourceBuilder.Build(),
-                                sink,
-                                sinkBuilder.Build(),
-                                cancellationToken);
+                            succeeded &= await ExecuteDataTransferOperation(source,
+                                      sourceBuilder.Build(),
+                                      sink,
+                                      sinkBuilder.Build(),
+                                      cancellationToken);
                         }
                     }
                     else
                     {
-                        await ExecuteDataTransferOperation(source, sourceConfig, sink, sinkConfig, cancellationToken);
+                        succeeded = await ExecuteDataTransferOperation(source, sourceConfig, sink, sinkConfig, cancellationToken);
                     }
 
-                    return 0;
+                    return succeeded ? 0 : 1;
                 }
                 catch (OperationCanceledException ex)
                 {
@@ -158,7 +159,7 @@ private static IConfigurationSection GetSinkConfig(IConfiguration combinedConfig
                 return config;
             }
 
-            private async Task ExecuteDataTransferOperation(IDataSourceExtension source, IConfiguration sourceConfig, IDataSinkExtension sink, IConfiguration sinkConfig, CancellationToken cancellationToken)
+            private async Task<bool> ExecuteDataTransferOperation(IDataSourceExtension source, IConfiguration sourceConfig, IDataSinkExtension sink, IConfiguration sinkConfig, CancellationToken cancellationToken)
             {
                 _logger.LogDebug("Loaded {SettingCount} settings for source {SourceName}:\n\t\t{SettingList}",
                     sourceConfig.AsEnumerable().Count(),
@@ -178,14 +179,12 @@ private async Task ExecuteDataTransferOperation(IDataSourceExtension source, ICo
                     await sink.WriteAsync(data, sinkConfig, source, _loggerFactory.CreateLogger(sink.GetType().Name), cancellationToken);
 
                     _logger.LogInformation("Data transfer complete");
+                    return true;
                 }
                 catch (Exception ex)
                 {
                     _logger.LogError(ex, "Data transfer failed");
-                    if (ex is OperationCanceledException)
-                    {
-                        throw;
-                    }
+                    return false;
                 }
             }