Merge pull request #2164 from carlory/iostreams

take iostreams as a func parameter

pkg/karmadactl/apply.go

@@ -63,18 +63,11 @@ var (
 		%[1]s apply -f dir/ --all-clusters`)
 )
 
-// NewCommandApplyOptions returns an initialized CommandApplyOptions instance
-func NewCommandApplyOptions() *CommandApplyOptions {
-	streams := genericclioptions.IOStreams{In: getIn, Out: getOut, ErrOut: getErr}
-	flags := kubectlapply.NewApplyFlags(nil, streams)
-	return &CommandApplyOptions{
-		KubectlApplyFlags: flags,
-	}
-}
-
 // NewCmdApply creates the `apply` command
-func NewCmdApply(karmadaConfig KarmadaConfig, parentCommand string) *cobra.Command {
+func NewCmdApply(karmadaConfig KarmadaConfig, parentCommand string, streams genericclioptions.IOStreams) *cobra.Command {
-	o := NewCommandApplyOptions()
+	o := &CommandApplyOptions{
+		KubectlApplyFlags: kubectlapply.NewApplyFlags(nil, streams),
+	}
 	cmd := &cobra.Command{
 		Use:     "apply (-f FILENAME | -k DIRECTORY)",
 		Short:   "Apply a configuration to a resource by file name or stdin and propagate them into member clusters",

pkg/karmadactl/describe.go

@@ -38,8 +38,7 @@ var (
 )
 
 // NewCmdDescribe new describe command.
-func NewCmdDescribe(karmadaConfig KarmadaConfig, parentCommand string) *cobra.Command {
+func NewCmdDescribe(karmadaConfig KarmadaConfig, parentCommand string, streams genericclioptions.IOStreams) *cobra.Command {
-	ioStreams := genericclioptions.IOStreams{In: getIn, Out: getOut, ErrOut: getErr}
 	o := &CommandDescribeOptions{
 		FilenameOptions: &resource.FilenameOptions{},
 		DescriberSettings: &describe.DescriberSettings{
@@ -49,7 +48,7 @@ func NewCmdDescribe(karmadaConfig KarmadaConfig, parentCommand string) *cobra.Co
 
 		CmdParent: parentCommand,
 
-		IOStreams: ioStreams,
+		IOStreams: streams,
 	}
 
 	cmd := &cobra.Command{

pkg/karmadactl/exec.go

@@ -40,8 +40,7 @@ var (
 )
 
 // NewCmdExec new exec command.
-func NewCmdExec(karmadaConfig KarmadaConfig, parentCommand string) *cobra.Command {
+func NewCmdExec(karmadaConfig KarmadaConfig, parentCommand string, streams genericclioptions.IOStreams) *cobra.Command {
-	streams := genericclioptions.IOStreams{In: getIn, Out: getOut, ErrOut: getErr}
 	o := &ExecOptions{
 		KubectlExecOptions: &kubectlexec.ExecOptions{
 			StreamOptions: kubectlexec.StreamOptions{

pkg/karmadactl/get.go

@@ -49,10 +49,6 @@ const (
 )
 
 var (
-	getIn  = os.Stdin
-	getOut = os.Stdout
-	getErr = os.Stderr
-
 	podColumns = []metav1.TableColumnDefinition{
 		{Name: "CLUSTER", Type: "string", Format: "", Priority: 0},
 		{Name: "ADOPTION", Type: "string", Format: "", Priority: 0},
@@ -88,9 +84,8 @@ var (
 )
 
 // NewCmdGet New get command
-func NewCmdGet(karmadaConfig KarmadaConfig, parentCommand string) *cobra.Command {
+func NewCmdGet(karmadaConfig KarmadaConfig, parentCommand string, streams genericclioptions.IOStreams) *cobra.Command {
-	ioStreams := genericclioptions.IOStreams{In: getIn, Out: getOut, ErrOut: getErr}
+	o := NewCommandGetOptions(streams)
-	o := NewCommandGetOptions(ioStreams)
 	cmd := &cobra.Command{
 		Use:          "get [NAME | -l label | -n namespace]  [flags]",
 		Short:        getShort,

pkg/karmadactl/karmadactl.go

@@ -3,9 +3,11 @@ package karmadactl
 import (
 	"flag"
 	"fmt"
+	"os"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/client-go/tools/clientcmd"
 	apiserverflag "k8s.io/component-base/cli/flag"
 	"k8s.io/klog/v2"
@@ -47,12 +49,12 @@ func NewKarmadaCtlCommand(cmdUse, parentCommand string) *cobra.Command {
 	_ = flag.CommandLine.Parse(nil)
 
 	karmadaConfig := NewKarmadaConfig(clientcmd.NewDefaultPathOptions())
-
+	ioStreams := genericclioptions.IOStreams{In: os.Stdin, Out: os.Stdout, ErrOut: os.Stderr}
 	groups := templates.CommandGroups{
 		{
 			Message: "Basic Commands:",
 			Commands: []*cobra.Command{
-				NewCmdGet(karmadaConfig, parentCommand),
+				NewCmdGet(karmadaConfig, parentCommand, ioStreams),
 			},
 		},
 		{
@@ -75,15 +77,15 @@ func NewKarmadaCtlCommand(cmdUse, parentCommand string) *cobra.Command {
 		{
 			Message: "Troubleshooting and Debugging Commands:",
 			Commands: []*cobra.Command{
-				NewCmdLogs(karmadaConfig, parentCommand),
+				NewCmdLogs(karmadaConfig, parentCommand, ioStreams),
-				NewCmdExec(karmadaConfig, parentCommand),
+				NewCmdExec(karmadaConfig, parentCommand, ioStreams),
-				NewCmdDescribe(karmadaConfig, parentCommand),
+				NewCmdDescribe(karmadaConfig, parentCommand, ioStreams),
 			},
 		},
 		{
 			Message: "Advanced Commands:",
 			Commands: []*cobra.Command{
-				NewCmdApply(karmadaConfig, parentCommand),
+				NewCmdApply(karmadaConfig, parentCommand, ioStreams),
 				NewCmdPromote(karmadaConfig, parentCommand),
 			},
 		},

pkg/karmadactl/logs.go

@@ -50,8 +50,7 @@ var (
 )
 
 // NewCmdLogs new logs command.
-func NewCmdLogs(karmadaConfig KarmadaConfig, parentCommand string) *cobra.Command {
+func NewCmdLogs(karmadaConfig KarmadaConfig, parentCommand string, streams genericclioptions.IOStreams) *cobra.Command {
-	streams := genericclioptions.IOStreams{In: getIn, Out: getOut, ErrOut: getErr}
 	o := &LogsOptions{
 		KubectlLogsOptions: kubectllogs.NewLogsOptions(streams, false),
 	}