Merge pull request #3137 from aledbf/fix_builder_messages

fix(builder): return error message as string

Author: Matthew Fisher

builder/bin/get-app-config.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
+	"io/ioutil"
 	"net/http"
 	"os"
 
@@ -85,15 +86,22 @@ func main() {
 		os.Exit(1)
 	}
 
+	body, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
 	if err != nil || res.StatusCode != 200 {
 		fmt.Println("failed retrieving config from controller")
-		fmt.Println(res.Body)
+		fmt.Printf("%v\n", body)
 		os.Exit(1)
 	}
 
-	config, err := builder.ParseConfig(res)
+	config, err := builder.ParseConfig(body)
 	if err != nil {
 		fmt.Println("failed parsing config from controller")
+		fmt.Printf("%v\n", err)
 		os.Exit(1)
 	}
 	toString, err := json.Marshal(config)

builder/bin/publish-release-controller.go

@@ -82,19 +82,20 @@ func main() {
 		log.Fatalln(err)
 	}
 
-	if res.StatusCode == 503 {
-		log.Fatalln("check the controller. is it running?")
-	} else if res.StatusCode != 200 {
-		log.Fatalf("failed retrieving config from controller: %s\n", res.Body)
-	}
-
 	defer res.Body.Close()
-	// Read json response from body
+
 	body, err := ioutil.ReadAll(res.Body)
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}
+
+	if res.StatusCode == 503 {
+		log.Fatalln("check the controller. is it running?")
+	} else if res.StatusCode != 200 {
+		log.Fatalf("failed retrieving config from controller: %s\n", body)
+	}
+
 	var response map[string]interface{}
 	if err := json.Unmarshal(body, &response); err != nil {
 		fmt.Println("invalid controller json response")

builder/utils.go

@@ -3,8 +3,6 @@ package builder
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
-	"net/http"
 
 	"gopkg.in/yaml.v2"
 )
@@ -27,15 +25,9 @@ func YamlToJSON(bytes []byte) (string, error) {
 }
 
 // ParseConfig takes a response body from the controller and returns a Config object.
-func ParseConfig(res *http.Response) (*Config, error) {
-	body, err := ioutil.ReadAll(res.Body)
-
-	if err != nil {
-		return nil, err
-	}
-
+func ParseConfig(body []byte) (*Config, error) {
 	var config Config
-	err = json.Unmarshal(body, &config)
+	err := json.Unmarshal(body, &config)
 	return &config, err
 }
 

builder/utils_test.go

@@ -3,7 +3,6 @@ package builder
 import (
 	"bytes"
 	"encoding/json"
-	"net/http"
 	"strings"
 	"testing"
 	"time"
@@ -58,20 +57,17 @@ worker: while true; do echo hello; sleep 1; done`),
 
 func TestParseConfigGood(t *testing.T) {
 	// mock the controller response
-	resp := &http.Response{
-		Body: &ClosingBuffer{bytes.NewBufferString(`{"owner": "test",
+	resp := bytes.NewBufferString(`{"owner": "test",
 			"app": "example-go",
 			"values": {"FOO": "bar", "CAR": 1234},
 			"memory": {},
 			"cpu": {},
 			"tags": {},
 			"created": "2014-01-01T00:00:00UTC",
 			"updated": "2014-01-01T00:00:00UTC",
-			"uuid": "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75"}`),
-		},
-	}
+			"uuid": "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75"}`)
 
-	config, err := ParseConfig(resp)
+	config, err := ParseConfig(resp.Bytes())
 
 	if err != nil {
 		t.Error(err)