Merge pull request #4689 from kersten/chore/pkg-error-msg-cleanup

🌱 (chore): wrap file and I/O errors with '%w' in 'pkg'

Author: k8s-ci-robot

pkg/model/resource/gvk.go

@@ -57,7 +57,7 @@ func (gvk GVK) Validate() error {
 		return errors.New(versionRequired)
 	}
 	if errs := validation.IsDNS1123Subdomain(gvk.Version); len(errs) > 0 && gvk.Version != versionInternal {
-		return fmt.Errorf("Version must respect DNS-1123 (was %s)", gvk.Version)
+		return fmt.Errorf("version must respect DNS-1123 (was %q)", gvk.Version)
 	}
 
 	// Check if kind has a valid DNS1035 label value

pkg/plugins/external/helpers.go

@@ -75,7 +75,7 @@ type osWdGetter struct{}
 func (o *osWdGetter) GetCurrentDir() (string, error) {
 	currentDir, err := os.Getwd()
 	if err != nil {
-		return "", fmt.Errorf("error getting current directory: %v", err)
+		return "", fmt.Errorf("error getting current directory: %w", err)
 	}
 
 	return currentDir, nil
@@ -163,7 +163,7 @@ func handlePluginResponse(fs machinery.Filesystem, req external.PluginRequest, p
 
 	currentDir, err := currentDirGetter.GetCurrentDir()
 	if err != nil {
-		return fmt.Errorf("error getting current directory: %v", err)
+		return fmt.Errorf("error getting current directory: %w", err)
 	}
 
 	for filename, data := range res.Universe {
@@ -172,7 +172,7 @@ func handlePluginResponse(fs machinery.Filesystem, req external.PluginRequest, p
 
 		// create the directory if it does not exist
 		if err := os.MkdirAll(dir, 0o750); err != nil {
-			return fmt.Errorf("error creating the directory: %v", err)
+			return fmt.Errorf("error creating the directory: %w", err)
 		}
 
 		f, err := fs.FS.Create(path)

pkg/plugins/optional/helm/v1alpha/scaffolds/init.go

@@ -118,13 +118,13 @@ func (s *initScaffolder) Scaffold() error {
 	}
 
 	if err = scaffold.Execute(buildScaffold...); err != nil {
-		return fmt.Errorf("error scaffolding helm-chart manifests: %v", err)
+		return fmt.Errorf("error scaffolding helm-chart manifests: %w", err)
 	}
 
 	// Copy relevant files from config/ to dist/chart/templates/
 	err = s.copyConfigFiles()
 	if err != nil {
-		return fmt.Errorf("failed to copy manifests from config to dist/chart/templates/: %v", err)
+		return fmt.Errorf("failed to copy manifests from config to dist/chart/templates/: %w", err)
 	}
 
 	return nil
@@ -170,7 +170,7 @@ func (s *initScaffolder) extractWebhooksFromGeneratedFiles() (mutatingWebhooks [
 	content, err := os.ReadFile(manifestFile)
 	if err != nil {
 		return nil, nil,
-			fmt.Errorf("failed to read %s: %w", manifestFile, err)
+			fmt.Errorf("failed to read %q: %w", manifestFile, err)
 	}
 
 	docs := strings.Split(string(content), "---")
@@ -256,7 +256,7 @@ func (s *initScaffolder) copyConfigFiles() error {
 
 		// Ensure destination directory exists
 		if err := os.MkdirAll(dir.DestDir, os.ModePerm); err != nil {
-			return fmt.Errorf("failed to create directory %s: %v", dir.DestDir, err)
+			return fmt.Errorf("failed to create directory %q: %w", dir.DestDir, err)
 		}
 
 		for _, srcFile := range files {
@@ -462,23 +462,23 @@ func getCRDPatchContent(kind, group string) (string, bool, error) {
 	groupKindPattern := fmt.Sprintf("config/crd/patches/webhook_*%s*%s*.yaml", group, kind)
 	patchFiles, err := filepath.Glob(groupKindPattern)
 	if err != nil {
-		return "", false, fmt.Errorf("failed to list patches: %v", err)
+		return "", false, fmt.Errorf("failed to list patches: %w", err)
 	}
 
 	// If no group-specific patch found, search for patches that contain only "webhook" and the kind
 	if len(patchFiles) == 0 {
 		kindOnlyPattern := fmt.Sprintf("config/crd/patches/webhook_*%s*.yaml", kind)
 		patchFiles, err = filepath.Glob(kindOnlyPattern)
 		if err != nil {
-			return "", false, fmt.Errorf("failed to list patches: %v", err)
+			return "", false, fmt.Errorf("failed to list patches: %w", err)
 		}
 	}
 
 	// Read the first matching patch file (if any)
 	if len(patchFiles) > 0 {
 		patchContent, err := os.ReadFile(patchFiles[0])
 		if err != nil {
-			return "", false, fmt.Errorf("failed to read patch file %s: %v", patchFiles[0], err)
+			return "", false, fmt.Errorf("failed to read patch file %q: %w", patchFiles[0], err)
 		}
 		return string(patchContent), true, nil
 	}