Remove unnecessary ReaderToBytes

3 files changed, 10 insertions, 6 deletions

diff --git a/client/go/util/io.go b/client/go/util/io.go
index f51c6060cb7..e4e05d4c674 100644
--- a/client/go/util/io.go
+++ b/client/go/util/io.go
@@ -9,6 +9,7 @@ import (
 	"encoding/json"
 	"errors"
 	"io"
+	"io/ioutil"
 	"os"
 	"strings"
 )
@@ -41,7 +42,7 @@ func ReaderToBytes(reader io.Reader) []byte {
 
 // Returns the contents of reader as indented JSON
 func ReaderToJSON(reader io.Reader) string {
-	bodyBytes := ReaderToBytes(reader)
+	bodyBytes, _ := ioutil.ReadAll(reader)
 	var prettyJSON bytes.Buffer
 	parseError := json.Indent(&prettyJSON, bodyBytes, "", "    ")
 	if parseError != nil { // Not JSON: Print plainly
diff --git a/client/go/vespa/deploy.go b/client/go/vespa/deploy.go
index eec0182b0ce..908b3772b70 100644
--- a/client/go/vespa/deploy.go
+++ b/client/go/vespa/deploy.go
@@ -344,7 +344,7 @@ func zipDir(dir string, destination string) error {
 
 // Returns the error message in the given JSON, or the entire content if it could not be extracted
 func extractError(reader io.Reader) string {
-	responseData := util.ReaderToBytes(reader)
+	responseData, _ := ioutil.ReadAll(reader)
 	var response map[string]interface{}
 	json.Unmarshal(responseData, &response)
 	if response["error-code"] == "INVALID_APPLICATION_PACKAGE" {
diff --git a/client/go/vespa/document.go b/client/go/vespa/document.go
index 5e01d180b5f..6424113bd52 100644
--- a/client/go/vespa/document.go
+++ b/client/go/vespa/document.go
@@ -59,12 +59,15 @@ func sendOperation(documentId string, jsonFile string, service *Service, operati
 	if operation == "remove" && jsonFile == "" {
 		documentData = []byte("{\n    \"remove\": \"" + documentId + "\"\n}\n")
 	} else {
-		fileReader, fileError := os.Open(jsonFile)
-		if fileError != nil {
-			return util.FailureWithDetail("Could not open file '"+jsonFile+"'", fileError.Error())
+		fileReader, err := os.Open(jsonFile)
+		if err != nil {
+			return util.FailureWithDetail("Could not open file '"+jsonFile+"'", err.Error())
 		}
 		defer fileReader.Close()
-		documentData = util.ReaderToBytes(fileReader)
+		documentData, err = ioutil.ReadAll(fileReader)
+		if err != nil {
+			return util.FailureWithDetail("Failed to read '"+jsonFile+"'", err.Error())
+		}
 	}
 
 	var doc map[string]interface{}