From 74527e7ddda7443dcba5416d3b2d74b344c2454f Mon Sep 17 00:00:00 2001
From: Tugdual Saunier <tugdual.saunier@gmail.com>
Date: Tue, 20 Feb 2018 09:02:19 +0700
Subject: [PATCH] Add support for Build Skipping configuration

---
 buildkite/resource_pipeline.go | 60 +++++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 16 deletions(-)

diff --git a/buildkite/resource_pipeline.go b/buildkite/resource_pipeline.go
index 4f8647f..5987401 100644
--- a/buildkite/resource_pipeline.go
+++ b/buildkite/resource_pipeline.go
@@ -65,6 +65,22 @@ func resourcePipeline() *schema.Resource {
 				Optional: true,
 				Default:  "master",
 			},
+			"skip_queued_branch_builds": &schema.Schema{
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
+			"skip_queued_branch_builds_filter": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+			"cancel_running_branch_builds": &schema.Schema{
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
+			"cancel_running_branch_builds_filter": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"env": &schema.Schema{
 				Type:     schema.TypeMap,
 				Optional: true,
@@ -235,22 +251,26 @@ func resourcePipeline() *schema.Resource {
 }
 
 type Pipeline struct {
-	Id                  string                 `json:"id,omitempty"`
-	Environment         map[string]string      `json:"env,omitempty"`
-	Slug                string                 `json:"slug,omitempty"`
-	WebURL              string                 `json:"web_url,omitempty"`
-	BuildsURL           string                 `json:"builds_url,omitempty"`
-	Url                 string                 `json:"url,omitempty"`
-	DefaultBranch       string                 `json:"default_branch,omitempty"`
-	BadgeURL            string                 `json:"badge_url,omitempty"`
-	CreatedAt           string                 `json:"created_at,omitempty"`
-	Repository          string                 `json:"repository,omitempty"`
-	Name                string                 `json:"name,omitempty"`
-	Description         string                 `json:"description,omitempty"`
-	BranchConfiguration string                 `json:"branch_configuration,omitempty"`
-	Provider            repositoryProvider     `json:"provider,omitempty"`
-	ProviderSettings    map[string]interface{} `json:"provider_settings,omitempty"`
-	Steps               []Step                 `json:"steps"`
+	Id                              string                 `json:"id,omitempty"`
+	Environment                     map[string]string      `json:"env,omitempty"`
+	Slug                            string                 `json:"slug,omitempty"`
+	WebURL                          string                 `json:"web_url,omitempty"`
+	BuildsURL                       string                 `json:"builds_url,omitempty"`
+	Url                             string                 `json:"url,omitempty"`
+	DefaultBranch                   string                 `json:"default_branch,omitempty"`
+	BadgeURL                        string                 `json:"badge_url,omitempty"`
+	CreatedAt                       string                 `json:"created_at,omitempty"`
+	Repository                      string                 `json:"repository,omitempty"`
+	Name                            string                 `json:"name,omitempty"`
+	Description                     string                 `json:"description,omitempty"`
+	BranchConfiguration             string                 `json:"branch_configuration,omitempty"`
+	SkipQueuedBranchBuilds          bool                   `json:"skip_queued_branch_builds,omitempty"`
+	SkipQueuedBranchBuildsFilter    string                 `json:"skip_queued_branch_builds_filter,omitempty"`
+	CancelRunningBranchBuilds       bool                   `json:"cancel_running_branch_builds,omitempty"`
+	CancelRunningBranchBuildsFilter string                 `json:"cancel_running_branch_builds_filter,omitempty"`
+	Provider                        repositoryProvider     `json:"provider,omitempty"`
+	ProviderSettings                map[string]interface{} `json:"provider_settings,omitempty"`
+	Steps                           []Step                 `json:"steps"`
 }
 
 type repositoryProvider struct {
@@ -379,6 +399,10 @@ func updatePipelineFromAPI(d *schema.ResourceData, p *Pipeline) error {
 	d.Set("builds_url", p.BuildsURL)
 	d.Set("branch_configuration", p.BranchConfiguration)
 	d.Set("default_branch", p.DefaultBranch)
+	d.Set("skip_queued_branch_builds", p.SkipQueuedBranchBuilds)
+	d.Set("skip_queued_branch_builds_filter", p.SkipQueuedBranchBuildsFilter)
+	d.Set("cancel_running_branch_builds", p.CancelRunningBranchBuilds)
+	d.Set("cancel_running_branch_builds_filter", p.CancelRunningBranchBuildsFilter)
 
 	stepMap := make([]interface{}, len(p.Steps))
 	for i, element := range p.Steps {
@@ -443,6 +467,10 @@ func preparePipelineRequestPayload(d *schema.ResourceData) *Pipeline {
 	req.Slug = d.Get("slug").(string)
 	req.Repository = d.Get("repository").(string)
 	req.BranchConfiguration = d.Get("branch_configuration").(string)
+	req.SkipQueuedBranchBuilds = d.Get("skip_queued_branch_builds").(bool)
+	req.SkipQueuedBranchBuildsFilter = d.Get("skip_queued_branch_builds_filter").(string)
+	req.CancelRunningBranchBuilds = d.Get("cancel_running_branch_builds").(bool)
+	req.CancelRunningBranchBuildsFilter = d.Get("cancel_running_branch_builds_filter").(string)
 	req.Environment = map[string]string{}
 	for k, vI := range d.Get("env").(map[string]interface{}) {
 		req.Environment[k] = vI.(string)