Fix incorrect references to api/v1 being present in the URL response

Author: jake klein

cmd/flake-detector/flake-detector.go

@@ -24,13 +24,17 @@ func main() {
 	}
 
 	client := concourse.NewClient(func(url string) ([]byte, error) {
+		//fmt.Println("----------------------------\nSTART\n----------------------------")
+		//fmt.Printf("URL: %s\n", url)
 		response, err := http.Get(url)
 		if err != nil {
 			return nil, err
 		}
 		buffer := new(bytes.Buffer)
 		buffer.ReadFrom(response.Body)
 
+		//fmt.Printf("RESPONSE: %s\n", string(buffer.Bytes()))
+		//fmt.Println("----------------------------\nEND\n----------------------------")
 		return buffer.Bytes(), err
 	}, *url, *team)
 

concourse/builds.go

@@ -11,7 +11,7 @@ type Build struct {
 }
 
 func (c *client) GetBuilds(job Job) ([]Build, error) {
-	response, err := c.get(fmt.Sprintf("%s%s/builds", c.baseURL, job.URL))
+	response, err := c.get(fmt.Sprintf("%s%s/builds", c.url, job.URL))
 	if err != nil {
 		return []Build{}, err
 	}

concourse/builds_test.go

@@ -17,7 +17,7 @@ var _ = Describe("GetBuilds", func() {
 
 		buildList := `[{"status":"succeeded","api_url":"/concourse/v1/builds/1"},{"status":"failed","api_url":"/concourse/v1/builds/2"}]`
 		fakeGet.Returns([]byte(buildList), nil)
-		builds, err := client.GetBuilds(concourse.Job{URL: "/api/v1/foo/job"})
+		builds, err := client.GetBuilds(concourse.Job{URL: "/foo/job"})
 		Expect(err).NotTo(HaveOccurred())
 		Expect(fakeGet.ArgsForCall(0)).To(Equal("example.com/api/v1/foo/job/builds"))
 		Expect(builds).To(Equal([]concourse.Build{

concourse/resources.go

@@ -27,7 +27,7 @@ type Ref struct {
 
 func (c *client) GetResources(build Build) (Run, error) {
 
-	response, err := c.get(build.URL + "/resources")
+	response, err := c.get(c.baseURL + build.URL + "/resources")
 	if err != nil {
 		return Run{}, err
 	}

concourse/resources_test.go

@@ -30,14 +30,14 @@ var _ = Describe("GetResources", func() {
 
 	It("returns the resources for a build", func() {
 		fakeGet := new(fake.FakeGetter)
-		client := concourse.NewClient(fakeGet.Spy, "fake.com", "")
+		client := concourse.NewClient(fakeGet.Spy, "example.com", "")
 
 		fakeGet.ReturnsOnCall(0, []byte(fmt.Sprintf(gitResourcewithVersion, "version1")), nil)
 		fakeGet.ReturnsOnCall(1, []byte(fmt.Sprintf(gitResourcewithVersion, "version1")), nil)
 
 		run, err := client.GetResources(concourse.Build{
 			Status: "succeeded",
-			URL:    "example.com/builds",
+			URL:    "/builds",
 		})
 
 		Expect(err).NotTo(HaveOccurred())

integration_tests/flake-detector_test.go

@@ -33,7 +33,7 @@ var _ = Describe("flake-detector", func() {
 			jobName := "test-job"
 			pipelineName := "test-pipeline"
 
-			buildList := fmt.Sprintf(`[{"status":"succeeded","api_url":"%s/api/v1/builds/1"},{"status":"failed","api_url":"%s/api/v1/builds/2"}]`, concourse.URL, concourse.URL)
+			buildList := fmt.Sprintf(`[{"status":"succeeded","api_url":"/api/v1/builds/1"},{"status":"failed","api_url":"/api/v1/builds/2"}]`)
 
 			const gitResourcewithVersion = `
 			{
@@ -50,7 +50,7 @@ var _ = Describe("flake-detector", func() {
 	]
 }
 `
-			jobUrl := fmt.Sprintf("/api/v1/pipelines/%s/jobs/%s", pipelineName, jobName)
+			jobUrl := fmt.Sprintf("/pipelines/%s/jobs/%s", pipelineName, jobName)
 			concourse.AppendMocks(
 				mockconcourse.JobsForPipeline(pipelineName, "").RespondsWithJob(jobName, fmt.Sprintf("%s", jobUrl)),
 				mockconcourse.BuildsForJob(jobUrl).RespondsWithBuilds(buildList),
@@ -71,7 +71,7 @@ var _ = Describe("flake-detector", func() {
 			jobName := "test-job"
 			pipelineName := "test-pipeline"
 
-			buildList := fmt.Sprintf(`[{"status":"succeeded","api_url":"%s/api/v1/builds/1"},{"status":"failed","api_url":"%s/api/v1/builds/2"}]`, concourse.URL, concourse.URL)
+			buildList := fmt.Sprintf(`[{"status":"succeeded","api_url":"/api/v1/builds/1"},{"status":"failed","api_url":"/api/v1/builds/2"}]`)
 
 			const gitResourcewithVersion = `
 			{
@@ -88,7 +88,7 @@ var _ = Describe("flake-detector", func() {
 	]
 }
 `
-			jobUrl := fmt.Sprintf("/api/v1/pipelines/%s/jobs/%s", pipelineName, jobName)
+			jobUrl := fmt.Sprintf("/pipelines/%s/jobs/%s", pipelineName, jobName)
 			concourse.AppendMocks(
 				mockconcourse.JobsForPipeline(pipelineName, "").RespondsWithJob(jobName, fmt.Sprintf("%s", jobUrl)),
 				mockconcourse.BuildsForJob(jobUrl).RespondsWithBuilds(buildList),
@@ -111,7 +111,7 @@ var _ = Describe("flake-detector", func() {
 			pipelineName := "test-pipeline"
 			team := "foo"
 
-			buildList := fmt.Sprintf(`[{"status":"succeeded","api_url":"%s/api/v1/builds/1"},{"status":"failed","api_url":"%s/api/v1/builds/2"}]`, concourse.URL, concourse.URL)
+			buildList := fmt.Sprintf(`[{"status":"succeeded","api_url":"/api/v1/builds/1"},{"status":"failed","api_url":"/api/v1/builds/2"}]`)
 
 			const gitResourcewithVersion = `
 			{
@@ -130,7 +130,7 @@ var _ = Describe("flake-detector", func() {
 `
 			//// example team URL api/v1/teams/main/pipelines/main/jobs/fly/builds
 
-			jobUrl := fmt.Sprintf("/api/v1/teams/foo/pipelines/%s/jobs/%s", pipelineName, jobName)
+			jobUrl := fmt.Sprintf("/teams/foo/pipelines/%s/jobs/%s", pipelineName, jobName)
 			concourse.AppendMocks(
 				mockconcourse.JobsForPipeline(pipelineName, team).RespondsWithJob(jobName, fmt.Sprintf("%s", jobUrl)),
 				mockconcourse.BuildsForJob(jobUrl).RespondsWithBuilds(buildList),

mockconcourse/builds.go

@@ -2,6 +2,7 @@ package mockconcourse
 
 import (
 	"fmt"
+
 	"github.com/pivotal-cf/on-demand-service-broker/mockhttp"
 )
 
@@ -11,7 +12,7 @@ type buildMock struct {
 
 func BuildsForJob(job string) *buildMock {
 	return &buildMock{
-		mockhttp.NewMockedHttpRequest("GET", fmt.Sprintf("%s/builds", job)),
+		mockhttp.NewMockedHttpRequest("GET", fmt.Sprintf("/api/v1%s/builds", job)),
 	}
 }