print non-nil json body on err

Author: TheJolman

internal/cli/announcements/delete.go

@@ -34,7 +34,7 @@ func deleteAnnouncement(id string, cfg *config.Config) {
 	if body, err := client.SendRequestAndReadResponse(deleteUrl, true, http.MethodDelete, nil); err != nil {
 		fmt.Fprintln(os.Stderr, "Error:", err)
 		if body != nil {
-			utils.PrettyPrintJSON(body)
+			utils.PrettyPrintJSONErr(body)
 		}
 	} else {
 		utils.PrettyPrintJSON(body)

internal/cli/announcements/get.go

@@ -33,7 +33,7 @@ func getAnnouncement(uuid string, cfg *config.Config) {
 	if body, err := client.SendRequestAndReadResponse(getUrl, false, http.MethodGet, nil); err != nil {
 		fmt.Fprintln(os.Stderr, "Error:", err)
 		if body != nil {
-			utils.PrettyPrintJSON(body)
+			utils.PrettyPrintJSONErr(body)
 		}
 	} else {
 		utils.PrettyPrintJSON(body)

internal/cli/announcements/post.go

@@ -44,8 +44,7 @@ func postAnnouncement(cfg *config.Config) {
 		bytes.NewBuffer(b)); err != nil {
 		fmt.Fprintln(os.Stderr, "Error:", err)
 		if body != nil {
-			// NOTE: This isn't going to stderr. Should probably fix that at some point
-			utils.PrettyPrintJSON(body)
+			utils.PrettyPrintJSONErr(body)
 		}
 	} else {
 		utils.PrettyPrintJSON(body)

internal/cli/announcements/put.go

@@ -66,6 +66,9 @@ func putAnnouncements(id string, cfg *config.Config) {
 	if body, err := client.SendRequestAndReadResponse(resourceUrl, true, http.MethodPut,
 		bytes.NewBuffer(b)); err != nil {
 		fmt.Fprintln(os.Stderr, "Error:", err)
+		if body != nil {
+			utils.PrettyPrintJSONErr(body)
+		}
 	} else {
 		utils.PrettyPrintJSON(body)
 	}

internal/cli/officers/delete.go

@@ -34,7 +34,7 @@ func deleteOfficer(id string, cfg *config.Config) {
 	if body, err := client.SendRequestAndReadResponse(deleteUrl, true, http.MethodDelete, nil); err != nil {
 		fmt.Fprintln(os.Stderr, "Error:", err)
 		if body != nil {
-			utils.PrettyPrintJSON(body)
+			utils.PrettyPrintJSONErr(body)
 		}
 	} else {
 		utils.PrettyPrintJSON(body)

internal/cli/officers/get.go

@@ -31,7 +31,7 @@ func getOfficers(uuid string, cfg *config.Config) {
 	if body, err := client.SendRequestAndReadResponse(getUrl, false, http.MethodGet, nil); err != nil {
 		fmt.Fprintln(os.Stderr, "Error:", err)
 		if body != nil {
-			utils.PrettyPrintJSON(body)
+			utils.PrettyPrintJSONErr(body)
 		}
 	} else {
 		utils.PrettyPrintJSON(body)

internal/cli/officers/post.go

@@ -47,7 +47,7 @@ func postOfficer(cfg *config.Config) {
 		bytes.NewBuffer(b)); err != nil {
 		fmt.Fprintln(os.Stderr, "Error:", err)
 		if body != nil {
-			utils.PrettyPrintJSON(body)
+			utils.PrettyPrintJSONErr(body)
 		}
 	} else {
 		utils.PrettyPrintJSON(body)

internal/cli/officers/put.go

@@ -39,7 +39,7 @@ func putOfficer(id string, cfg *config.Config) {
 	if body, err := client.SendRequestAndReadResponse(url, false, http.MethodGet, nil); err != nil {
 		fmt.Fprintln(os.Stderr, "Error:", err)
 		if body != nil {
-			utils.PrettyPrintJSON(body)
+			utils.PrettyPrintJSONErr(body)
 		}
 		return
 	} else {

utils/output.go

@@ -2,6 +2,7 @@ package utils
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/tidwall/pretty"
 )
@@ -11,3 +12,9 @@ func PrettyPrintJSON(json []byte) {
 	colorfulJSON := pretty.Color(prettyJSON, nil)
 	fmt.Print(string(colorfulJSON))
 }
+
+func PrettyPrintJSONErr(json []byte) {
+	prettyJSON := pretty.Pretty(json)
+	colorfulJSON := pretty.Color(prettyJSON, nil)
+	fmt.Fprint(os.Stderr, string(colorfulJSON))
+}