Making ExitCode not nullable, plus renaming command context parameter (#1061)

Author: sburmanoctopus

source/Octopus.Tentacle.Client/ScriptExecutor.cs

@@ -52,28 +52,28 @@ public async Task<ScriptOperationExecutionResult> StartScript(ExecuteScriptComma
             return await scriptExecutor.StartScript(executeScriptCommand, startScriptIsBeingReAttempted, cancellationToken);
         }
 
-        public async Task<ScriptOperationExecutionResult> GetStatus(CommandContext ticketForNextNextStatus, CancellationToken cancellationToken)
+        public async Task<ScriptOperationExecutionResult> GetStatus(CommandContext commandContext, CancellationToken cancellationToken)
         {
             var scriptExecutorFactory = CreateScriptExecutorFactory();
-            var scriptExecutor = scriptExecutorFactory.CreateScriptExecutor(ticketForNextNextStatus.ScripServiceVersionUsed);
+            var scriptExecutor = scriptExecutorFactory.CreateScriptExecutor(commandContext.ScripServiceVersionUsed);
 
-            return await scriptExecutor.GetStatus(ticketForNextNextStatus, cancellationToken);
+            return await scriptExecutor.GetStatus(commandContext, cancellationToken);
         }
 
-        public async Task<ScriptOperationExecutionResult> CancelScript(CommandContext ticketForNextNextStatus)
+        public async Task<ScriptOperationExecutionResult> CancelScript(CommandContext commandContext)
         {
             var scriptExecutorFactory = CreateScriptExecutorFactory();
-            var scriptExecutor = scriptExecutorFactory.CreateScriptExecutor(ticketForNextNextStatus.ScripServiceVersionUsed);
+            var scriptExecutor = scriptExecutorFactory.CreateScriptExecutor(commandContext.ScripServiceVersionUsed);
 
-            return await scriptExecutor.CancelScript(ticketForNextNextStatus);
+            return await scriptExecutor.CancelScript(commandContext);
         }
 
-        public async Task<ScriptStatus?> CompleteScript(CommandContext ticketForNextNextStatus, CancellationToken cancellationToken)
+        public async Task<ScriptStatus?> CompleteScript(CommandContext commandContext, CancellationToken cancellationToken)
         {
             var scriptExecutorFactory = CreateScriptExecutorFactory();
-            var scriptExecutor = scriptExecutorFactory.CreateScriptExecutor(ticketForNextNextStatus.ScripServiceVersionUsed);
+            var scriptExecutor = scriptExecutorFactory.CreateScriptExecutor(commandContext.ScripServiceVersionUsed);
 
-            return await scriptExecutor.CompleteScript(ticketForNextNextStatus, cancellationToken);
+            return await scriptExecutor.CompleteScript(commandContext, cancellationToken);
         }
 
         ScriptExecutorFactory CreateScriptExecutorFactory()

source/Octopus.Tentacle.Client/Scripts/KubernetesScriptServiceV1Executor.cs

@@ -153,11 +153,11 @@ async Task<KubernetesScriptStatusResponseV1> GetStatusAction(CancellationToken c
             return Map(kubernetesScriptStatusResponseV1);
         }
 
-        public async Task<ScriptOperationExecutionResult> CancelScript(CommandContext lastStatusResponse)
+        public async Task<ScriptOperationExecutionResult> CancelScript(CommandContext commandContext)
         {
             async Task<KubernetesScriptStatusResponseV1> CancelScriptAction(CancellationToken ct)
             {
-                var request = new CancelKubernetesScriptCommandV1(lastStatusResponse.ScriptTicket, lastStatusResponse.NextLogSequence);
+                var request = new CancelKubernetesScriptCommandV1(commandContext.ScriptTicket, commandContext.NextLogSequence);
                 var result = await clientKubernetesScriptServiceV1.CancelScriptAsync(request, new HalibutProxyRequestOptions(ct));
 
                 return result;

source/Octopus.Tentacle.Client/Scripts/ObservingScriptOrchestrator.cs

@@ -39,7 +39,7 @@ public async Task<ScriptExecutionResult> ExecuteScript(ExecuteScriptCommand comm
                 throw new OperationCanceledException("Script execution was cancelled");
             }
 
-            return new ScriptExecutionResult(scriptStatus.State, scriptStatus.ExitCode!.Value);
+            return new ScriptExecutionResult(scriptStatus.State, scriptStatus.ExitCode);
         }
 
         async Task<ScriptStatus> ObserveUntilCompleteThenFinish(

source/Octopus.Tentacle.Client/Scripts/ScriptOperationExecutionResult.cs

@@ -21,7 +21,7 @@ public ScriptOperationExecutionResult(ScriptStatus scriptStatus, CommandContext
         /// </summary>
         internal static ScriptOperationExecutionResult CreateScriptStartedResult(ScriptTicket scriptTicket, ScriptServiceVersion scripServiceVersionUsed)
         {
-            var scriptStatus = new ScriptStatus(ProcessState.Pending, null, new List<ProcessOutput>());
+            var scriptStatus = new ScriptStatus(ProcessState.Pending, 0, new List<ProcessOutput>());
             var contextForNextCommand = new CommandContext(scriptTicket, 0, scripServiceVersionUsed);
             return new(scriptStatus, contextForNextCommand);
         }

source/Octopus.Tentacle.Client/Scripts/ScriptServiceV1Executor.cs

@@ -106,13 +106,13 @@ public async Task<ScriptOperationExecutionResult> GetStatus(CommandContext comma
             return Map(scriptStatusResponseV1);
         }
 
-        public async Task<ScriptOperationExecutionResult> CancelScript(CommandContext lastStatusResponse)
+        public async Task<ScriptOperationExecutionResult> CancelScript(CommandContext commandContext)
         {
             var response = await rpcCallExecutor.ExecuteWithNoRetries(
                 RpcCall.Create<IScriptService>(nameof(IScriptService.CancelScript)),
                 async ct =>
                 {
-                    var request = new CancelScriptCommand(lastStatusResponse.ScriptTicket, lastStatusResponse.NextLogSequence);
+                    var request = new CancelScriptCommand(commandContext.ScriptTicket, commandContext.NextLogSequence);
                     var result = await clientScriptServiceV1.CancelScriptAsync(request, new HalibutProxyRequestOptions(ct));
 
                     return result;

source/Octopus.Tentacle.Client/Scripts/ScriptServiceV2Executor.cs

@@ -146,11 +146,11 @@ async Task<ScriptStatusResponseV2> GetStatusAction(CancellationToken ct)
             return Map(scriptStatusResponseV2);
         }
 
-        public async Task<ScriptOperationExecutionResult> CancelScript(CommandContext lastStatusResponse)
+        public async Task<ScriptOperationExecutionResult> CancelScript(CommandContext commandContext)
         {
             async Task<ScriptStatusResponseV2> CancelScriptAction(CancellationToken ct)
             {
-                var request = new CancelScriptCommandV2(lastStatusResponse.ScriptTicket, lastStatusResponse.NextLogSequence);
+                var request = new CancelScriptCommandV2(commandContext.ScriptTicket, commandContext.NextLogSequence);
                 var result = await clientScriptServiceV2.CancelScriptAsync(request, new HalibutProxyRequestOptions(ct));
 
                 return result;

source/Octopus.Tentacle.Contracts/ScriptStatus.cs

@@ -5,10 +5,10 @@ namespace Octopus.Tentacle.Contracts
     public class ScriptStatus
     {
         public ProcessState State { get; }
-        public int? ExitCode { get; }
+        public int ExitCode { get; }
         public List<ProcessOutput> Logs { get; }
 
-        public ScriptStatus(ProcessState state, int? exitCode, List<ProcessOutput> logs)
+        public ScriptStatus(ProcessState state, int exitCode, List<ProcessOutput> logs)
         {
             State = state;
             ExitCode = exitCode;