From ba2cb799eaf3d8f993b01e3d6af965fb64c586be Mon Sep 17 00:00:00 2001 From: Andrew Best Date: Fri, 26 Jun 2020 10:36:32 +0930 Subject: [PATCH] Ensures runbook run commands inspect for server version >= 2020.3.1 (#535) --- .../Repositories/Async/RunbookRepository.cs | 8 ++++++-- source/Octopus.Client/Repositories/RunbookRepository.cs | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/source/Octopus.Client/Repositories/Async/RunbookRepository.cs b/source/Octopus.Client/Repositories/Async/RunbookRepository.cs index 45347410b..21c14eac0 100644 --- a/source/Octopus.Client/Repositories/Async/RunbookRepository.cs +++ b/source/Octopus.Client/Repositories/Async/RunbookRepository.cs @@ -26,7 +26,7 @@ public RunbookRepository(IOctopusAsyncRepository repository) : base(repository, "Runbooks") { integrationTestVersion = SemanticVersion.Parse("0.0.0-local"); - versionAfterWhichRunbookRunParametersAreAvailable = SemanticVersion.Parse("2020.2.99999"); + versionAfterWhichRunbookRunParametersAreAvailable = SemanticVersion.Parse("2020.3.1"); } public Task FindByName(ProjectResource project, string name) @@ -58,7 +58,11 @@ private bool ServerSupportsRunbookRunParameters(string version) { var serverVersion = SemanticVersion.Parse(version); - return serverVersion >= versionAfterWhichRunbookRunParametersAreAvailable || + // Note: We want to ensure the server version is >= *any* 2020.3.1, including all pre-releases to consider what may be rolled out to Octopus Cloud. + var preReleaseAgnosticServerVersion = + new SemanticVersion(serverVersion.Major, serverVersion.Minor, serverVersion.Patch); + + return preReleaseAgnosticServerVersion >= versionAfterWhichRunbookRunParametersAreAvailable || serverVersion == integrationTestVersion; } diff --git a/source/Octopus.Client/Repositories/RunbookRepository.cs b/source/Octopus.Client/Repositories/RunbookRepository.cs index c0d8d4211..4941fed43 100644 --- a/source/Octopus.Client/Repositories/RunbookRepository.cs +++ b/source/Octopus.Client/Repositories/RunbookRepository.cs @@ -25,7 +25,7 @@ public RunbookRepository(IOctopusRepository repository) : base(repository, "Runbooks") { integrationTestVersion = SemanticVersion.Parse("0.0.0-local"); - versionAfterWhichRunbookRunParametersAreAvailable = SemanticVersion.Parse("2020.2.99999"); + versionAfterWhichRunbookRunParametersAreAvailable = SemanticVersion.Parse("2020.3.1"); } public RunbookResource FindByName(ProjectResource project, string name) @@ -57,7 +57,11 @@ private bool ServerSupportsRunbookRunParameters(string version) { var serverVersion = SemanticVersion.Parse(version); - return serverVersion >= versionAfterWhichRunbookRunParametersAreAvailable || + // Note: We want to ensure the server version is >= *any* 2020.3.1, including all pre-releases to consider what may be rolled out to Octopus Cloud. + var preReleaseAgnosticServerVersion = + new SemanticVersion(serverVersion.Major, serverVersion.Minor, serverVersion.Patch); + + return preReleaseAgnosticServerVersion >= versionAfterWhichRunbookRunParametersAreAvailable || serverVersion == integrationTestVersion; }