Merge pull request #128 from puzzle/fix-kustomize-binary-flag

Make `binary` Flag Global
puzzle · May 31, 2024 · b03b1ec · b03b1ec
2 parents a48ae2b + efb7cdb
commit b03b1ec
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/cmd/kustomize.go b/cmd/kustomize.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"cmp"
 	"fmt"
 	"os/exec"
 
@@ -25,10 +26,8 @@ var kustomizeCmd = &cobra.Command{
 	},
 	Long: `Generate a DOT file to visualize the dependencies between your kustomize components`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		kustomizeCmd := "kustomize"
-		if *binary != "" {
-			kustomizeCmd = *binary
-		}
+
+		kustomizeCmd := cmp.Or(*binary, "kustomize")
 
 		if *version {
 			kustomizeCmd := exec.CommandContext(cmd.Context(), kustomizeCmd, "version")
@@ -46,10 +45,10 @@ var kustomizeCmd = &cobra.Command{
 }
 
 func init() {
-	kustomizeCmd.AddCommand(kustomize.KustomizeBuildCmd)
-	rootCmd.AddCommand(kustomizeCmd)
-
-	binary = kustomizeCmd.Flags().String("binary", "", "Alternative kustomize binary")
+	binary = kustomizeCmd.PersistentFlags().String("binary", "", "Alternative kustomize binary")
 	version = kustomizeCmd.Flags().BoolP("version", "v", false, "Display version of kustomize")
 	outputDotDir = kustomizeCmd.Flags().StringP("output-dir", "o", ".", "Output directory")
+
+	kustomizeCmd.AddCommand(kustomize.KustomizeBuildCmd)
+	rootCmd.AddCommand(kustomizeCmd)
 }
diff --git a/cmd/kustomize/build.go b/cmd/kustomize/build.go
@@ -1,6 +1,8 @@
 package kustomize
 
 import (
+	"cmp"
+
 	"github.com/puzzle/goff/kustomize"
 
 	"github.com/spf13/cobra"
@@ -24,6 +26,9 @@ var KustomizeBuildCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
+
+		kustomizeCommand = cmp.Or(kustomizeCommand, "kustomize")
+
 		return kustomize.BuildAll(kustomizeCommand, args[0], *outputBuildDir)
 	},
 }