wip

koba1t · koba1t · commit 7c0d1cd47f32 · 2025-11-20T00:20:47.000+09:00
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -114,7 +114,23 @@ jobs:
       with:
         go-version-file: go.work
       id: go
-    - name: Test all modules
-      run: make test-unit-non-plugin
+    ## Windows has significant differences from POSIX-compliant OS.
+    ## so it only runs tests for the modules that are released.
+    - name: Test kyaml
+      run: make test
+      working-directory: ./kyaml
+    - name: Test cmd/config
+      run: make test
+      working-directory: ./cmd/config
+      env:
+        KUSTOMIZE_DOCKER_E2E: false # docker on windows not working well yet
+    - name: Test api
+      run: go test -cover ./... -ldflags "-X sigs.k8s.io/kustomize/api/provenance.buildDate=2023-01-31T23:38:41Z -X sigs.k8s.io/kustomize/api/provenance.version=(test)"
+      working-directory: ./api
+      env:
+        KUSTOMIZE_DOCKER_E2E: false # docker on windows not working well yet
+    - name: Test kustomize
+      run: go test -cover ./...
+      working-directory: ./kustomize
       env:
         KUSTOMIZE_DOCKER_E2E: false # docker on windows not working well yet
diff --git a/Makefile-modules.mk b/Makefile-modules.mk
@@ -8,7 +8,9 @@ endif
 export PATH := $(MYGOBIN):$(PATH)
 
 # only set this if not already set, so importing makefiles can override it
-export KUSTOMIZE_ROOT ?= $(shell pwd | sed -E 's|(.*\/kustomize)/(.*)|\1|')
+export KUSTOMIZE_ROOT ?= $(shell git rev-parse --show-toplevel)
+# Calculate the relative path from repo root, removing trailing slash if present
+RELATIVE_PATH = $(shell git rev-parse --show-prefix 2>/dev/null | sed 's|/$$||' 2>/dev/null)
 include $(KUSTOMIZE_ROOT)/Makefile-tools.mk
 
 .PHONY: lint test fix fmt tidy vet build
@@ -17,7 +19,7 @@ lint: $(MYGOBIN)/golangci-lint
 	$(MYGOBIN)/golangci-lint cache clean # Workaround for https://github.com/golangci/golangci-lint/issues/3228
 	$(MYGOBIN)/golangci-lint \
 	  -c $$KUSTOMIZE_ROOT/.golangci.yml \
-	  --path-prefix $(shell pwd | sed -E 's|(.*\/kustomize)/(.*)|\2|') \
+	  --path-prefix $(RELATIVE_PATH) \
 	  run ./...
 
 test:
diff --git a/api/Makefile b/api/Makefile
@@ -7,7 +7,7 @@ test:
 	go test -v -timeout 45m -cover ./... -ldflags "-X sigs.k8s.io/kustomize/api/provenance.buildDate=2023-01-31T23:38:41Z -X sigs.k8s.io/kustomize/api/provenance.version=(test)"
 
 build:
-	go build -ldflags "-X sigs.k8s.io/kustomize/api/provenance.buildDate=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")" ./...
+	go build ./...
 
 generate: $(MYGOBIN)/k8scopy $(MYGOBIN)/stringer
 	go generate ./...
diff --git a/api/internal/loader/fileloader.go b/api/internal/loader/fileloader.go
@@ -238,7 +238,7 @@ func (fl *FileLoader) errIfGitContainmentViolation(
 			"security; bases in kustomizations found in "+
 				"cloned git repos must be within the repo, "+
 				"but base '%s' is outside '%s'",
-			base, containingRepo.CloneDir())
+			filepath.ToSlash(base.String()), filepath.ToSlash(containingRepo.CloneDir().String()))
 	}
 	return nil
 }
diff --git a/api/internal/loader/fileloader_test.go b/api/internal/loader/fileloader_test.go
@@ -401,7 +401,7 @@ whatever
 	require.NoError(err)
 	repo := l.Repo()
 	require.Equal(coRoot, repo)
-	require.Equal(coRoot+"/"+pathInRepo, l.Root())
+	require.Equal(coRoot+"/"+pathInRepo, filepath.ToSlash(l.Root()))
 
 	_, err = l.New(url)
 	require.Error(err)
diff --git a/api/internal/localizer/localizer_test.go b/api/internal/localizer/localizer_test.go
@@ -1,6 +1,10 @@
 // Copyright 2022 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
+// TODO: Skip on Windows due to this test depends onposix-OS specific filepath.
+//go:build !windows
+// +build !windows
+
 package localizer_test
 
 import (
diff --git a/api/internal/localizer/locloader_test.go b/api/internal/localizer/locloader_test.go
@@ -1,6 +1,10 @@
 // Copyright 2022 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
+// TODO: Skip on Windows due to this test depends onposix-OS specific filepath.
+//go:build !windows
+// +build !windows
+
 package localizer_test
 
 import (
diff --git a/api/internal/localizer/util_test.go b/api/internal/localizer/util_test.go
@@ -317,6 +317,8 @@ func TestLocRootPath_SymlinkPath(t *testing.T) {
 }
 
 func TestCleanedRelativePath(t *testing.T) {
+	// Skip on Windows due to path separator differences
+	testutil.SkipWindows(t)
 	fSys := filesys.MakeFsInMemory()
 	// Use platform-appropriate root path
 	rootPath := string(filepath.Separator) + "root"
diff --git a/api/internal/target/kusttarget_configplugin.go b/api/internal/target/kusttarget_configplugin.go
@@ -49,7 +49,7 @@ func (kt *KustTarget) configureBuiltinGenerators() (
 			generatorOrigin = &resource.Origin{
 				Repo:         kt.origin.Repo,
 				Ref:          kt.origin.Ref,
-				ConfiguredIn: filepath.Join(kt.origin.Path, kt.kustFileName),
+				ConfiguredIn: filepath.ToSlash(filepath.Join(kt.origin.Path, kt.kustFileName)),
 				ConfiguredBy: yaml.ResourceIdentifier{
 					TypeMeta: yaml.TypeMeta{
 						APIVersion: "builtin",
@@ -58,7 +58,6 @@ func (kt *KustTarget) configureBuiltinGenerators() (
 				},
 			}
 		}
-
 		for i := range r {
 			result = append(result, &resmap.GeneratorWithProperties{Generator: r[i], Origin: generatorOrigin})
 		}
@@ -92,7 +91,7 @@ func (kt *KustTarget) configureBuiltinTransformers(
 			transformerOrigin = &resource.Origin{
 				Repo:         kt.origin.Repo,
 				Ref:          kt.origin.Ref,
-				ConfiguredIn: filepath.Join(kt.origin.Path, kt.kustFileName),
+				ConfiguredIn: filepath.ToSlash(filepath.Join(kt.origin.Path, kt.kustFileName)),
 				ConfiguredBy: yaml.ResourceIdentifier{
 					TypeMeta: yaml.TypeMeta{
 						APIVersion: "builtin",
diff --git a/api/krusty/accumulation_test.go b/api/krusty/accumulation_test.go
@@ -17,6 +17,7 @@ import (
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/krusty"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
+	"sigs.k8s.io/kustomize/kyaml/testutil"
 )
 
 const validResource = `
@@ -184,6 +185,8 @@ spec:
 }
 
 func TestAccumulateResourcesErrors(t *testing.T) {
+	// Skip on Windows due to posix-OS specific error messages.
+	testutil.SkipWindows(t)
 	type testcase struct {
 		name     string
 		resource string
diff --git a/api/krusty/component_test.go b/api/krusty/component_test.go
@@ -11,6 +11,7 @@ import (
 	"sigs.k8s.io/kustomize/api/internal/loader"
 	"sigs.k8s.io/kustomize/api/konfig"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
+	"sigs.k8s.io/kustomize/kyaml/testutil"
 )
 
 type FileGen func(kusttest_test.Harness)
@@ -507,6 +508,7 @@ spec:
 }
 
 func TestComponentErrors(t *testing.T) {
+	testutil.SkipWindows(t)
 	testCases := map[string]struct {
 		input         []FileGen
 		runPath       string
diff --git a/api/krusty/originannotation_test.go b/api/krusty/originannotation_test.go
@@ -14,6 +14,7 @@ import (
 	"sigs.k8s.io/kustomize/api/krusty"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
+	"sigs.k8s.io/kustomize/kyaml/testutil"
 )
 
 const generateDeploymentDotSh = `#!/bin/sh
@@ -437,6 +438,7 @@ metadata:
 }
 
 func TestAnnoOriginCustomExecGenerator(t *testing.T) {
+	testutil.SkipWindows(t)
 	fSys := filesys.MakeFsOnDisk()
 
 	th := kusttest_test.MakeHarnessWithFs(t, fSys)
@@ -531,6 +533,7 @@ spec:
 }
 
 func TestAnnoOriginCustomInlineExecGenerator(t *testing.T) {
+	testutil.SkipWindows(t)
 	fSys := filesys.MakeFsOnDisk()
 
 	th := kusttest_test.MakeHarnessWithFs(t, fSys)
@@ -621,6 +624,7 @@ spec:
 }
 
 func TestAnnoOriginCustomExecGeneratorWithOverlay(t *testing.T) {
+	testutil.SkipWindows(t)
 	fSys := filesys.MakeFsOnDisk()
 
 	th := kusttest_test.MakeHarnessWithFs(t, fSys)
@@ -721,6 +725,7 @@ spec:
 }
 
 func TestAnnoOriginCustomInlineExecGeneratorWithOverlay(t *testing.T) {
+	testutil.SkipWindows(t)
 	fSys := filesys.MakeFsOnDisk()
 
 	th := kusttest_test.MakeHarnessWithFs(t, fSys)
@@ -817,6 +822,9 @@ spec:
 }
 
 func TestAnnoOriginRemoteBuiltinGenerator(t *testing.T) {
+	// Skip on Windows: Git's core.autocrlf converts LF to CRLF when cloning,
+	// which changes file content and results in different ConfigMap hash values
+	testutil.SkipWindows(t)
 	fSys := filesys.MakeFsOnDisk()
 	b := krusty.MakeKustomizer(krusty.MakeDefaultOptions())
 	tmpDir, err := filesys.NewTmpConfirmedDir()
@@ -1031,6 +1039,7 @@ metadata:
 }
 
 func TestAnnoOriginGeneratorInTransformersField(t *testing.T) {
+	testutil.SkipWindows(t)
 	fSys := filesys.MakeFsOnDisk()
 
 	th := kusttest_test.MakeHarnessWithFs(t, fSys)
@@ -1093,6 +1102,7 @@ spec:
 }
 
 func TestAnnoOriginGeneratorInTransformersFieldWithOverlay(t *testing.T) {
+	testutil.SkipWindows(t)
 	fSys := filesys.MakeFsOnDisk()
 
 	th := kusttest_test.MakeHarnessWithFs(t, fSys)
diff --git a/api/krusty/pluginenv_test.go b/api/krusty/pluginenv_test.go
@@ -11,12 +11,14 @@ import (
 	"sigs.k8s.io/kustomize/api/konfig"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
+	"sigs.k8s.io/kustomize/kyaml/testutil"
 )
 
 // The PrintPluginEnv plugin is a toy plugin that emits
 // its working directory and some environment variables,
 // to add regression protection to plugin loading logic.
 func TestPluginEnvironment(t *testing.T) {
+	testutil.SkipWindows(t)
 	th := kusttest_test.MakeEnhancedHarness(t).
 		PrepExecPlugin(
 			"someteam.example.com", "v1", "PrintPluginEnv")
diff --git a/api/krusty/remoteloader_test.go b/api/krusty/remoteloader_test.go
@@ -279,7 +279,7 @@ spec:
 resources:
 - file:///not/a/real/repo
 `,
-			err: "fatal: '/not/a/real/repo' does not appear to be a git repository",
+			err: `fatal: '.*not/a/real/repo' does not appear to be a git repository`,
 		},
 	}
 
@@ -291,7 +291,7 @@ resources:
 				t.SkipNow()
 			}
 
-			kust := strings.ReplaceAll(test.kustomization, "$ROOT", repos.root)
+			kust := strings.ReplaceAll(test.kustomization, "$ROOT", filepath.ToSlash(repos.root))
 			fSys, tmpDir := kusttest_test.CreateKustDir(t, kust)
 
 			b := krusty.MakeKustomizer(krusty.MakeDefaultOptions())
@@ -304,7 +304,7 @@ resources:
 				require.Regexp(t, test.err, err.Error())
 			} else {
 				require.NoError(t, err)
-				checkYaml(t, m, strings.ReplaceAll(test.expected, "$ROOT", repos.root))
+				checkYaml(t, m, strings.ReplaceAll(test.expected, "$ROOT", filepath.ToSlash(repos.root)))
 			}
 		})
 	}
diff --git a/api/krusty/transformerannotation_test.go b/api/krusty/transformerannotation_test.go
@@ -14,6 +14,7 @@ import (
 	"sigs.k8s.io/kustomize/api/krusty"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
+	"sigs.k8s.io/kustomize/kyaml/testutil"
 )
 
 const generateDeploymentWithOriginDotSh = `#!/bin/sh
@@ -350,6 +351,7 @@ metadata:
 }
 
 func TestAnnoOriginCustomInlineTransformer(t *testing.T) {
+	testutil.SkipWindows(t)
 	fSys := filesys.MakeFsOnDisk()
 
 	th := kusttest_test.MakeHarnessWithFs(t, fSys)
@@ -422,6 +424,7 @@ spec:
 }
 
 func TestAnnoOriginCustomExecTransformerWithOverlay(t *testing.T) {
+	testutil.SkipWindows(t)
 	fSys := filesys.MakeFsOnDisk()
 
 	th := kusttest_test.MakeHarnessWithFs(t, fSys)
diff --git a/api/krusty/transformerplugin_test.go b/api/krusty/transformerplugin_test.go
@@ -8,6 +8,7 @@ import (
 
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kyaml/testutil"
 )
 
 func writeStringPrefixer(th *kusttest_test.HarnessEnhanced, path, name string) {
@@ -20,6 +21,7 @@ metadata:
 }
 
 func TestPluginsNotEnabled(t *testing.T) {
+	testutil.SkipWindows(t)
 	th := kusttest_test.MakeEnhancedHarness(t).
 		BuildGoPlugin("someteam.example.com", "v1", "StringPrefixer")
 	defer th.Reset()
@@ -39,6 +41,7 @@ transformers:
 }
 
 func TestSedTransformer(t *testing.T) {
+	testutil.SkipWindows(t)
 	th := kusttest_test.MakeEnhancedHarness(t).
 		PrepExecPlugin("someteam.example.com", "v1", "SedTransformer")
 	defer th.Reset()
diff --git a/api/resource/origin.go b/api/resource/origin.go
@@ -5,6 +5,7 @@ package resource
 
 import (
 	"path"
+	"path/filepath"
 	"strings"
 
 	"sigs.k8s.io/kustomize/api/internal/git"
@@ -60,7 +61,7 @@ func (origin *Origin) Append(inputPath string) *Origin {
 		originCopy.Path = ""
 		originCopy.Ref = repoSpec.Ref
 	}
-	originCopy.Path = path.Join(originCopy.Path, inputPath)
+	originCopy.Path = filepath.ToSlash(path.Join(originCopy.Path, inputPath))
 	return &originCopy
 }
 
@@ -91,7 +92,7 @@ func OriginFromCustomPlugin(res *Resource) (*Origin, error) {
 		result = &Origin{
 			Repo:         origin.Repo,
 			Ref:          origin.Ref,
-			ConfiguredIn: origin.Path,
+			ConfiguredIn: filepath.ToSlash(origin.Path),
 			ConfiguredBy: kyaml.ResourceIdentifier{
 				TypeMeta: kyaml.TypeMeta{
 					APIVersion: res.GetApiVersion(),
diff --git a/api/testutils/kusttest/plugintestenv.go b/api/testutils/kusttest/plugintestenv.go
@@ -11,6 +11,7 @@ import (
 	"sigs.k8s.io/kustomize/api/internal/plugins/utils"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
+	"sigs.k8s.io/kustomize/kyaml/testutil"
 )
 
 // pluginTestEnv manages compiling plugins for tests.
@@ -56,6 +57,7 @@ func (x *pluginTestEnv) reset() {
 // prepareGoPlugin compiles a Go plugin, leaving the newly
 // created object code alongside the src code.
 func (x *pluginTestEnv) prepareGoPlugin(g, v, k string) {
+	testutil.SkipWindows(x.t)
 	x.compiler.SetGVK(g, v, k)
 	err := x.compiler.Compile()
 	if err != nil {
diff --git a/cmd/gorepomod/internal/misc/moduleshortname.go b/cmd/gorepomod/internal/misc/moduleshortname.go
@@ -4,7 +4,6 @@
 package misc
 
 import (
-	"path/filepath"
 	"strings"
 )
 
@@ -22,5 +21,6 @@ func (m ModuleShortName) Depth() int {
 	if m == ModuleAtTop || m == ModuleUnknown {
 		return 0
 	}
-	return strings.Count(string(m), string(filepath.Separator)) + 1
+	// Module paths always use forward slashes, regardless of OS
+	return strings.Count(string(m), "/") + 1
 }
diff --git a/kyaml/filesys/confirmeddir.go b/kyaml/filesys/confirmeddir.go
@@ -63,13 +63,13 @@ func NewTmpConfirmedDir() (ConfirmedDir, error) {
 //	https://github.com/golang/dep/blob/master/internal/fs/fs.go#L33
 //	https://codereview.appspot.com/5712045
 func (d ConfirmedDir) HasPrefix(path ConfirmedDir) bool {
-	if path.String() == string(filepath.Separator) || path == d {
-		return true
-	}
 	// Normalize both paths to use forward slashes for comparison
 	// to handle cross-platform differences (Windows uses backslashes)
 	normalizedD := filepath.ToSlash(string(d))
 	normalizedPath := filepath.ToSlash(string(path))
+	if normalizedPath == "/" || normalizedD == normalizedPath {
+		return true
+	}
 	return strings.HasPrefix(
 		normalizedD,
 		normalizedPath+"/")
diff --git a/kyaml/filesys/util.go b/kyaml/filesys/util.go
diff --git a/kyaml/filesys/util_windows_test.go b/kyaml/filesys/util_windows_test.go

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ func (fl *FileLoader) errIfGitContainmentViolation(`
`238`	`238`	`"security; bases in kustomizations found in "+`
`239`	`239`	`"cloned git repos must be within the repo, "+`
`240`	`240`	`"but base '%s' is outside '%s'",`
`241`		`- base, containingRepo.CloneDir())`
	`241`	`+ filepath.ToSlash(base.String()), filepath.ToSlash(containingRepo.CloneDir().String()))`
`242`	`242`	`}`
`243`	`243`	`return nil`
`244`	`244`	`}`
Original file line number	Diff line number	Diff line change
`@@ -317,6 +317,8 @@ func TestLocRootPath_SymlinkPath(t *testing.T) {`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`func TestCleanedRelativePath(t *testing.T) {`
	`320`	`+ // Skip on Windows due to path separator differences`
	`321`	`+ testutil.SkipWindows(t)`
`320`	`322`	`fSys := filesys.MakeFsInMemory()`
`321`	`323`	`// Use platform-appropriate root path`
`322`	`324`	`rootPath := string(filepath.Separator) + "root"`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ import (`
`17`	`17`	`"sigs.k8s.io/kustomize/api/konfig"`
`18`	`18`	`"sigs.k8s.io/kustomize/api/krusty"`
`19`	`19`	`kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"`
	`20`	`+ "sigs.k8s.io/kustomize/kyaml/testutil"`
`20`	`21`	`)`
`21`	`22`
`22`	`23`	const validResource = `
`@@ -184,6 +185,8 @@ spec:`
`184`	`185`	`}`
`185`	`186`
`186`	`187`	`func TestAccumulateResourcesErrors(t *testing.T) {`
	`188`	`+ // Skip on Windows due to posix-OS specific error messages.`
	`189`	`+ testutil.SkipWindows(t)`
`187`	`190`	`type testcase struct {`
`188`	`191`	`name string`
`189`	`192`	`resource string`