From 44b5acad5196bd30ef7704c4fde96d5b94ae6f03 Mon Sep 17 00:00:00 2001 From: monopole Date: Sun, 10 Jan 2021 20:35:55 -0800 Subject: [PATCH] Clarify var-related error message. --- api/filters/refvar/refvar.go | 4 +++- api/filters/refvar/refvar_test.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/api/filters/refvar/refvar.go b/api/filters/refvar/refvar.go index 822d20b49..9614c5397 100644 --- a/api/filters/refvar/refvar.go +++ b/api/filters/refvar/refvar.go @@ -78,7 +78,9 @@ func (f Filter) setMap(node *yaml.RNode) error { contents := node.YNode().Content for i := 0; i < len(contents); i += 2 { if !yaml.IsYNodeString(contents[i]) { - return fmt.Errorf("invalid map key: %s, type: %s", contents[i].Value, contents[i].Tag) + return fmt.Errorf( + "invalid map key: value='%s', tag='%s'", + contents[i].Value, contents[i].Tag) } if !yaml.IsYNodeString(contents[i+1]) { continue diff --git a/api/filters/refvar/refvar_test.go b/api/filters/refvar/refvar_test.go index 4d92ef703..fdeed0982 100644 --- a/api/filters/refvar/refvar_test.go +++ b/api/filters/refvar/refvar_test.go @@ -272,7 +272,7 @@ metadata: config.kubernetes.io/index: '0' data: 1: str -' at path 'data': invalid map key: 1, type: ` + yaml.NodeTagInt, +' at path 'data': invalid map key: value='1', tag='` + yaml.NodeTagInt + `'`, filter: Filter{ MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{ "VAR": int64(5),