Merge pull request #401 from OctopusDeploy/bug-3748

Adding IgnoreChannelRules onto release
OctopusDeploy · Mar 25, 2019 · b1ee23b · b1ee23b
2 parents 0c6c27b + 0f8c4f0
commit b1ee23b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 17 deletions.
diff --git a/...Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt b/...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<String> LibraryVariableSetSnapshotIds { get; set; }
     String ProjectDeploymentProcessSnapshotId { get; set; }
     String ProjectId { get; set; }
@@ -5887,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
@@ -6467,7 +6467,6 @@ Octopus.Client.Repositories.Async
     Task<DeploymentPreviewResource> GetPreview(Octopus.Client.Model.DeploymentPromotionTarget)
     Task<LifecycleProgressionResource> GetProgression(Octopus.Client.Model.ReleaseResource)
     Task<DeploymentTemplateResource> GetTemplate(Octopus.Client.Model.ReleaseResource)
-    Task<ReleaseResource> Modify(Octopus.Client.Model.ReleaseResource, Boolean)
     Task<ReleaseResource> SnapshotVariables(Octopus.Client.Model.ReleaseResource)
   }
   interface IResourceRepository

diff --git a/.../PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt b/.../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<String> LibraryVariableSetSnapshotIds { get; set; }
     String ProjectDeploymentProcessSnapshotId { get; set; }
     String ProjectId { get; set; }
@@ -5909,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
@@ -6489,7 +6489,6 @@ Octopus.Client.Repositories.Async
     Task<DeploymentPreviewResource> GetPreview(Octopus.Client.Model.DeploymentPromotionTarget)
     Task<LifecycleProgressionResource> GetProgression(Octopus.Client.Model.ReleaseResource)
     Task<DeploymentTemplateResource> GetTemplate(Octopus.Client.Model.ReleaseResource)
-    Task<ReleaseResource> Modify(Octopus.Client.Model.ReleaseResource, Boolean)
     Task<ReleaseResource> SnapshotVariables(Octopus.Client.Model.ReleaseResource)
   }
   interface IResourceRepository

diff --git 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<SelectedPackage> SelectedPackages { get; set; }
         public string SpaceId { get; set; }
+
+        [Writeable]
+        [NotReadable]
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public bool IgnoreChannelRules { get; set; }
     }
 }
diff --git a/source/Octopus.Client/Repositories/Async/ReleaseRepository.cs b/source/Octopus.Client/Repositories/Async/ReleaseRepository.cs
@@ -26,7 +26,6 @@ public interface IReleaseRepository : IGet<ReleaseResource>, ICreate<ReleaseReso
         Task<DeploymentPreviewResource> GetPreview(DeploymentPromotionTarget promotionTarget);
         Task<ReleaseResource> SnapshotVariables(ReleaseResource release);    
         Task<ReleaseResource> Create(ReleaseResource resource, bool ignoreChannelRules = false);
-        Task<ReleaseResource> Modify(ReleaseResource resource, bool ignoreChannelRules = false);
         Task<LifecycleProgressionResource> GetProgression(ReleaseResource release);
     }
 
@@ -67,12 +66,7 @@ public async Task<ReleaseResource> Create(ReleaseResource resource, bool ignoreC
         {
             return await Client.Create(await Repository.Link(CollectionLinkName).ConfigureAwait(false), resource, new { ignoreChannelRules }).ConfigureAwait(false);
         }
-
-        public Task<ReleaseResource> Modify(ReleaseResource resource, bool ignoreChannelRules = false)
-        {
-            return Client.Update(resource.Links["Self"], resource, new { ignoreChannelRules });
-        }
-
+
         public Task<LifecycleProgressionResource> GetProgression(ReleaseResource release)
         {
             return Client.Get<LifecycleProgressionResource>(release.Links["Progression"]);

diff --git a/source/Octopus.Client/Repositories/ReleaseRepository.cs b/source/Octopus.Client/Repositories/ReleaseRepository.cs
@@ -25,7 +25,6 @@ public interface IReleaseRepository : IGet<ReleaseResource>, ICreate<ReleaseReso
         DeploymentPreviewResource GetPreview(DeploymentPromotionTarget promotionTarget);
         ReleaseResource SnapshotVariables(ReleaseResource release);    
         ReleaseResource Create(ReleaseResource resource, bool ignoreChannelRules = false);
-        ReleaseResource Modify(ReleaseResource resource, bool ignoreChannelRules = false);
         LifecycleProgressionResource GetProgression(ReleaseResource release);
     }
 
@@ -67,11 +66,6 @@ public ReleaseResource Create(ReleaseResource resource, bool ignoreChannelRules
             return Client.Create(Repository.Link(CollectionLinkName), resource, new { ignoreChannelRules });
         }
 
-        public ReleaseResource Modify(ReleaseResource resource, bool ignoreChannelRules = false)
-        {
-            return Client.Update(resource.Links["Self"], resource, new { ignoreChannelRules });
-        }
-
         public LifecycleProgressionResource GetProgression(ReleaseResource release)
         {
             return Client.Get<LifecycleProgressionResource>(release.Links["Progression"]);