diff --git a/cmd/apps/getapp.go b/cmd/apps/getapp.go index c698ccf0c..129eaf866 100644 --- a/cmd/apps/getapp.go +++ b/cmd/apps/getapp.go @@ -50,7 +50,7 @@ var GetCmd = &cobra.Command{ return err } // print the item - return apiclient.PrettyPrint(outBytes) + return apiclient.PrettyPrint("json", outBytes) } _, err = apps.ListApps(productName) diff --git a/internal/apiclient/clifile.go b/internal/apiclient/clifile.go index 1a177ff88..c1680d4ee 100644 --- a/internal/apiclient/clifile.go +++ b/internal/apiclient/clifile.go @@ -212,7 +212,7 @@ func GetPreferences() (err error) { return err } - return PrettyPrint(output) + return PrettyPrint("json", output) } // WritePreferencesFile diff --git a/internal/apiclient/httpclient.go b/internal/apiclient/httpclient.go index 5b0f9e3d7..4cb4ddfa4 100644 --- a/internal/apiclient/httpclient.go +++ b/internal/apiclient/httpclient.go @@ -323,16 +323,19 @@ func HttpClient(params ...string) (respBody []byte, err error) { } // PrettyPrint method prints formatted json -func PrettyPrint(body []byte) error { +func PrettyPrint(contentType string, body []byte) error { if GetCmdPrintHttpResponseSetting() && ClientPrintHttpResponse.Get() { var prettyJSON bytes.Buffer - err := json.Indent(&prettyJSON, body, "", "\t") - if err != nil { - clilog.Error.Println("error parsing response: ", err) - return err - } + //pretty print only json responses with body + if strings.Contains(contentType, "json") && len(body) > 0 { + err := json.Indent(&prettyJSON, body, "", "\t") + if err != nil { + clilog.Error.Println("error parsing response: ", err) + return err + } - clilog.HttpResponse.Println(prettyJSON.String()) + clilog.HttpResponse.Println(prettyJSON.String()) + } } return nil } @@ -438,7 +441,7 @@ func handleResponse(resp *http.Response) (respBody []byte, err error) { return nil, errors.New(getErrorMessage(resp.StatusCode)) } - return respBody, PrettyPrint(respBody) + return respBody, PrettyPrint(resp.Header.Get("Content-Type"), respBody) } func getErrorMessage(statusCode int) string { diff --git a/internal/client/env/env.go b/internal/client/env/env.go index 741862e55..872e1c8a4 100644 --- a/internal/client/env/env.go +++ b/internal/client/env/env.go @@ -112,7 +112,7 @@ func GetAllDeployments() (respBody []byte, err error) { payload := "{" + strings.Join(deployments, ",") + "}" apiclient.ClientPrintHttpResponse.Set(apiclient.GetCmdPrintHttpResponseSetting()) - err = apiclient.PrettyPrint([]byte(payload)) + err = apiclient.PrettyPrint("json", []byte(payload)) return []byte(payload), err } diff --git a/internal/client/operations/operations.go b/internal/client/operations/operations.go index bff691f42..eccf34d5d 100644 --- a/internal/client/operations/operations.go +++ b/internal/client/operations/operations.go @@ -112,7 +112,7 @@ func filterOperation(respBody []byte, state string, completeState OperationCompl } if apiclient.GetPrintOutput() { - apiclient.PrettyPrint(operationsRespBody) + apiclient.PrettyPrint("json", operationsRespBody) } return operationsRespBody, nil } diff --git a/internal/client/products/products.go b/internal/client/products/products.go index d64c13a2c..30041b337 100644 --- a/internal/client/products/products.go +++ b/internal/client/products/products.go @@ -300,7 +300,7 @@ func ListFilter(filter map[string]string) (respBody []byte, err error) { respBody, err = json.Marshal(outprds) apiclient.ClientPrintHttpResponse.Set(apiclient.GetCmdPrintHttpResponseSetting()) - _ = apiclient.PrettyPrint(respBody) + _ = apiclient.PrettyPrint("json", respBody) return respBody, err }