Merge pull request kubernetes-sigs#7972 from Rohitrajak1807/private/Rohitrajak1807/bug-write-to-flag

k8s-ci-robot · web-flow · commit 55634dffd64c · 2023-01-23T12:16:08.000-08:00
🐛  bugfix write-to flag should only run filepath.Clean when the output file is not "" or -
diff --git a/cmd/clusterctl/cmd/util.go b/cmd/clusterctl/cmd/util.go
@@ -38,15 +38,15 @@ func printYamlOutput(printer client.YamlPrinter, outputFile string) error {
 	if err != nil {
 		return err
 	}
-	outputFile = filepath.Clean(strings.TrimSpace(outputFile))
 	yaml = append(yaml, '\n')
+	outputFile = strings.TrimSpace(outputFile)
 	if outputFile == "" || outputFile == "-" {
 		if _, err := os.Stdout.Write(yaml); err != nil {
 			return errors.Wrap(err, "failed to write yaml to Stdout")
 		}
 		return nil
 	}
-
+	outputFile = filepath.Clean(outputFile)
 	if err := os.WriteFile(outputFile, yaml, 0600); err != nil {
 		return errors.Wrap(err, "failed to write to destination file")
 	}

Original file line number	Diff line number	Diff line change
`@@ -38,15 +38,15 @@ func printYamlOutput(printer client.YamlPrinter, outputFile string) error {`
`38`	`38`	`if err != nil {`
`39`	`39`	`return err`
`40`	`40`	`}`
`41`		`- outputFile = filepath.Clean(strings.TrimSpace(outputFile))`
`42`	`41`	`yaml = append(yaml, '\n')`
	`42`	`+ outputFile = strings.TrimSpace(outputFile)`
`43`	`43`	`if outputFile == "" \|\| outputFile == "-" {`
`44`	`44`	`if _, err := os.Stdout.Write(yaml); err != nil {`
`45`	`45`	`return errors.Wrap(err, "failed to write yaml to Stdout")`
`46`	`46`	`}`
`47`	`47`	`return nil`
`48`	`48`	`}`
`49`		`-`
	`49`	`+ outputFile = filepath.Clean(outputFile)`
`50`	`50`	`if err := os.WriteFile(outputFile, yaml, 0600); err != nil {`
`51`	`51`	`return errors.Wrap(err, "failed to write to destination file")`
`52`	`52`	`}`