Mention template filename in error message. (#1401)

Signed-off-by: Marcin Owsiany <mowsiany@D2iQ.com>
kudobuilder · Mar 9, 2020 · 6bd083d · 6bd083d
1 parent 3ba890c
commit 6bd083d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/pkg/engine/renderer/enhancer.go b/pkg/engine/renderer/enhancer.go
@@ -33,10 +33,10 @@ type DefaultEnhancer struct {
 func (de *DefaultEnhancer) Apply(templates map[string]string, metadata Metadata) (objsToAdd []runtime.Object, err error) {
 	objs := make([]runtime.Object, 0, len(templates))
 
-	for _, v := range templates {
+	for name, v := range templates {
 		parsed, err := YamlToObject(v)
 		if err != nil {
-			return nil, fmt.Errorf("parsing YAML failed: %v", err)
+			return nil, fmt.Errorf("parsing YAML from %s failed: %v", name, err)
 		}
 		for _, obj := range parsed {
 			unstructMap, err := runtime.DefaultUnstructuredConverter.ToUnstructured(obj)

diff --git a/pkg/kudoctl/packages/verifier/template/verify_render.go b/pkg/kudoctl/packages/verifier/template/verify_render.go
@@ -58,13 +58,13 @@ func templateCompilable(pf *packages.Files) verifier.Result {
 		// Render the template
 		s, err := engine.Render(k, v, configs)
 		if err != nil {
-			res.AddErrors(err.Error())
+			res.AddErrors(fmt.Sprintf("rendering template %s failed: %v", k, err))
 		}
 
 		// Try to parse rendered template as valid Kubernetes objects
 		_, err = renderer.YamlToObject(s)
 		if err != nil {
-			res.AddErrors(err.Error())
+			res.AddErrors(fmt.Sprintf("parsing rendered YAML from %s failed: %v", k, err))
 		}
 	}
 

diff --git a/pkg/kudoctl/packages/verifier/template/verify_render_test.go b/pkg/kudoctl/packages/verifier/template/verify_render_test.go
@@ -28,7 +28,7 @@ func TestTemplateRenderVerifier(t *testing.T) {
 
 	assert.Equal(t, 0, len(res.Warnings))
 	assert.Equal(t, 1, len(res.Errors))
-	assert.Equal(t, `error rendering template: template: foo.yaml:2:6: executing "foo.yaml" at <eq>: wrong number of args for eq: want at least 1 got 0`, res.Errors[0])
+	assert.Equal(t, `rendering template foo.yaml failed: error rendering template: template: foo.yaml:2:6: executing "foo.yaml" at <eq>: wrong number of args for eq: want at least 1 got 0`, res.Errors[0])
 }
 
 func TestTemplateRenderVerifier_InvalidYAML(t *testing.T) {
@@ -59,7 +59,7 @@ spec:
 	assert.Equal(t, 0, len(res.Warnings))
 	assert.Equal(t, 1, len(res.Errors))
 	assert.Equal(t,
-		`decoding chunk "\napiVersion: batch/v1\nkind: Job\nmetadata:\n  name: backup\nspec:\n  template:\n    spec:\n      containers:\n        - name: backup\n`+
+		`parsing rendered YAML from foo.yaml failed: decoding chunk "\napiVersion: batch/v1\nkind: Job\nmetadata:\n  name: backup\nspec:\n  template:\n    spec:\n      containers:\n        - name: backup\n`+
 			`       restartPolicy: Never\n" failed: error converting YAML to JSON: yaml: line 10: did not find expected key`, res.Errors[0])
 }