Merge branch 'fatal10110-feature/queue_build'

Author: benmatselby

azuredevops/azuredevops.go

@@ -1,6 +1,7 @@
 package azuredevops
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -78,6 +79,15 @@ func (c *Client) NewRequest(method, URL string, body interface{}) (*http.Request
 // and simply uses the base https://%s.visualstudio.com base URL
 func (c *Client) NewBaseRequest(method, URL string, body interface{}) (*http.Request, error) {
 	var buf io.ReadWriter
+	if body != nil {
+		buf = new(bytes.Buffer)
+		enc := json.NewEncoder(buf)
+		enc.SetEscapeHTML(false)
+		err := enc.Encode(body)
+		if err != nil {
+			return nil, err
+		}
+	}
 
 	request, err := http.NewRequest(method, c.BaseURL+URL, buf)
 

azuredevops/azuredevops_test.go

@@ -2,6 +2,7 @@ package azuredevops_test
 
 import (
 	"fmt"
+	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -42,7 +43,7 @@ func setup() (client *azuredevops.Client, mux *http.ServeMux, serverURL string,
 	// The client being tested and is configured to use test server.
 	client = azuredevops.NewClient("AZURE_DEVOPS_Account", "AZURE_DEVOPS_Project", "AZURE_DEVOPS_TOKEN")
 
-	url, _ := url.Parse(server.URL + baseURLPath + "/")
+	url, _ := url.Parse(server.URL + baseURLPath)
 	client.BaseURL = url.String()
 	return client, mux, server.URL, server.Close
 }
@@ -53,6 +54,16 @@ func testMethod(t *testing.T, r *http.Request, want string) {
 	}
 }
 
+func testBody(t *testing.T, r *http.Request, want string) {
+	b, err := ioutil.ReadAll(r.Body)
+	if err != nil {
+		t.Errorf("Error reading request body: %v", err)
+	}
+	if got := string(b); got != want {
+		t.Errorf("request Body is %s, want %s", got, want)
+	}
+}
+
 func testURL(t *testing.T, r *http.Request, want string) {
 	if got := r.URL; got.String() != want {
 		t.Errorf("request URL is %s, want %s", got, want)

azuredevops/builds.go

@@ -147,3 +147,30 @@ func (s *BuildsService) List(opts *BuildsListOptions) ([]Build, error) {
 
 	return response.Builds, err
 }
+
+// QueueBuildOptions describes what the request to the API should look like
+type QueueBuildOptions struct {
+	IgnoreWarnings bool   `url:"ignoreWarnings,omitempty"`
+	CheckInTicket  string `url:"checkInTicket,omitempty"`
+}
+
+// Queue inserts new build creation to queue
+// utilising https://docs.microsoft.com/en-us/rest/api/vsts/build/builds/queue?view=vsts-rest-4.1
+func (s *BuildsService) Queue(build *Build, opts *QueueBuildOptions) error {
+	URL := "_apis/build/builds?api-version=4.1"
+	URL, err := addOptions(URL, opts)
+
+	if err != nil {
+		return err
+	}
+
+	request, err := s.client.NewRequest("POST", URL, build)
+
+	if err != nil {
+		return err
+	}
+
+	_, err = s.client.Execute(request, &build)
+
+	return err
+}

azuredevops/builds_test.go

@@ -1,6 +1,7 @@
 package azuredevops_test
 
 import (
+	"encoding/json"
 	"fmt"
 	"net/http"
 	"testing"
@@ -10,6 +11,7 @@ import (
 
 const (
 	buildListURL      = "/AZURE_DEVOPS_Project/_apis/build/builds"
+	queueBuildURL     = "/AZURE_DEVOPS_Project/_apis/build/builds"
 	buildListResponse = `{
 		"value": [
 			{
@@ -82,3 +84,54 @@ func TestBuildsService_List(t *testing.T) {
 		})
 	}
 }
+
+func TestBuildsService_Queue(t *testing.T) {
+	t.Run("Updates build struct with returned data", func(t *testing.T) {
+		c, mux, _, teardown := setup()
+		defer teardown()
+
+		requestBuild := &azuredevops.Build{
+			Status: "completed",
+			Definition: azuredevops.BuildDefinition{
+				Name: "build-one",
+			},
+		}
+
+		responseBuild := requestBuild
+		responseBuild.Result = "succeeded"
+
+		mux.HandleFunc(queueBuildURL, func(w http.ResponseWriter, r *http.Request) {
+			b, err := json.Marshal(responseBuild)
+			queueBuildResponse := string(b)
+
+			if err != nil {
+				t.Fatalf("returned error: %v", err)
+			}
+
+			testMethod(t, r, "POST")
+			testBody(t, r, queueBuildResponse+"\n")
+
+			fmt.Fprint(w, queueBuildResponse)
+		})
+
+		options := &azuredevops.QueueBuildOptions{}
+
+		err := c.Builds.Queue(requestBuild, options)
+
+		if err != nil {
+			t.Fatalf("returned error: %v", err)
+		}
+
+		if requestBuild.Result != responseBuild.Result {
+			t.Fatalf("expected result %s, got %s", responseBuild.Result, requestBuild.Result)
+		}
+
+		if requestBuild.Status != responseBuild.Status {
+			t.Fatalf("expected status %s, got %s", responseBuild.Status, requestBuild.Status)
+		}
+
+		if requestBuild.Definition.Name != responseBuild.Definition.Name {
+			t.Fatalf("expected definition name %s, got %s", responseBuild.Definition.Name, requestBuild.Definition.Name)
+		}
+	})
+}

go.mod

@@ -1,6 +1,3 @@
-module github.com/benmatselby/go-vsts
+module github.com/benmatselby/go-azuredevops
 
-require (
-	github.com/benmatselby/go-azuredevops v0.0.0-20190112144040-c2a0219308ca
-	github.com/google/go-querystring v1.0.0
-)
+require github.com/google/go-querystring v1.0.0