Add checks for failed requests in history_builder

Author: Jake Klein

historybuilder/history_builder.go

@@ -33,8 +33,10 @@ type JSONBuild struct {
 }
 
 func GetJobHistory(client api.Client, job api.Job) ([]Run, error) {
-	var err error
-	response, _ := client.Get(fmt.Sprintf("api/v1%s/builds", job.URL))
+	response, err := client.Get(fmt.Sprintf("api/v1%s/builds", job.URL))
+	if err != nil {
+		return []Run{}, err
+	}
 
 	builds := make([]JSONBuild, 0)
 	err = json.Unmarshal(response, &builds)
@@ -43,7 +45,10 @@ func GetJobHistory(client api.Client, job api.Job) ([]Run, error) {
 	}
 	var history []Run
 	for _, build := range builds {
-		response, _ := client.Get(build.APIURL + "/resources")
+		response, err := client.Get(build.APIURL + "/resources")
+		if err != nil {
+			return []Run{}, err
+		}
 
 		inputs := Resource{}
 		err = json.Unmarshal(response, &inputs)

historybuilder/history_builder_test.go

@@ -5,37 +5,40 @@ import (
 	"github.com/aclevername/concourse-flake-detector/api/clientfake"
 	"github.com/aclevername/concourse-flake-detector/historybuilder"
 
+	"errors"
+	"fmt"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("historybuilder", func() {
-	Describe("GetJobHistory", func() {
-		It("gets a history of the job", func() {
-			client := new(clientfake.FakeClient)
-			testJob := api.Job{Name: "test-job", URL: "/teams/main/pipelines/main/jobs/fly"}
-
-			buildList := `[{"status":"succeeded","api_url":"/api/v1/builds/1"},{"status":"failed","api_url":"/api/v1/builds/2"}]`
-			client.GetReturnsOnCall(0, []byte(buildList), nil)
-
-			resources := `
+const gitResourcewithVersion = `
 			{
 	"inputs": [
 		{
 			"name": "concourse",
 			"resource": "concourse",
 			"type": "git",
 			"version": {
-				"ref": "d70a2b36579c7ea397d895ce7371f8cc9e044fc7"
+				"ref": "%s"
 			},
 		  "pipeline_id": 1
 		}
 	]
 }
 `
-			client.GetReturnsOnCall(1, []byte(resources), nil)
 
-			client.GetReturnsOnCall(2, []byte(resources), nil)
+var _ = Describe("historybuilder", func() {
+	Describe("GetJobHistory", func() {
+		It("gets a history of the job", func() {
+			client := new(clientfake.FakeClient)
+			testJob := api.Job{Name: "test-job", URL: "/teams/main/pipelines/main/jobs/fly"}
+
+			buildList := `[{"status":"succeeded","api_url":"/api/v1/builds/1"},{"status":"failed","api_url":"/api/v1/builds/2"}]`
+			client.GetReturnsOnCall(0, []byte(buildList), nil)
+
+			client.GetReturnsOnCall(1, []byte(fmt.Sprintf(gitResourcewithVersion, "version1")), nil)
+
+			client.GetReturnsOnCall(2, []byte(fmt.Sprintf(gitResourcewithVersion, "version1")), nil)
 
 			history, err := historybuilder.GetJobHistory(client, testJob)
 
@@ -51,7 +54,7 @@ var _ = Describe("historybuilder", func() {
 				Resource: "concourse",
 				Type:     "git",
 				Version: historybuilder.Ref{
-					Ref: "d70a2b36579c7ea397d895ce7371f8cc9e044fc7",
+					Ref: "version1",
 				},
 				PipelineID: 1,
 			}))
@@ -62,10 +65,36 @@ var _ = Describe("historybuilder", func() {
 				Resource: "concourse",
 				Type:     "git",
 				Version: historybuilder.Ref{
-					Ref: "d70a2b36579c7ea397d895ce7371f8cc9e044fc7",
+					Ref: "version1",
 				},
 				PipelineID: 1,
 			}))
 		})
+
+		Context("when getting the job builds fails", func() {
+			It("returns an error", func() {
+				client := new(clientfake.FakeClient)
+				testJob := api.Job{Name: "test-job", URL: "/teams/main/pipelines/main/jobs/fly"}
+
+				buildList := `[{"status":"succeeded","api_url":"/api/v1/builds/1"},{"status":"failed","api_url":"/api/v1/builds/2"}]`
+				client.GetReturnsOnCall(0, []byte(buildList), nil)
+				client.GetReturnsOnCall(1, []byte{}, errors.New("failed"))
+
+				_, err := historybuilder.GetJobHistory(client, testJob)
+				Expect(err).To(MatchError("failed"))
+			})
+		})
+
+		Context("when getting the a builds resources fails", func() {
+			It("returns an error", func() {
+				client := new(clientfake.FakeClient)
+				testJob := api.Job{Name: "test-job", URL: "/teams/main/pipelines/main/jobs/fly"}
+
+				client.GetReturnsOnCall(0, []byte{}, errors.New("failed"))
+
+				_, err := historybuilder.GetJobHistory(client, testJob)
+				Expect(err).To(MatchError("failed"))
+			})
+		})
 	})
 })