Skip to content

Commit ec7b657

Browse files
koba1tkoba1t
committed
wip
1 parent c1bd618 commit ec7b657

File tree

13 files changed

+42
-20
lines changed

13 files changed

+42
-20
lines changed

‎api/internal/loader/fileloader.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ func (fl *FileLoader) errIfGitContainmentViolation(
238238
"security; bases in kustomizations found in "+
239239
"cloned git repos must be within the repo, "+
240240
"but base '%s' is outside '%s'",
241-
base, containingRepo.CloneDir())
241+
filepath.ToSlash(base.String()), filepath.ToSlash(containingRepo.CloneDir().String()))
242242
}
243243
return nil
244244
}

‎api/internal/loader/fileloader_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ whatever
401401
require.NoError(err)
402402
repo := l.Repo()
403403
require.Equal(coRoot, repo)
404-
require.Equal(coRoot+"/"+pathInRepo, l.Root())
404+
require.Equal(coRoot+"/"+pathInRepo, filepath.ToSlash(l.Root()))
405405

406406
_, err = l.New(url)
407407
require.Error(err)

‎api/internal/target/kusttarget_configplugin.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func (kt *KustTarget) configureBuiltinGenerators() (
4949
generatorOrigin = &resource.Origin{
5050
Repo: kt.origin.Repo,
5151
Ref: kt.origin.Ref,
52-
ConfiguredIn: filepath.Join(kt.origin.Path, kt.kustFileName),
52+
ConfiguredIn: filepath.ToSlash(filepath.Join(kt.origin.Path, kt.kustFileName)),
5353
ConfiguredBy: yaml.ResourceIdentifier{
5454
TypeMeta: yaml.TypeMeta{
5555
APIVersion: "builtin",
@@ -58,7 +58,6 @@ func (kt *KustTarget) configureBuiltinGenerators() (
5858
},
5959
}
6060
}
61-
6261
for i := range r {
6362
result = append(result, &resmap.GeneratorWithProperties{Generator: r[i], Origin: generatorOrigin})
6463
}
@@ -92,7 +91,7 @@ func (kt *KustTarget) configureBuiltinTransformers(
9291
transformerOrigin = &resource.Origin{
9392
Repo: kt.origin.Repo,
9493
Ref: kt.origin.Ref,
95-
ConfiguredIn: filepath.Join(kt.origin.Path, kt.kustFileName),
94+
ConfiguredIn: filepath.ToSlash(filepath.Join(kt.origin.Path, kt.kustFileName)),
9695
ConfiguredBy: yaml.ResourceIdentifier{
9796
TypeMeta: yaml.TypeMeta{
9897
APIVersion: "builtin",

‎api/krusty/accumulation_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -270,15 +270,15 @@ resources:
270270
// because we fail to GET a resource does not mean the resource is
271271
// not a remote file. We should return the GET status code as well.
272272
errFile: "URL is a git repository",
273-
errDir: `failed to run \S+/git fetch --depth=1 .+`,
273+
errDir: `failed to run '[^']+' fetch --depth=1 .+`,
274274
},
275275
{
276276
name: "local file qualifies as repo",
277277
// The .example top level domain is reserved for example purposes,
278278
// see RFC 2606.
279279
resource: "[email protected]/configs/base",
280-
errFile: `evalsymlink failure on '%s' .+`,
281-
errDir: `failed to run \S+/git fetch --depth=1 .+`,
280+
errFile: `evalsymlink failure on '[^']+' .+`,
281+
errDir: `failed to run '[^']+' fetch --depth=1 .+`,
282282
},
283283
{
284284
name: "relative path does not exist",
@@ -299,10 +299,10 @@ resources:
299299
files: map[string]string{
300300
"../base/resource.yaml": validResource,
301301
},
302-
errFile: "security; file '%s' is not in or below .+",
302+
errFile: "security; file '[^']+' is not in or below .+",
303303
// TODO(4348): Over-inclusion of directory error message when we
304304
// know resource is file.
305-
errDir: "must build at directory: '%s': file is not directory",
305+
errDir: "must build at directory: '[^']+': file is not directory",
306306
},
307307
{
308308
name: "absolute file violates restrictions",
@@ -311,10 +311,10 @@ resources:
311311
files: map[string]string{
312312
"../base/resource.yaml": validResource,
313313
},
314-
errFile: "security; file '%s' is not in or below .+",
314+
errFile: "security; file '[^']+' is not in or below .+",
315315
// TODO(4348): Over-inclusion of directory error message when we
316316
// know resource is file.
317-
errDir: `new root '%s' cannot be absolute`,
317+
errDir: `new root '[^']+' cannot be absolute`,
318318
},
319319
{
320320
name: "malformed yaml yields an error",

‎api/krusty/component_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"sigs.k8s.io/kustomize/api/internal/loader"
1212
"sigs.k8s.io/kustomize/api/konfig"
1313
kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
14+
"sigs.k8s.io/kustomize/kyaml/testutil"
1415
)
1516

1617
type FileGen func(kusttest_test.Harness)
@@ -507,6 +508,7 @@ spec:
507508
}
508509

509510
func TestComponentErrors(t *testing.T) {
511+
testutil.SkipWindows(t)
510512
testCases := map[string]struct {
511513
input []FileGen
512514
runPath string

‎api/krusty/originannotation_test.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"sigs.k8s.io/kustomize/api/krusty"
1515
kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
1616
"sigs.k8s.io/kustomize/kyaml/filesys"
17+
"sigs.k8s.io/kustomize/kyaml/testutil"
1718
)
1819

1920
const generateDeploymentDotSh = `#!/bin/sh
@@ -437,6 +438,7 @@ metadata:
437438
}
438439

439440
func TestAnnoOriginCustomExecGenerator(t *testing.T) {
441+
testutil.SkipWindows(t)
440442
fSys := filesys.MakeFsOnDisk()
441443

442444
th := kusttest_test.MakeHarnessWithFs(t, fSys)
@@ -531,6 +533,7 @@ spec:
531533
}
532534

533535
func TestAnnoOriginCustomInlineExecGenerator(t *testing.T) {
536+
testutil.SkipWindows(t)
534537
fSys := filesys.MakeFsOnDisk()
535538

536539
th := kusttest_test.MakeHarnessWithFs(t, fSys)
@@ -621,6 +624,7 @@ spec:
621624
}
622625

623626
func TestAnnoOriginCustomExecGeneratorWithOverlay(t *testing.T) {
627+
testutil.SkipWindows(t)
624628
fSys := filesys.MakeFsOnDisk()
625629

626630
th := kusttest_test.MakeHarnessWithFs(t, fSys)
@@ -721,6 +725,7 @@ spec:
721725
}
722726

723727
func TestAnnoOriginCustomInlineExecGeneratorWithOverlay(t *testing.T) {
728+
testutil.SkipWindows(t)
724729
fSys := filesys.MakeFsOnDisk()
725730

726731
th := kusttest_test.MakeHarnessWithFs(t, fSys)
@@ -817,6 +822,9 @@ spec:
817822
}
818823

819824
func TestAnnoOriginRemoteBuiltinGenerator(t *testing.T) {
825+
// Skip on Windows: Git's core.autocrlf converts LF to CRLF when cloning,
826+
// which changes file content and results in different ConfigMap hash values
827+
testutil.SkipWindows(t)
820828
fSys := filesys.MakeFsOnDisk()
821829
b := krusty.MakeKustomizer(krusty.MakeDefaultOptions())
822830
tmpDir, err := filesys.NewTmpConfirmedDir()
@@ -1031,6 +1039,7 @@ metadata:
10311039
}
10321040

10331041
func TestAnnoOriginGeneratorInTransformersField(t *testing.T) {
1042+
testutil.SkipWindows(t)
10341043
fSys := filesys.MakeFsOnDisk()
10351044

10361045
th := kusttest_test.MakeHarnessWithFs(t, fSys)
@@ -1093,6 +1102,7 @@ spec:
10931102
}
10941103

10951104
func TestAnnoOriginGeneratorInTransformersFieldWithOverlay(t *testing.T) {
1105+
testutil.SkipWindows(t)
10961106
fSys := filesys.MakeFsOnDisk()
10971107

10981108
th := kusttest_test.MakeHarnessWithFs(t, fSys)

‎api/krusty/pluginenv_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@ import (
1111
"sigs.k8s.io/kustomize/api/konfig"
1212
kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
1313
"sigs.k8s.io/kustomize/kyaml/filesys"
14+
"sigs.k8s.io/kustomize/kyaml/testutil"
1415
)
1516

1617
// The PrintPluginEnv plugin is a toy plugin that emits
1718
// its working directory and some environment variables,
1819
// to add regression protection to plugin loading logic.
1920
func TestPluginEnvironment(t *testing.T) {
21+
testutil.SkipWindows(t)
2022
th := kusttest_test.MakeEnhancedHarness(t).
2123
PrepExecPlugin(
2224
"someteam.example.com", "v1", "PrintPluginEnv")

‎api/krusty/remoteloader_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ spec:
279279
resources:
280280
- file:///not/a/real/repo
281281
`,
282-
err: "fatal: '/not/a/real/repo' does not appear to be a git repository",
282+
err: `fatal: '.*not/a/real/repo' does not appear to be a git repository`,
283283
},
284284
}
285285

@@ -291,7 +291,7 @@ resources:
291291
t.SkipNow()
292292
}
293293

294-
kust := strings.ReplaceAll(test.kustomization, "$ROOT", repos.root)
294+
kust := strings.ReplaceAll(test.kustomization, "$ROOT", filepath.ToSlash(repos.root))
295295
fSys, tmpDir := kusttest_test.CreateKustDir(t, kust)
296296

297297
b := krusty.MakeKustomizer(krusty.MakeDefaultOptions())
@@ -304,7 +304,7 @@ resources:
304304
require.Regexp(t, test.err, err.Error())
305305
} else {
306306
require.NoError(t, err)
307-
checkYaml(t, m, strings.ReplaceAll(test.expected, "$ROOT", repos.root))
307+
checkYaml(t, m, strings.ReplaceAll(test.expected, "$ROOT", filepath.ToSlash(repos.root)))
308308
}
309309
})
310310
}

‎api/krusty/transformerannotation_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"sigs.k8s.io/kustomize/api/krusty"
1515
kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
1616
"sigs.k8s.io/kustomize/kyaml/filesys"
17+
"sigs.k8s.io/kustomize/kyaml/testutil"
1718
)
1819

1920
const generateDeploymentWithOriginDotSh = `#!/bin/sh
@@ -350,6 +351,7 @@ metadata:
350351
}
351352

352353
func TestAnnoOriginCustomInlineTransformer(t *testing.T) {
354+
testutil.SkipWindows(t)
353355
fSys := filesys.MakeFsOnDisk()
354356

355357
th := kusttest_test.MakeHarnessWithFs(t, fSys)
@@ -422,6 +424,7 @@ spec:
422424
}
423425

424426
func TestAnnoOriginCustomExecTransformerWithOverlay(t *testing.T) {
427+
testutil.SkipWindows(t)
425428
fSys := filesys.MakeFsOnDisk()
426429

427430
th := kusttest_test.MakeHarnessWithFs(t, fSys)

‎api/krusty/transformerplugin_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
1010
"sigs.k8s.io/kustomize/api/types"
11+
"sigs.k8s.io/kustomize/kyaml/testutil"
1112
)
1213

1314
func writeStringPrefixer(th *kusttest_test.HarnessEnhanced, path, name string) {
@@ -20,6 +21,7 @@ metadata:
2021
}
2122

2223
func TestPluginsNotEnabled(t *testing.T) {
24+
testutil.SkipWindows(t)
2325
th := kusttest_test.MakeEnhancedHarness(t).
2426
BuildGoPlugin("someteam.example.com", "v1", "StringPrefixer")
2527
defer th.Reset()
@@ -39,6 +41,7 @@ transformers:
3941
}
4042

4143
func TestSedTransformer(t *testing.T) {
44+
testutil.SkipWindows(t)
4245
th := kusttest_test.MakeEnhancedHarness(t).
4346
PrepExecPlugin("someteam.example.com", "v1", "SedTransformer")
4447
defer th.Reset()

0 commit comments

Comments
 (0)