From d315600e5e87d072aeeb4056a265742ebd8dfe89 Mon Sep 17 00:00:00 2001 From: Katrina Verey Date: Tue, 24 Jan 2023 17:59:36 -0500 Subject: [PATCH 1/2] remove redundant type meta in tests --- api/krusty/generatoroptions_test.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/api/krusty/generatoroptions_test.go b/api/krusty/generatoroptions_test.go index 2bb98ae7d..bcd4f6c65 100644 --- a/api/krusty/generatoroptions_test.go +++ b/api/krusty/generatoroptions_test.go @@ -94,8 +94,6 @@ metadata: func TestGeneratorOptionsOverlayDisableNameSuffixHash(t *testing.T) { th := kusttest_test.MakeHarness(t) th.WriteK("base", ` -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization generatorOptions: disableNameSuffixHash: false labels: @@ -106,8 +104,6 @@ configMapGenerator: - foo=bar `) th.WriteK("overlay", ` -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization resources: - ../base generatorOptions: From 8b21844b10eae58db20ab5734f05ddbc7c732523 Mon Sep 17 00:00:00 2001 From: Katrina Verey Date: Tue, 24 Jan 2023 18:10:34 -0500 Subject: [PATCH 2/2] Do not use filepath.Separator for splitting URLs --- api/internal/git/repospec.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/internal/git/repospec.go b/api/internal/git/repospec.go index 97bdf019a..b10d3da9e 100644 --- a/api/internal/git/repospec.go +++ b/api/internal/git/repospec.go @@ -79,7 +79,7 @@ const ( refQuery = "?ref=" gitSuffix = ".git" gitRootDelimiter = "_git/" - pathSeparator = string(filepath.Separator) + pathSeparator = "/" // do not use filepath.Separator, as this is a URL ) // NewRepoSpecFromURL parses git-like urls. @@ -198,8 +198,8 @@ func tryDefaultLengthSplit(n string, defaultSegmentLength int) (string, string, } func kustRootPathExitsRepo(kustRootPath string) bool { - cleanedPath := filepath.Clean(strings.TrimPrefix(kustRootPath, pathSeparator)) - pathElements := strings.Split(cleanedPath, pathSeparator) + cleanedPath := filepath.Clean(strings.TrimPrefix(kustRootPath, string(filepath.Separator))) + pathElements := strings.Split(cleanedPath, string(filepath.Separator)) return len(pathElements) > 0 && pathElements[0] == filesys.ParentDir }