Merge pull request #4743 from rhcarvalho/followup-pr4660-new-app-err-msg

Merged by openshift-bot

pkg/generate/app/templatelookup.go

@@ -1,6 +1,7 @@
 package app
 
 import (
+	"encoding/json"
 	"fmt"
 	"strings"
 
@@ -117,6 +118,9 @@ func (r *TemplateFileSearcher) Search(precise bool, terms ...string) (ComponentM
 			case strings.Contains(err.Error(), "does not exist") && strings.Contains(err.Error(), "the path"):
 				continue
 			default:
+				if syntaxErr, ok := err.(*json.SyntaxError); ok {
+					err = fmt.Errorf("at offset %d: %v", syntaxErr.Offset, err)
+				}
 				errs = append(errs, fmt.Errorf("unable to load template file %q: %v", term, err))
 				continue
 			}

test/cmd/newapp.sh

@@ -163,7 +163,7 @@ os::cmd::expect_success 'oc new-app https://github.com/openshift/ruby-hello-worl
 os::cmd::expect_success 'oc delete all -l app=ruby'
 # check for error when template JSON file has errors
 jsonfile="${OS_ROOT}/test/fixtures/invalid.json"
-os::cmd::expect_failure_and_text "oc new-app '${jsonfile}'" "error: unable to load template file \"${jsonfile}\": invalid character '}' after object key"
+os::cmd::expect_failure_and_text "oc new-app '${jsonfile}'" "error: unable to load template file \"${jsonfile}\": at offset 8: invalid character '}' after object key"
 
 # check new-build
 os::cmd::expect_failure_and_text 'oc new-build mysql -o yaml' 'you must specify at least one source repository URL'