Merge pull request kubernetes-sigs#4653 from kersten/fix/grafana-v1alpha-avoid-shadowing-err

k8s-ci-robot · web-flow · commit 858b04b94513 · 2025-03-26T08:38:39.000-07:00
🐛 (grafana/v1alpha) avoid shadowing of 'err' in grafana plugin code generating
diff --git a/pkg/plugins/optional/grafana/v1alpha/scaffolds/edit.go b/pkg/plugins/optional/grafana/v1alpha/scaffolds/edit.go
@@ -69,8 +69,11 @@ func loadConfig(configPath string) ([]templates.CustomMetricItem, error) {
 	}
 
 	items, err := configReader(f)
+	if err != nil {
+		return nil, fmt.Errorf("error reading config.yaml: %w", err)
+	}
 
-	if err := f.Close(); err != nil {
+	if err = f.Close(); err != nil {
 		return nil, fmt.Errorf("could not close config.yaml: %w", err)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,11 @@ func loadConfig(configPath string) ([]templates.CustomMetricItem, error) {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`items, err := configReader(f)`
	`72`	`+ if err != nil {`
	`73`	`+ return nil, fmt.Errorf("error reading config.yaml: %w", err)`
	`74`	`+ }`
`72`	`75`
`73`		`- if err := f.Close(); err != nil {`
	`76`	`+ if err = f.Close(); err != nil {`
`74`	`77`	`return nil, fmt.Errorf("could not close config.yaml: %w", err)`
`75`	`78`	`}`
`76`	`79`