diff --git a/pkg/core/ioutil/dump/dump.go b/pkg/core/ioutil/dump/dump.go index dbfbd4f1e9..ee68985b18 100644 --- a/pkg/core/ioutil/dump/dump.go +++ b/pkg/core/ioutil/dump/dump.go @@ -5,12 +5,13 @@ import ( "bytes" "encoding/json" "fmt" - "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" "io" "os" "os/exec" "strings" + "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" + "github.com/landoop/tableprinter" "gitlab.com/c0b/go-ordered-json" "gopkg.in/yaml.v2" @@ -123,7 +124,13 @@ func haveYQ(minVersion int) bool { return false } - versionStr := strings.TrimSpace(strings.TrimLeft(string(versionOutput), "yq version")) + prefixes := []string{"yq", "(https://github.com/mikefarah/yq/)", "version"} + + versionStr := string(versionOutput) + for _, p := range prefixes { + versionStr = strings.TrimSpace(strings.TrimLeft(string(versionStr), p)) + } + if versionStr == "" { return false } diff --git a/website/static/img/ux-assets/json-output.png b/website/static/img/ux-assets/json-output.png new file mode 100644 index 0000000000..36708fb4bf Binary files /dev/null and b/website/static/img/ux-assets/json-output.png differ diff --git a/website/static/img/ux-assets/list-table-format-json.png b/website/static/img/ux-assets/list-table-format-json.png new file mode 100644 index 0000000000..dbe0f18a72 Binary files /dev/null and b/website/static/img/ux-assets/list-table-format-json.png differ diff --git a/website/static/img/ux-assets/list-table-format.png b/website/static/img/ux-assets/list-table-format.png new file mode 100644 index 0000000000..47362fc82f Binary files /dev/null and b/website/static/img/ux-assets/list-table-format.png differ diff --git a/website/static/img/ux-assets/output-failure-message.png b/website/static/img/ux-assets/output-failure-message.png new file mode 100644 index 0000000000..1aad1e95e7 Binary files /dev/null and b/website/static/img/ux-assets/output-failure-message.png differ diff --git a/website/static/img/ux-assets/output-success-message.png b/website/static/img/ux-assets/output-success-message.png new file mode 100644 index 0000000000..6a0031fc5a Binary files /dev/null and b/website/static/img/ux-assets/output-success-message.png differ