From c3320af3458bc6181cee9fa48c23ba6e9534ef9f Mon Sep 17 00:00:00 2001
From: "nicolas.rafalowski" <nicolas.rafalowski@ecb.co.il>
Date: Wed, 28 Dec 2016 09:25:23 +0200
Subject: [PATCH] Added the option to build with parameters - currently only
 supporting default values

---
 .../Managers/JenkinsDataLoader.cs             |   5 ++--
 .../Managers/JenkinsJobManager.cs             |  26 ++++++++++++++++++
 .../Devkoes.JenkinsManager.Model.csproj       |   3 ++
 .../Schema/JenkinsDefaultParameterValue.cs    |  10 +++++++
 .../Schema/JenkinsJob.cs                      |  22 +++++++++++++++
 .../Schema/JenkinsParameterDefinition.cs      |  14 ++++++++++
 .../Schema/JenkinsProperty.cs                 |  12 ++++++++
 .../Devkoes.JenkinsManager.UI.csproj          |   3 ++
 .../Resources/BuildWithParameters.png         | Bin 0 -> 505 bytes
 .../ViewModels/JenkinsManagerViewModel.cs     |  16 +++++++++++
 .../Views/JenkinsManager.xaml                 |   9 ++++++
 11 files changed, 118 insertions(+), 2 deletions(-)
 create mode 100644 Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Schema/JenkinsDefaultParameterValue.cs
 create mode 100644 Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Schema/JenkinsParameterDefinition.cs
 create mode 100644 Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Schema/JenkinsProperty.cs
 create mode 100644 Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.UI/Resources/BuildWithParameters.png

diff --git a/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.APIHandler/Managers/JenkinsDataLoader.cs b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.APIHandler/Managers/JenkinsDataLoader.cs
index 641b4ab..e66a72c 100644
--- a/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.APIHandler/Managers/JenkinsDataLoader.cs
+++ b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.APIHandler/Managers/JenkinsDataLoader.cs
@@ -14,8 +14,9 @@ public static class JenkinsDataLoader
         private const short MAX_JOB_BUILDS = 5;
 
         private const string VIEW_QUERY = "api/json?pretty=true&tree=views[name,url]";
-        private const string JOBS_QUERY_WITH_RANGE = "api/json?pretty=true&tree=jobs[name,url,inQueue,buildable,builds[number,result,building,estimatedDuration,timestamp]{0,5},queueItem[why,id]]";
-        private const string JOBS_QUERY = "api/json?pretty=true&tree=jobs[name,url,inQueue,buildable,builds[number,result,building,estimatedDuration,timestamp],queueItem[why,id]]";
+        private const string JOBS_QUERY_BASE = "api/json?pretty=true&tree=jobs[name,url,inQueue,buildable,queueItem[why,id],property[parameterDefinitions[name,defaultParameterValue[value]]],builds[number,result,building,estimatedDuration,timestamp]";
+        private const string JOBS_QUERY_WITH_RANGE = JOBS_QUERY_BASE + "{0,5}]";
+        private const string JOBS_QUERY = JOBS_QUERY_BASE + "]";
 
         public static async Task<IEnumerable<JenkinsView>> GetViews(JenkinsServer server)
         {
diff --git a/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.APIHandler/Managers/JenkinsJobManager.cs b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.APIHandler/Managers/JenkinsJobManager.cs
index eb3b4f6..db8cf69 100644
--- a/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.APIHandler/Managers/JenkinsJobManager.cs
+++ b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.APIHandler/Managers/JenkinsJobManager.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Specialized;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 
@@ -50,6 +51,25 @@ public async static Task ScheduleJob(string jobUrl, string jenkinsServerUrl)
             }
         }
 
+        public static async Task BuildJobWithDefaultParameters(JenkinsJob job, string jenkinsServerUrl)
+        {
+            using (var client = JenkinsDataLoader.CreateJenkinsWebClient(jenkinsServerUrl))
+            {
+                Uri buildUri = CreateBuildWithParametersUri(job.Url);
+                var parametersNameValueCollection = new NameValueCollection();
+                job.Property.Aggregate(parametersNameValueCollection, (collection, property) =>
+                {
+                    if (property.ParameterDefinitions != null && property.ParameterDefinitions.Any())
+                    {
+                        property.ParameterDefinitions.ToList().ForEach(pd => collection.Add(pd.Name, pd.DefaultParameterValue.Value));
+                    }
+                    return collection;
+                });
+                parametersNameValueCollection.Add("delay", "0sec");
+                byte[] response = await client.UploadValuesTaskAsync(buildUri, parametersNameValueCollection);
+            }
+        }
+
         public async static Task DequeueJob(JenkinsQueueItem queueItem, string jenkinsServerUrl)
         {
             if (queueItem == null)
@@ -110,5 +130,11 @@ private static Uri CreateLatestLogUri(string jobUrl)
             var jobUri = new Uri(jobUrl);
             return new Uri(jobUri, "lastBuild/consoleText");
         }
+
+        private static Uri CreateBuildWithParametersUri(string jobUrl)
+        {
+            var joubUri = new Uri(jobUrl);
+            return new Uri(joubUri, "buildWithParameters");
+        }
     }
 }
diff --git a/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Devkoes.JenkinsManager.Model.csproj b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Devkoes.JenkinsManager.Model.csproj
index 84824c8..69df983 100644
--- a/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Devkoes.JenkinsManager.Model.csproj
+++ b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Devkoes.JenkinsManager.Model.csproj
@@ -60,7 +60,10 @@
     <Compile Include="Contract\IVisualStudioWindowHandler.cs" />
     <Compile Include="Schema\JenkinsBuild.cs" />
     <Compile Include="Schema\JenkinsBuildresultConverter.cs" />
+    <Compile Include="Schema\JenkinsDefaultParameterValue.cs" />
     <Compile Include="Schema\JenkinsOverview.cs" />
+    <Compile Include="Schema\JenkinsParameterDefinition.cs" />
+    <Compile Include="Schema\JenkinsProperty.cs" />
     <Compile Include="Schema\JenkinsQueueItem.cs" />
     <Compile Include="Schema\JenkinsServer.cs" />
     <Compile Include="Schema\JenkinsServerList.cs" />
diff --git a/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Schema/JenkinsDefaultParameterValue.cs b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Schema/JenkinsDefaultParameterValue.cs
new file mode 100644
index 0000000..ee63394
--- /dev/null
+++ b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Schema/JenkinsDefaultParameterValue.cs
@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+
+namespace Devkoes.JenkinsManager.Model.Schema
+{
+    public class JenkinsDefaultParameterValue
+    {
+        [JsonProperty("Value")]
+        public string Value { get; set; }
+    }
+}
diff --git a/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Schema/JenkinsJob.cs b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Schema/JenkinsJob.cs
index 2aabab8..041df10 100644
--- a/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Schema/JenkinsJob.cs
+++ b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Schema/JenkinsJob.cs
@@ -13,6 +13,7 @@ public class JenkinsJob : ObservableObject
         private bool _isQueued;
         private JenkinsQueueItem _queueItem;
         private string _name;
+        private IEnumerable<JenkinsProperty> _property;
 
         [JsonProperty("InQueue")]
         public bool IsQueued
@@ -94,6 +95,21 @@ public string Name
         [JsonProperty("Url")]
         public string Url { get; set; }
 
+        [JsonProperty("Property")]
+        public IEnumerable<JenkinsProperty> Property
+        {
+            get { return _property; }
+            set
+            {
+                if (value != _property)
+                {
+                    _property = value;
+                    RaisePropertyChanged(() => Property);
+                    RaisePropertyChanged(() => HasParameters);
+                }
+            }
+        }
+
         [JsonIgnore]
         public JenkinsBuild LatestBuild
         {
@@ -162,6 +178,12 @@ public short BuildProgress
             }
         }
 
+        [JsonIgnore]
+        public bool HasParameters
+        {
+            get { return Property != null && Property.Any(p => p?.ParameterDefinitions != null && p.ParameterDefinitions.Any()); }
+        }
+
         public override bool Equals(object obj)
         {
             //       
diff --git a/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Schema/JenkinsParameterDefinition.cs b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Schema/JenkinsParameterDefinition.cs
new file mode 100644
index 0000000..1ccbbcd
--- /dev/null
+++ b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Schema/JenkinsParameterDefinition.cs
@@ -0,0 +1,14 @@
+using Newtonsoft.Json;
+
+namespace Devkoes.JenkinsManager.Model.Schema
+{
+    public class JenkinsParameterDefinition
+    {
+        [JsonProperty("Name")]
+        public string Name { get; set; }
+
+        [JsonProperty("DefaultParameterValue")]
+        public JenkinsDefaultParameterValue DefaultParameterValue { get; set; }
+
+    }
+}
\ No newline at end of file
diff --git a/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Schema/JenkinsProperty.cs b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Schema/JenkinsProperty.cs
new file mode 100644
index 0000000..6edd431
--- /dev/null
+++ b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.Model/Schema/JenkinsProperty.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Devkoes.JenkinsManager.Model.Schema
+{
+    public class JenkinsProperty
+    {
+        [JsonProperty("ParameterDefinitions")]
+        public IEnumerable<JenkinsParameterDefinition> ParameterDefinitions { get; set; }
+
+    }
+}
\ No newline at end of file
diff --git a/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.UI/Devkoes.JenkinsManager.UI.csproj b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.UI/Devkoes.JenkinsManager.UI.csproj
index 2835e7c..b2f7d5e 100644
--- a/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.UI/Devkoes.JenkinsManager.UI.csproj
+++ b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.UI/Devkoes.JenkinsManager.UI.csproj
@@ -181,6 +181,9 @@
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\BuildWithParameters.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.UI/Resources/BuildWithParameters.png b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.UI/Resources/BuildWithParameters.png
new file mode 100644
index 0000000000000000000000000000000000000000..f40b90c7da8c6b1a3edc5d23a920333645b93b88
GIT binary patch
literal 505
zcmV<V0S5kwP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<St4TybRCr$Pl)Y*KK@>*M%2sMf8c_&XiO(QdrwM}O36dfPv9K2r
zti@u*Zd0VTw=rmEVIkNgkC002{3$nk3n2`;vp7pY^uWNfGjs2q?|w5J!t*?~+wG@6
zvMBifJk7XM)@LP_#5_cd<2(Rg{^nOsLz2Hp42i`NY=XG~-u*yNz*{^X|3Lssr4oM`
z3<e|;iGAXGzy%)B5F;EC=vz*No@ZIRPi|a5tJPw;TmswzALwyp?P|56-EOnlY|IK+
zEEd#iHAbV6n3FJ!$79*Ud_G5qjUINp9sPcv>2ylHUMH1GaR@oJtkWjeE1*|HWipv4
zr;ezAN~MBr+o~F<xUT!R-?E2lwTgdp%nB%%%XB&&(&;o|$z(EgyIr}eSe8W)mb_l*
zVZC1CI1aPfj3A1|qWDDKglIjGOeSeIn`%o`$!RniO7f5eh+Hy)5INPBsFLeY^TarT
zd_GUF*P~D<h~)B3E|=pJY&7UvvR4N9*8+5j%?nWbIUEk7oHy`*8P@{z9#DH`Fn^{B
vM0hK%COk(En7jV`6%aRHo(I$(UX}vC=J3~<l_XxQ00000NkvXXu0mjf9s}8x

literal 0
HcmV?d00001

diff --git a/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.UI/ViewModels/JenkinsManagerViewModel.cs b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.UI/ViewModels/JenkinsManagerViewModel.cs
index 3bbfbeb..3d8586b 100644
--- a/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.UI/ViewModels/JenkinsManagerViewModel.cs
+++ b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.UI/ViewModels/JenkinsManagerViewModel.cs
@@ -38,6 +38,7 @@ public class JenkinsManagerViewModel : ViewModelBase
         public RelayCommand<JenkinsJob> ScheduleBuildCommand { get; private set; }
         public RelayCommand<JenkinsJob> CancelBuildCommand { get; private set; }
         public RelayCommand<JenkinsJob> DequeueJobCommand { get; private set; }
+        public RelayCommand<JenkinsJob> BuildJobWithDefaultParametersCommand { get; private set; }
 
         public RelayCommand<JenkinsJob> ShowJobsWebsite { get; private set; }
         public RelayCommand<JenkinsJob> LinkJobToCurrentSolution { get; private set; }
@@ -81,6 +82,8 @@ private void InitializeCommands()
             ScheduleBuildCommand = new RelayCommand<JenkinsJob>(ScheduleJob, CanDoJobAction);
             CancelBuildCommand = new RelayCommand<JenkinsJob>(CancelBuild, CanDoJobAction);
             DequeueJobCommand = new RelayCommand<JenkinsJob>(DequeueBuild, CanDoJobAction);
+            BuildJobWithDefaultParametersCommand = new RelayCommand<JenkinsJob>(BuildJobWithDefaultParameters, CanDoJobAction);
+
 
             ShowJobsWebsite = new RelayCommand<JenkinsJob>(ShowWebsite, CanDoJobAction);
             ShowLatestLog = new RelayCommand<JenkinsJob>(HandleShowLatestLog, CanDoJobAction);
@@ -313,6 +316,19 @@ private async void BuildJob(JenkinsJob j)
             }
         }
 
+        private async void BuildJobWithDefaultParameters(JenkinsJob job)
+        {
+            try
+            {
+                await JenkinsJobManager.BuildJobWithDefaultParameters(job, SelectedJenkinsServer.Url);
+                ForceReload(false);
+            }
+            catch (Exception ex)
+            {
+                Logger.Log(ex);
+            }
+        }
+
         private async void ScheduleJob(JenkinsJob j)
         {
             try
diff --git a/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.UI/Views/JenkinsManager.xaml b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.UI/Views/JenkinsManager.xaml
index 68f0260..9cc89cc 100644
--- a/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.UI/Views/JenkinsManager.xaml
+++ b/Devkoes.VSJenkinsManager/Devkoes.JenkinsManager.UI/Views/JenkinsManager.xaml
@@ -156,6 +156,15 @@
                                 Height="16" />
                         </MenuItem.Icon>
                     </MenuItem>
+                    <MenuItem 
+                        Header="Build with _Parameters" 
+                        Command="{Binding Path=BuildJobWithDefaultParametersCommand}" 
+                        CommandParameter="{Binding SelectedJob}"
+                        IsEnabled="{Binding SelectedJob.HasParameters}">
+                        <MenuItem.Icon>
+                            <Image Source="..\Resources\BuildWithParameters.png" Height="16" />
+                        </MenuItem.Icon>
+                    </MenuItem>
                     <MenuItem
                         Header="_Cancel build"
                         Command="{Binding Path=CancelBuildCommand}"