Fix ssv2

OctopusDeploy · Jun 20, 2024 · 00b754a · 00b754a
1 parent 2af0d74
commit 00b754a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/source/Octopus.Tentacle.Client/Scripts/ObservingScriptOrchestrator.cs b/source/Octopus.Tentacle.Client/Scripts/ObservingScriptOrchestrator.cs
@@ -57,7 +57,6 @@ public async Task<ScriptExecutionResult> ExecuteScript(ExecuteScriptCommand comm
             var (lastStatusResponse, lastTicketForNextStatus) =  await ObserveUntilComplete(scriptStatus, ticketForNextStatus, scriptExecutionCancellationToken).ConfigureAwait(false);
 
             await onScriptCompleted(scriptExecutionCancellationToken).ConfigureAwait(false);
-
 
             lastStatusResponse = await structuredScriptOrchestrator.Finish(lastTicketForNextStatus, scriptExecutionCancellationToken).ConfigureAwait(false) ?? lastStatusResponse;
 

diff --git a/source/Octopus.Tentacle.Client/Scripts/ScriptServiceV2Orchestrator.cs b/source/Octopus.Tentacle.Client/Scripts/ScriptServiceV2Orchestrator.cs
@@ -161,7 +161,7 @@ async Task<ScriptStatusResponseV2> GetStatusAction(CancellationToken ct)
 
         public async Task<(ScriptStatus, ITicketForNextStatus)> Cancel(ITicketForNextStatus lastStatusResponse, CancellationToken scriptExecutionCancellationToken)
         {
-            return Map(await _GetStatus(lastStatusResponse, scriptExecutionCancellationToken)); 
+            return Map(await _Cancel(lastStatusResponse, scriptExecutionCancellationToken)); 
         }
 
         private async Task<ScriptStatusResponseV2> _Cancel(ITicketForNextStatus lastStatusResponse, CancellationToken scriptExecutionCancellationToken)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -57,7 +57,6 @@ public async Task<ScriptExecutionResult> ExecuteScript(ExecuteScriptCommand comm
		var (lastStatusResponse, lastTicketForNextStatus) = await ObserveUntilComplete(scriptStatus, ticketForNextStatus, scriptExecutionCancellationToken).ConfigureAwait(false);

		await onScriptCompleted(scriptExecutionCancellationToken).ConfigureAwait(false);


		lastStatusResponse = await structuredScriptOrchestrator.Finish(lastTicketForNextStatus, scriptExecutionCancellationToken).ConfigureAwait(false) ?? lastStatusResponse;

Expand Down