From 9dfdfaec29ef5fbf93ca0b2e5acc63cb18f9d474 Mon Sep 17 00:00:00 2001 From: NickJosevski Date: Fri, 22 Mar 2019 20:58:44 +1100 Subject: [PATCH 1/3] Adding IgnoreChannelRules onto release --- ...hePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt | 1 + ...licSurfaceAreaShouldNotRegress..NETFramework.approved.txt | 1 + source/Octopus.Client/Model/ReleaseResource.cs | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt index 45c4d6385..64d20bed2 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt @@ -3594,6 +3594,7 @@ Octopus.Client.Model .ctor(String, String) DateTimeOffset Assembled { get; set; } String ChannelId { get; set; } + Boolean IgnoreChannelRules { get; set; } List LibraryVariableSetSnapshotIds { get; set; } String ProjectDeploymentProcessSnapshotId { get; set; } String ProjectId { get; set; } diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt index 4d19f092d..c16321850 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt @@ -3610,6 +3610,7 @@ Octopus.Client.Model .ctor(String, String) DateTimeOffset Assembled { get; set; } String ChannelId { get; set; } + Boolean IgnoreChannelRules { get; set; } List LibraryVariableSetSnapshotIds { get; set; } String ProjectDeploymentProcessSnapshotId { get; set; } String ProjectId { get; set; } diff --git a/source/Octopus.Client/Model/ReleaseResource.cs b/source/Octopus.Client/Model/ReleaseResource.cs index 26e80a997..55c7cf987 100644 --- a/source/Octopus.Client/Model/ReleaseResource.cs +++ b/source/Octopus.Client/Model/ReleaseResource.cs @@ -48,5 +48,10 @@ public ReleaseResource(string version, string projectId) public string ProjectDeploymentProcessSnapshotId { get; set; } public List SelectedPackages { get; set; } public string SpaceId { get; set; } + + [Writeable] + [NotReadable] + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public bool IgnoreChannelRules { get; set; } } } \ No newline at end of file From da5570d6d9dc75bf082b2f7cafe8eba9d958c5b1 Mon Sep 17 00:00:00 2001 From: NickJosevski Date: Fri, 22 Mar 2019 21:50:21 +1100 Subject: [PATCH 2/3] Remove the edit overload that never worked --- ...ublicSurfaceAreaShouldNotRegress..NETCore.approved.txt | 2 -- ...SurfaceAreaShouldNotRegress..NETFramework.approved.txt | 2 -- .../Repositories/Async/ReleaseRepository.cs | 8 +------- source/Octopus.Client/Repositories/ReleaseRepository.cs | 6 ------ 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt index 64d20bed2..d9278dad7 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt @@ -5888,7 +5888,6 @@ Octopus.Client.Repositories Octopus.Client.Model.DeploymentPreviewResource GetPreview(Octopus.Client.Model.DeploymentPromotionTarget) Octopus.Client.Model.LifecycleProgressionResource GetProgression(Octopus.Client.Model.ReleaseResource) Octopus.Client.Model.DeploymentTemplateResource GetTemplate(Octopus.Client.Model.ReleaseResource) - Octopus.Client.Model.ReleaseResource Modify(Octopus.Client.Model.ReleaseResource, Boolean) Octopus.Client.Model.ReleaseResource SnapshotVariables(Octopus.Client.Model.ReleaseResource) } interface IResourceRepository @@ -6468,7 +6467,6 @@ Octopus.Client.Repositories.Async Task GetPreview(Octopus.Client.Model.DeploymentPromotionTarget) Task GetProgression(Octopus.Client.Model.ReleaseResource) Task GetTemplate(Octopus.Client.Model.ReleaseResource) - Task Modify(Octopus.Client.Model.ReleaseResource, Boolean) Task SnapshotVariables(Octopus.Client.Model.ReleaseResource) } interface IResourceRepository diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt index c16321850..f64fb1b9c 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt @@ -5910,7 +5910,6 @@ Octopus.Client.Repositories Octopus.Client.Model.DeploymentPreviewResource GetPreview(Octopus.Client.Model.DeploymentPromotionTarget) Octopus.Client.Model.LifecycleProgressionResource GetProgression(Octopus.Client.Model.ReleaseResource) Octopus.Client.Model.DeploymentTemplateResource GetTemplate(Octopus.Client.Model.ReleaseResource) - Octopus.Client.Model.ReleaseResource Modify(Octopus.Client.Model.ReleaseResource, Boolean) Octopus.Client.Model.ReleaseResource SnapshotVariables(Octopus.Client.Model.ReleaseResource) } interface IResourceRepository @@ -6490,7 +6489,6 @@ Octopus.Client.Repositories.Async Task GetPreview(Octopus.Client.Model.DeploymentPromotionTarget) Task GetProgression(Octopus.Client.Model.ReleaseResource) Task GetTemplate(Octopus.Client.Model.ReleaseResource) - Task Modify(Octopus.Client.Model.ReleaseResource, Boolean) Task SnapshotVariables(Octopus.Client.Model.ReleaseResource) } interface IResourceRepository diff --git a/source/Octopus.Client/Repositories/Async/ReleaseRepository.cs b/source/Octopus.Client/Repositories/Async/ReleaseRepository.cs index 7a0d232ea..91e77711c 100644 --- a/source/Octopus.Client/Repositories/Async/ReleaseRepository.cs +++ b/source/Octopus.Client/Repositories/Async/ReleaseRepository.cs @@ -26,7 +26,6 @@ public interface IReleaseRepository : IGet, ICreate GetPreview(DeploymentPromotionTarget promotionTarget); Task SnapshotVariables(ReleaseResource release); Task Create(ReleaseResource resource, bool ignoreChannelRules = false); - Task Modify(ReleaseResource resource, bool ignoreChannelRules = false); Task GetProgression(ReleaseResource release); } @@ -67,12 +66,7 @@ public async Task Create(ReleaseResource resource, bool ignoreC { return await Client.Create(await Repository.Link(CollectionLinkName).ConfigureAwait(false), resource, new { ignoreChannelRules }).ConfigureAwait(false); } - - public Task Modify(ReleaseResource resource, bool ignoreChannelRules = false) - { - return Client.Update(resource.Links["Self"], resource, new { ignoreChannelRules }); - } - + public Task GetProgression(ReleaseResource release) { return Client.Get(release.Links["Progression"]); diff --git a/source/Octopus.Client/Repositories/ReleaseRepository.cs b/source/Octopus.Client/Repositories/ReleaseRepository.cs index 5b49ac845..aa746b4af 100644 --- a/source/Octopus.Client/Repositories/ReleaseRepository.cs +++ b/source/Octopus.Client/Repositories/ReleaseRepository.cs @@ -25,7 +25,6 @@ public interface IReleaseRepository : IGet, ICreate(release.Links["Progression"]); From 0f8c4f03b38f355987a73f7374d6c357f93c5928 Mon Sep 17 00:00:00 2001 From: NickJosevski Date: Mon, 25 Mar 2019 11:17:17 +1100 Subject: [PATCH 3/3] rebuild