Merge pull request #1994 from 2opremio/fix-error-shadowing

Fix error shadowing when parsing manifests
fluxcd · Apr 29, 2019 · f592d43 · f592d43
2 parents 4bf1f14 + ba650c0
commit f592d43
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/cluster/kubernetes/resource/load.go b/cluster/kubernetes/resource/load.go
@@ -140,7 +140,7 @@ func ParseMultidoc(multidoc []byte, source string) (map[string]KubeManifest, err
 		// NOTE: gopkg.in/yaml.v3 supports round tripping comments
 		//       by using `gopkg.in/yaml.v3.Node`.
 		var val interface{}
-		if err := decoder.Decode(&val); err != nil {
+		if err = decoder.Decode(&val); err != nil {
 			break
 		}
 		bytes, err := yaml.Marshal(val)

diff --git a/cluster/kubernetes/resource/load_test.go b/cluster/kubernetes/resource/load_test.go
@@ -142,6 +142,18 @@ metadata:
 	assert.Len(t, resources, 1)
 }
 
+func TestParseError(t *testing.T) {
+	doc := `---
+kind: ConfigMap
+metadata:
+	name: bigmap # contains a tab at the beginning
+`
+	buffer := bytes.NewBufferString(doc)
+
+	_, err := ParseMultidoc(buffer.Bytes(), "test")
+	assert.Error(t, err)
+}
+
 func TestParseCronJob(t *testing.T) {
 	doc := `---
 apiVersion: batch/v1beta1