Merge pull request #60919 from dixudx/file_visit_error_info

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. include file name in the error when visiting files **What this PR does / why we need it**: /kind bug /sig cli **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #60916 **Special notes for your reviewer**: /cc @kubernetes/sig-cli-api-reviews **Release note**: ```release-note include file name in the error when visiting files ```

Merge pull request #60919 from dixudx/file_visit_error_info
3e559632 · Kubernetes Submit Queue · GitHub · 7fa3c9fa · a08cb5b5 · 3e559632
Unverified Commit 3e559632 authored Mar 20, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 20, 2018
Showing with 3 additions and 3 deletions

2.original .../testcase-apply-edit-last-applied-syntax-error/2.original +1 -1

2.original ...ubectl/cmd/testdata/edit/testcase-syntax-error/2.original +1 -1

visitor.go pkg/kubectl/resource/visitor.go +1 -1

No files found.
--- a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/2.original
+++ b/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-syntax-error/2.original
 # Please edit the 'last-applied-configuration' annotations below.
 # Lines beginning with a '#' will be ignored, and an empty file will abort the edit.
 #
-# The edited file had a syntax error: error converting YAML to JSON: yaml: line 12: could not find expected ':'
+# The edited file had a syntax error: error parsing edited-file: error converting YAML to JSON: yaml: line 12: could not find expected ':'
 #
 kind: Service
 metadata:

--- a/pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/2.original
+++ b/pkg/kubectl/cmd/testdata/edit/testcase-syntax-error/2.original
@@ -2,7 +2,7 @@
 # and an empty file will abort the edit. If an error occurs while saving this file will be
 # reopened with the relevant failures.
 #
-# The edited file had a syntax error: error converting YAML to JSON: yaml: line 17: could not find expected ':'
+# The edited file had a syntax error: error parsing edited-file: error converting YAML to JSON: yaml: line 17: could not find expected ':'
 #
 apiVersion: v1
 kind: Service

--- a/pkg/kubectl/resource/visitor.go
+++ b/pkg/kubectl/resource/visitor.go
@@ -578,7 +578,7 @@ func (v *StreamVisitor) Visit(fn VisitorFunc) error {
 			if err == io.EOF {
 				return nil
 			}
-			return err
+			return fmt.Errorf("error parsing %s: %v", v.Source, err)
 		}
 		// TODO: This needs to be able to handle object in other encodings and schemas.
 		ext.Raw = bytes.TrimSpace(ext.Raw)