From 1c766ad9ca0808f27afb53683924b53637287394 Mon Sep 17 00:00:00 2001 From: Kartik Gupta Date: Mon, 17 May 2021 17:50:28 +1000 Subject: [PATCH 1/3] Add GetDeploymentProcess to Beta Projects --- .nuke/build.schema.json | 2 -- ...ePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt | 1 + ...icSurfaceAreaShouldNotRegress..NETFramework.approved.txt | 1 + .../Octopus.Client/Repositories/Async/ProjectRepository.cs | 6 ++++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json index b2ea781ca..7c0859e49 100644 --- a/.nuke/build.schema.json +++ b/.nuke/build.schema.json @@ -68,7 +68,6 @@ "Clean", "Compile", "CopyToLocalPackages", - "Default", "Merge", "PackClientNuget", "Restore", @@ -86,7 +85,6 @@ "Clean", "Compile", "CopyToLocalPackages", - "Default", "Merge", "PackClientNuget", "Restore", diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt index 876af160b..477ecf27b 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt @@ -7787,6 +7787,7 @@ Octopus.Client.Repositories.Async interface IProjectBetaRepository { Task ConvertToVersionControlled(Octopus.Client.Model.ProjectResource, Octopus.Client.Model.VersionControlSettingsResource, String) + Task GetDeploymentProcess(Octopus.Client.Model.ProjectResource) Task GetVersionControlledBranch(Octopus.Client.Model.ProjectResource, String) Task> GetVersionControlledBranches(Octopus.Client.Model.ProjectResource) } diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt index fb11a0611..f61d3a69b 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt @@ -7813,6 +7813,7 @@ Octopus.Client.Repositories.Async interface IProjectBetaRepository { Task ConvertToVersionControlled(Octopus.Client.Model.ProjectResource, Octopus.Client.Model.VersionControlSettingsResource, String) + Task GetDeploymentProcess(Octopus.Client.Model.ProjectResource) Task GetVersionControlledBranch(Octopus.Client.Model.ProjectResource, String) Task> GetVersionControlledBranches(Octopus.Client.Model.ProjectResource) } diff --git a/source/Octopus.Client/Repositories/Async/ProjectRepository.cs b/source/Octopus.Client/Repositories/Async/ProjectRepository.cs index 5b35c38d4..15dceabf9 100644 --- a/source/Octopus.Client/Repositories/Async/ProjectRepository.cs +++ b/source/Octopus.Client/Repositories/Async/ProjectRepository.cs @@ -130,6 +130,7 @@ public interface IProjectBetaRepository Task> GetVersionControlledBranches(ProjectResource projectResource); Task GetVersionControlledBranch(ProjectResource projectResource, string branch); Task ConvertToVersionControlled(ProjectResource project, VersionControlSettingsResource versionControlSettings, string commitMessage); + Task GetDeploymentProcess(ProjectResource project); } class ProjectBetaRepository : IProjectBetaRepository @@ -164,5 +165,10 @@ public async Task ConvertToVersionCon var response = await client.Post(url, payload); return response; } + + public Task GetDeploymentProcess(ProjectResource projectResource) + { + return client.Get(projectResource.Link("DeploymentProcess")); + } } } \ No newline at end of file From 32f9fffb2cd6175783f27daf524dc12a924dcbb7 Mon Sep 17 00:00:00 2001 From: Kartik Gupta Date: Mon, 17 May 2021 18:11:58 +1000 Subject: [PATCH 2/3] Extend BetaProjects to be able Update VCS Deployment Process --- ...ceAreaShouldNotRegress..NETCore.approved.txt | 7 +++++++ ...aShouldNotRegress..NETFramework.approved.txt | 7 +++++++ ...VersionControlledDeploymentProcessCommand.cs | 13 +++++++++++++ .../Repositories/Async/ProjectRepository.cs | 17 ++++++++++++++++- 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 source/Octopus.Client/Model/VersionControl/UpdateVersionControlledDeploymentProcessCommand.cs diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt index 477ecf27b..194f164f9 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt @@ -6493,6 +6493,12 @@ Octopus.Client.Model.VersionControl { .ctor() } + class UpdateVersionControlledDeploymentProcessCommand + { + .ctor() + String CommitMessage { get; set; } + Octopus.Client.Model.DeploymentProcessResource Resource { get; set; } + } class VersionControlReferenceResource { .ctor() @@ -7790,6 +7796,7 @@ Octopus.Client.Repositories.Async Task GetDeploymentProcess(Octopus.Client.Model.ProjectResource) Task GetVersionControlledBranch(Octopus.Client.Model.ProjectResource, String) Task> GetVersionControlledBranches(Octopus.Client.Model.ProjectResource) + Task UpdateDeploymentProcess(Octopus.Client.Model.ProjectResource, Octopus.Client.Model.DeploymentProcessResource, String) } interface IProjectGroupRepository Octopus.Client.Repositories.Async.IFindByName diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt index f61d3a69b..d3894adca 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt @@ -6518,6 +6518,12 @@ Octopus.Client.Model.VersionControl { .ctor() } + class UpdateVersionControlledDeploymentProcessCommand + { + .ctor() + String CommitMessage { get; set; } + Octopus.Client.Model.DeploymentProcessResource Resource { get; set; } + } class VersionControlReferenceResource { .ctor() @@ -7816,6 +7822,7 @@ Octopus.Client.Repositories.Async Task GetDeploymentProcess(Octopus.Client.Model.ProjectResource) Task GetVersionControlledBranch(Octopus.Client.Model.ProjectResource, String) Task> GetVersionControlledBranches(Octopus.Client.Model.ProjectResource) + Task UpdateDeploymentProcess(Octopus.Client.Model.ProjectResource, Octopus.Client.Model.DeploymentProcessResource, String) } interface IProjectGroupRepository Octopus.Client.Repositories.Async.IFindByName diff --git a/source/Octopus.Client/Model/VersionControl/UpdateVersionControlledDeploymentProcessCommand.cs b/source/Octopus.Client/Model/VersionControl/UpdateVersionControlledDeploymentProcessCommand.cs new file mode 100644 index 000000000..3fc0e1e51 --- /dev/null +++ b/source/Octopus.Client/Model/VersionControl/UpdateVersionControlledDeploymentProcessCommand.cs @@ -0,0 +1,13 @@ +using System.ComponentModel.DataAnnotations; + +namespace Octopus.Client.Model.VersionControl +{ + public class UpdateVersionControlledDeploymentProcessCommand + { + [Required] + public string CommitMessage { get; set; } + + [Required] + public DeploymentProcessResource Resource { get; set; } + } +} \ No newline at end of file diff --git a/source/Octopus.Client/Repositories/Async/ProjectRepository.cs b/source/Octopus.Client/Repositories/Async/ProjectRepository.cs index 15dceabf9..2ddc6d958 100644 --- a/source/Octopus.Client/Repositories/Async/ProjectRepository.cs +++ b/source/Octopus.Client/Repositories/Async/ProjectRepository.cs @@ -1,4 +1,3 @@ -using System; using System.IO; using System.Collections.Generic; using System.Threading.Tasks; @@ -131,6 +130,8 @@ public interface IProjectBetaRepository Task GetVersionControlledBranch(ProjectResource projectResource, string branch); Task ConvertToVersionControlled(ProjectResource project, VersionControlSettingsResource versionControlSettings, string commitMessage); Task GetDeploymentProcess(ProjectResource project); + Task UpdateDeploymentProcess(ProjectResource projectResource, + DeploymentProcessResource deploymentProcessResource, string commitMessage); } class ProjectBetaRepository : IProjectBetaRepository @@ -170,5 +171,19 @@ public Task GetDeploymentProcess(ProjectResource proj { return client.Get(projectResource.Link("DeploymentProcess")); } + + public async Task UpdateDeploymentProcess(ProjectResource projectResource, DeploymentProcessResource deploymentProcessResource, + string commitMessage) + { + var payload = new UpdateVersionControlledDeploymentProcessCommand + { + Resource = deploymentProcessResource, + CommitMessage = commitMessage + }; + + var url = projectResource.Link("DeploymentProcess"); + var response = await client.Post(url, payload); + return response; + } } } \ No newline at end of file From be37895415a6159b57437ee579393868227e2e92 Mon Sep 17 00:00:00 2001 From: Kartik Gupta Date: Mon, 17 May 2021 20:18:57 +1000 Subject: [PATCH 3/3] Revert unintended changes to the build schema --- .nuke/build.schema.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json index 7c0859e49..b2ea781ca 100644 --- a/.nuke/build.schema.json +++ b/.nuke/build.schema.json @@ -68,6 +68,7 @@ "Clean", "Compile", "CopyToLocalPackages", + "Default", "Merge", "PackClientNuget", "Restore", @@ -85,6 +86,7 @@ "Clean", "Compile", "CopyToLocalPackages", + "Default", "Merge", "PackClientNuget", "Restore",