Merge pull request #4643 from kersten/fix/shadowed-errors-variable

k8s-ci-robot · web-flow · commit e3658a6a9e79 · 2025-03-25T13:28:40.000-07:00
🌱 (chore): avoid variable shadowing by renaming local 'errors' variable
diff --git a/pkg/model/resource/gvk.go b/pkg/model/resource/gvk.go
@@ -56,18 +56,17 @@ func (gvk GVK) Validate() error {
 	if gvk.Version == "" {
 		return errors.New(versionRequired)
 	}
-	errs := validation.IsDNS1123Subdomain(gvk.Version)
-	if len(errs) > 0 && gvk.Version != versionInternal {
+	if errs := validation.IsDNS1123Subdomain(gvk.Version); len(errs) > 0 && gvk.Version != versionInternal {
 		return fmt.Errorf("Version must respect DNS-1123 (was %s)", gvk.Version)
 	}
 
 	// Check if kind has a valid DNS1035 label value
 	if gvk.Kind == "" {
 		return errors.New(kindRequired)
 	}
-	if errors := validation.IsDNS1035Label(strings.ToLower(gvk.Kind)); len(errors) != 0 {
+	if errs := validation.IsDNS1035Label(strings.ToLower(gvk.Kind)); len(errs) != 0 {
 		// NOTE: IsDNS1035Label returns a slice of strings instead of an error, so no wrapping
-		return fmt.Errorf("invalid Kind: %#v", errors)
+		return fmt.Errorf("invalid Kind: %#v", errs)
 	}
 
 	// Require kind to start with an uppercase character

Original file line number	Diff line number	Diff line change
`@@ -56,18 +56,17 @@ func (gvk GVK) Validate() error {`
`56`	`56`	`if gvk.Version == "" {`
`57`	`57`	`return errors.New(versionRequired)`
`58`	`58`	`}`
`59`		`- errs := validation.IsDNS1123Subdomain(gvk.Version)`
`60`		`- if len(errs) > 0 && gvk.Version != versionInternal {`
	`59`	`+ if errs := validation.IsDNS1123Subdomain(gvk.Version); len(errs) > 0 && gvk.Version != versionInternal {`
`61`	`60`	`return fmt.Errorf("Version must respect DNS-1123 (was %s)", gvk.Version)`
`62`	`61`	`}`
`63`	`62`
`64`	`63`	`// Check if kind has a valid DNS1035 label value`
`65`	`64`	`if gvk.Kind == "" {`
`66`	`65`	`return errors.New(kindRequired)`
`67`	`66`	`}`
`68`		`- if errors := validation.IsDNS1035Label(strings.ToLower(gvk.Kind)); len(errors) != 0 {`
	`67`	`+ if errs := validation.IsDNS1035Label(strings.ToLower(gvk.Kind)); len(errs) != 0 {`
`69`	`68`	`// NOTE: IsDNS1035Label returns a slice of strings instead of an error, so no wrapping`
`70`		`- return fmt.Errorf("invalid Kind: %#v", errors)`
	`69`	`+ return fmt.Errorf("invalid Kind: %#v", errs)`
`71`	`70`	`}`
`72`	`71`
`73`	`72`	`// Require kind to start with an uppercase character`