fix(kustomize): Improved file handling when mirroring files in Windows systems

Author: johanbcn

pkg/skaffold/render/renderer/kustomize/fs.go

@@ -62,7 +62,7 @@ func (f TmpFSReal) GetPath(path string) (string, error) {
 }
 
 func (f TmpFSReal) validate(path string) error {
-	if path != f.root && !strings.HasPrefix(path, f.root+"/") {
+	if path != f.root && !strings.HasPrefix(path, f.root+string(filepath.Separator)) {
 		return fmt.Errorf("temporary file system operation is out of boundary, root: %s, trying to access %s", f.root, path)
 	}
 	return nil

pkg/skaffold/render/renderer/kustomize/kustomize.go

@@ -130,7 +130,7 @@ func (k Kustomize) render(ctx context.Context, kustomizePath string, useKubectlK
 		defer fs.Cleanup()
 
 		if err := k.mirror(kustomizePath, fs); err == nil {
-			kustomizePath = filepath.Join(temp, kustomizePath)
+			kustomizePath = filepath.Join(temp, strings.TrimPrefix(kustomizePath, filepath.VolumeName(kustomizePath)))
 		} else {
 			return out, err
 		}
@@ -167,7 +167,9 @@ func (k Kustomize) mirror(kusDir string, fs TmpFS) error {
 		return err
 	}
 
-	if err := fs.WriteTo(kFile, bytes); err != nil {
+	pFile := strings.TrimPrefix(kFile, filepath.VolumeName(kFile))
+
+	if err := fs.WriteTo(pFile, bytes); err != nil {
 		return err
 	}
 
@@ -314,15 +316,18 @@ func (k Kustomize) mirrorFile(kusDir string, fs TmpFS, path string) error {
 	if sUtil.IsURL(path) {
 		return nil
 	}
-	pFile := filepath.Join(kusDir, path)
-	bytes, err := os.ReadFile(pFile)
+
+	sourceFile := filepath.Join(kusDir, path)
+	targetFile := strings.TrimPrefix(sourceFile, filepath.VolumeName(sourceFile))
+
+	bytes, err := os.ReadFile(sourceFile)
 	if err != nil {
 		return err
 	}
-	if err := fs.WriteTo(pFile, bytes); err != nil {
+	if err := fs.WriteTo(targetFile, bytes); err != nil {
 		return err
 	}
-	fsPath, err := fs.GetPath(pFile)
+	fsPath, err := fs.GetPath(targetFile)
 
 	if err != nil {
 		return err
@@ -336,7 +341,7 @@ func (k Kustomize) mirrorFile(kusDir string, fs TmpFS, path string) error {
 
 		err = k.applySetters.ApplyPath(fsPath)
 		if err != nil {
-			return fmt.Errorf("failed to apply setter to file %s, err: %v", pFile, err)
+			return fmt.Errorf("failed to apply setter to file %s, err: %v", sourceFile, err)
 		}
 	}
 	return nil

pkg/skaffold/render/renderer/kustomize/kustomize_test.go

@@ -17,7 +17,9 @@ limitations under the License.
 package kustomize
 
 import (
+	"path/filepath"
 	"slices"
+	"strings"
 	"testing"
 
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/render"
@@ -165,16 +167,27 @@ secretGenerator:
 			t_err := k.mirror(sourceDir.Root(), fs)
 
 			// Gather a list of the expected files
-			expectedFiles, err := sourceDir.List()
+			var expectedFiles []string
+
+			sourceFileList, err := sourceDir.List()
 			t.CheckNoError(err)
 
+			sourceVolName := filepath.VolumeName(sourceDir.Root())
+			if sourceVolName != "" {
+				for _, f := range sourceFileList {
+					expectedFiles = append(expectedFiles, strings.TrimPrefix(f, sourceVolName))
+				}
+			} else {
+				expectedFiles = sourceFileList
+			}
+
 			slices.Sort(expectedFiles)
 
 			// Gather a list of files that have been created by the mirror function
 			targetFileList, err := targetDir.List()
 			t.CheckNoError(err)
 
-			minPrefixLen := len(targetDir.Root()) + len(sourceDir.Root())
+			minPrefixLen := len(targetDir.Root()) + len(sourceDir.Root()) - len(sourceVolName)
 			prefixLen := len(targetDir.Root())
 
 			var mirroredFiles []string