Catch and Log when V1 complete script throws (#1166)

* Catch and Log when V1 complete script throws

* .

Author: LukeButters

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

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Halibut;
 using Halibut.ServiceModel;
 using Octopus.Tentacle.Client.EventDriven;
 using Octopus.Tentacle.Client.Execution;
@@ -165,21 +166,31 @@ public async Task<ScriptOperationExecutionResult> CancelScript(CommandContext co
 
         public async Task<ScriptStatus?> CompleteScript(CommandContext lastStatusResponse, CancellationToken scriptExecutionCancellationToken)
         {
-            using var activity = TentacleClient.ActivitySource.StartActivity($"{nameof(ScriptServiceV1Executor)}.{nameof(CompleteScript)}");
-            var response = await rpcCallExecutor.ExecuteWithNoRetries(
-                RpcCall.Create<IScriptService>(nameof(IScriptService.CompleteScript)),
-                async ct =>
-                {
-                    var request = new CompleteScriptCommand(lastStatusResponse.ScriptTicket, lastStatusResponse.NextLogSequence);
-                    var result = await clientScriptServiceV1.CompleteScriptAsync(request, new HalibutProxyRequestOptions(ct));
-
-                    return result;
-                },
-                logger,
-                clientOperationMetricsBuilder,
-                CancellationToken.None).ConfigureAwait(false);
+            try
+            {
+                using var activity = TentacleClient.ActivitySource.StartActivity($"{nameof(ScriptServiceV1Executor)}.{nameof(CompleteScript)}");
+                var response = await rpcCallExecutor.ExecuteWithNoRetries(
+                    RpcCall.Create<IScriptService>(nameof(IScriptService.CompleteScript)),
+                    async ct =>
+                    {
+                        var request = new CompleteScriptCommand(lastStatusResponse.ScriptTicket, lastStatusResponse.NextLogSequence);
+                        var result = await clientScriptServiceV1.CompleteScriptAsync(request, new HalibutProxyRequestOptions(ct));
+
+                        return result;
+                    },
+                    logger,
+                    clientOperationMetricsBuilder,
+                    CancellationToken.None).ConfigureAwait(false);
+
+                return MapToScriptStatus(response);
+            }
+            catch (Exception ex) when (ex is HalibutClientException or OperationCanceledException)
+            {
+                logger.Warn("Failed to cleanup the script working directory on Tentacle");
+                logger.Verbose(ex);
+            }
 
-            return MapToScriptStatus(response);
+            return null;
         }
     }
 }

source/Octopus.Tentacle.Tests.Integration/ClientScriptExecutionScriptServiceV1IsNotRetried.cs

@@ -235,11 +235,7 @@ public async Task WhenANetworkFailureOccurs_DuringCompleteScript_WithATentacleTh
             var startScriptCommand = new TestExecuteShellScriptCommandBuilder().SetScriptBody(new ScriptBuilder().Print("hello")).Build();
 
             var logs = new List<ProcessOutput>();
-            var executeScriptTask = clientTentacle.TentacleClient.ExecuteScript(startScriptCommand, logs, CancellationToken);
-
-            var expectedException = new ExceptionContractAssertionBuilder(FailureScenario.ConnectionFaulted, tentacleConfigurationTestCase.TentacleType, clientTentacle).Build();
-
-            await AssertionExtensions.Should(async () => await executeScriptTask).ThrowExceptionContractAsync(expectedException);
+            await clientTentacle.TentacleClient.ExecuteScript(startScriptCommand, logs, CancellationToken);
 
             // We Can not verify what will be in the logs because of race conditions in tentacle.
             // The last complete script which we fail might come back with the logs.