Merge pull request #767 from OctopusDeploy/sast/consolidate-rpc-retry…

…-health-check-settings Consolidate the 2 Health Check RPC Retry settings
OctopusDeploy · Sep 26, 2023 · b3bd3b5 · b3bd3b5
2 parents 602d632 + 4268310
commit b3bd3b5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/...Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt b/...Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt
@@ -3780,9 +3780,8 @@ Octopus.Client.Model
   {
     .ctor()
     Boolean Enabled { get; set; }
-    TimeSpan HealthyMachineHealthCheckRetryDuration { get; set; }
+    TimeSpan HealthCheckRetryDuration { get; set; }
     TimeSpan RetryDuration { get; set; }
-    TimeSpan UnHealthyMachineHealthCheckRetryDuration { get; set; }
   }
   class MachineScriptPolicy
   {

diff --git a/.../PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt b/.../PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt
@@ -3797,9 +3797,8 @@ Octopus.Client.Model
   {
     .ctor()
     Boolean Enabled { get; set; }
-    TimeSpan HealthyMachineHealthCheckRetryDuration { get; set; }
+    TimeSpan HealthCheckRetryDuration { get; set; }
     TimeSpan RetryDuration { get; set; }
-    TimeSpan UnHealthyMachineHealthCheckRetryDuration { get; set; }
   }
   class MachineScriptPolicy
   {

diff --git a/source/Octopus.Server.Client/Model/MachineRpcCallRetryPolicy.cs b/source/Octopus.Server.Client/Model/MachineRpcCallRetryPolicy.cs
@@ -6,6 +6,5 @@ public class MachineRpcCallRetryPolicy
 {
     public bool Enabled { get; set; } = true;
     public TimeSpan RetryDuration { get; set; } = TimeSpan.FromMinutes(2.5);
-    public TimeSpan HealthyMachineHealthCheckRetryDuration { get; set; } = TimeSpan.FromMinutes(2.5);
-    public TimeSpan UnHealthyMachineHealthCheckRetryDuration { get; set; } = TimeSpan.FromMinutes(2.5);
+    public TimeSpan HealthCheckRetryDuration { get; set; } = TimeSpan.FromMinutes(2.5);
 }