diff --git a/cmd/flux/build_kustomization.go b/cmd/flux/build_kustomization.go index 5d29c001..2000faac 100644 --- a/cmd/flux/build_kustomization.go +++ b/cmd/flux/build_kustomization.go @@ -20,6 +20,7 @@ import ( "fmt" "os" "os/signal" + "path/filepath" "github.com/spf13/cobra" @@ -97,6 +98,13 @@ func buildKsCmdRun(cmd *cobra.Command, args []string) (err error) { return fmt.Errorf("invalid resource path %q", buildKsArgs.path) } + // Normalize the path to handle Windows absolute and relative paths correctly + buildKsArgs.path, err = filepath.Abs(buildKsArgs.path) + if err != nil { + return fmt.Errorf("failed to resolve absolute path: %w", err) + } + buildKsArgs.path = filepath.Clean(buildKsArgs.path) + if fs, err := os.Stat(buildKsArgs.path); err != nil || !fs.IsDir() { return fmt.Errorf("invalid resource path %q", buildKsArgs.path) } diff --git a/cmd/flux/build_kustomization_test.go b/cmd/flux/build_kustomization_test.go index 2f8036bb..7b49506e 100644 --- a/cmd/flux/build_kustomization_test.go +++ b/cmd/flux/build_kustomization_test.go @@ -218,3 +218,65 @@ spec: }) } } + +// TestBuildKustomizationPathNormalization verifies that absolute and complex +// paths are normalized to prevent path concatenation bugs (issue #5673). +// Without normalization, paths could be duplicated like: /path/test/path/test/file +func TestBuildKustomizationPathNormalization(t *testing.T) { + // Get absolute path to testdata to test absolute path handling + absTestDataPath, err := filepath.Abs("testdata/build-kustomization/podinfo") + if err != nil { + t.Fatalf("failed to get absolute path: %v", err) + } + + tests := []struct { + name string + args string + resultFile string + assertFunc string + }{ + { + name: "build with absolute path", + args: "build kustomization podinfo --path " + absTestDataPath, + resultFile: "./testdata/build-kustomization/podinfo-result.yaml", + assertFunc: "assertGoldenTemplateFile", + }, + { + name: "build with complex relative path (parent dir)", + args: "build kustomization podinfo --path ./testdata/build-kustomization/../build-kustomization/podinfo", + resultFile: "./testdata/build-kustomization/podinfo-result.yaml", + assertFunc: "assertGoldenTemplateFile", + }, + { + name: "build with path containing redundant separators", + args: "build kustomization podinfo --path ./testdata//build-kustomization//podinfo", + resultFile: "./testdata/build-kustomization/podinfo-result.yaml", + assertFunc: "assertGoldenTemplateFile", + }, + } + + tmpl := map[string]string{ + "fluxns": allocateNamespace("flux-system"), + } + setup(t, tmpl) + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + var assert assertFunc + + switch tt.assertFunc { + case "assertGoldenTemplateFile": + assert = assertGoldenTemplateFile(tt.resultFile, tmpl) + case "assertError": + assert = assertError(tt.resultFile) + } + + cmd := cmdTestCase{ + args: tt.args + " -n " + tmpl["fluxns"], + assert: assert, + } + + cmd.runTestCmd(t) + }) + } +}