bugfix: compile flag -D supports struct input, ie: dict

KusionStack · Aug 3, 2022 · e7dd8de · e7dd8de
1 parent 2109bf4
commit e7dd8de
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 24 deletions.
diff --git a/pkg/kusionctl/cmd/apply/apply.go b/pkg/kusionctl/cmd/apply/apply.go
@@ -4,6 +4,7 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/kubectl/pkg/util/templates"
 
+	"kusionstack.io/kusion/pkg/kusionctl/cmd/compile"
 	"kusionstack.io/kusion/pkg/kusionctl/cmd/util"
 	"kusionstack.io/kusion/pkg/util/i18n"
 )
@@ -50,16 +51,9 @@ func NewCmdApply() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVarP(&o.CompileOptions.WorkDir, "workdir", "w", "",
-		i18n.T("Specify the work directory"))
+	compile.AddCompileFlags(cmd, &o.CompileOptions)
 	cmd.Flags().StringVarP(&o.Operator, "operator", "", "",
 		i18n.T("Specify the operator"))
-	cmd.Flags().StringSliceVarP(&o.CompileOptions.Arguments, "argument", "D", []string{},
-		i18n.T("Specify the arguments to apply KCL"))
-	cmd.Flags().StringSliceVarP(&o.CompileOptions.Settings, "setting", "Y", []string{},
-		i18n.T("Specify the command line setting files"))
-	cmd.Flags().StringSliceVarP(&o.CompileOptions.Overrides, "overrides", "O", []string{},
-		i18n.T("Specify the configuration override path and value"))
 	cmd.Flags().BoolVarP(&o.Yes, "yes", "y", false,
 		i18n.T("Automatically approve and perform the update after previewing it"))
 	cmd.Flags().BoolVarP(&o.Detail, "detail", "d", false,

diff --git a/pkg/kusionctl/cmd/compile/compile.go b/pkg/kusionctl/cmd/compile/compile.go
@@ -56,20 +56,24 @@ func NewCmdCompile() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringSliceVarP(&o.Arguments, "argument", "D", []string{},
-		i18n.T("Specify the top-level argument"))
-	cmd.Flags().StringSliceVarP(&o.Settings, "setting", "Y", []string{},
-		i18n.T("Specify the command line setting files"))
+	AddCompileFlags(cmd, o)
 	cmd.Flags().StringVarP(&o.Output, "output", "o", "",
 		i18n.T("Specify the output file"))
-	cmd.Flags().StringVarP(&o.WorkDir, "workdir", "w", "",
-		i18n.T("Specify the work directory"))
 	cmd.Flags().BoolVarP(&o.DisableNone, "disable-none", "n", false,
 		i18n.T("Disable dumping None values"))
 	cmd.Flags().BoolVarP(&o.OverrideAST, "override-AST", "a", false,
 		i18n.T("Specify the override option"))
-	cmd.Flags().StringSliceVarP(&o.Overrides, "overrides", "O", []string{},
-		i18n.T("Specify the configuration override path and value"))
 
 	return cmd
 }
+
+func AddCompileFlags(cmd *cobra.Command, o *CompileOptions) {
+	cmd.Flags().StringVarP(&o.WorkDir, "workdir", "w", "",
+		i18n.T("Specify the work directory"))
+	cmd.Flags().StringSliceVarP(&o.Settings, "setting", "Y", []string{},
+		i18n.T("Specify the command line setting files"))
+	cmd.Flags().StringArrayVarP(&o.Arguments, "argument", "D", []string{},
+		i18n.T("Specify the top-level argument"))
+	cmd.Flags().StringSliceVarP(&o.Overrides, "overrides", "O", []string{},
+		i18n.T("Specify the configuration override path and value"))
+}
diff --git a/pkg/kusionctl/cmd/destroy/destroy.go b/pkg/kusionctl/cmd/destroy/destroy.go
@@ -5,6 +5,7 @@ import (
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
 
+	"kusionstack.io/kusion/pkg/kusionctl/cmd/compile"
 	"kusionstack.io/kusion/pkg/kusionctl/cmd/util"
 )
 
@@ -43,16 +44,9 @@ func NewCmdDestroy() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVarP(&o.CompileOptions.WorkDir, "workdir", "w", "",
-		i18n.T("Specify the work directory"))
+	compile.AddCompileFlags(cmd, &o.CompileOptions)
 	cmd.Flags().StringVarP(&o.Operator, "operator", "", "",
 		i18n.T("Specify the operator"))
-	cmd.Flags().StringSliceVarP(&o.CompileOptions.Arguments, "argument", "D", []string{},
-		i18n.T("Specify the arguments for compile KCL"))
-	cmd.Flags().StringSliceVarP(&o.CompileOptions.Settings, "setting", "Y", []string{},
-		i18n.T("Specify the command line setting files"))
-	cmd.Flags().StringSliceVarP(&o.CompileOptions.Overrides, "overrides", "O", []string{},
-		i18n.T("Specify the configuration override path and value"))
 	cmd.Flags().BoolVarP(&o.Yes, "yes", "y", false,
 		i18n.T("Automatically approve and perform the update after previewing it"))
 	cmd.Flags().BoolVarP(&o.Detail, "detail", "d", false,