Merge pull request #4774 from chewong/unmarshal-to-pointer

k8s-ci-robot · web-flow · commit f13f7bcdda51 · 2021-06-08T16:29:47.000-07:00
🐛 unmarshal data to a pointer when parsing kubetest config
diff --git a/test/framework/kubetest/run.go b/test/framework/kubetest/run.go
@@ -183,7 +183,7 @@ func parseKubetestConfig(kubetestConfigFile string) (kubetestConfig, error) {
 	if err != nil {
 		return nil, fmt.Errorf("unable to read kubetest config file %s: %w", kubetestConfigFile, err)
 	}
-	if err := yaml.Unmarshal(data, conf); err != nil {
+	if err := yaml.Unmarshal(data, &conf); err != nil {
 		return nil, fmt.Errorf("unable to parse kubetest config file %s as valid, non-nested YAML: %w", kubetestConfigFile, err)
 	}
 	return conf, nil

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ func parseKubetestConfig(kubetestConfigFile string) (kubetestConfig, error) {`
`183`	`183`	`if err != nil {`
`184`	`184`	`return nil, fmt.Errorf("unable to read kubetest config file %s: %w", kubetestConfigFile, err)`
`185`	`185`	`}`
`186`		`- if err := yaml.Unmarshal(data, conf); err != nil {`
	`186`	`+ if err := yaml.Unmarshal(data, &conf); err != nil {`
`187`	`187`	`return nil, fmt.Errorf("unable to parse kubetest config file %s as valid, non-nested YAML: %w", kubetestConfigFile, err)`
`188`	`188`	`}`
`189`	`189`	`return conf, nil`