Skip to content

Commit b3160b9

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #20122 from soltysh/iostreams
Switch all commands to IOStreams
2 parents 8157540 + 20f3b61 commit b3160b9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+557
-535
lines changed

‎pkg/oc/admin/admin.go

+38-41
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package admin
22

33
import (
44
"fmt"
5-
"io"
65

76
"github.com/spf13/cobra"
87

@@ -43,79 +42,77 @@ var adminLong = ktemplates.LongDesc(`
4342
Commands for managing a cluster are exposed here. Many administrative
4443
actions involve interaction with the command-line client as well.`)
4544

46-
func NewCommandAdmin(name, fullName string, f kcmdutil.Factory, in io.Reader, out io.Writer, errout io.Writer) *cobra.Command {
45+
func NewCommandAdmin(name, fullName string, f kcmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
4746
// Main command
4847
cmds := &cobra.Command{
4948
Use: name,
5049
Short: "Tools for managing a cluster",
5150
Long: fmt.Sprintf(adminLong),
52-
Run: kcmdutil.DefaultSubCommandRun(out),
51+
Run: kcmdutil.DefaultSubCommandRun(streams.Out),
5352
}
5453

55-
streams := genericclioptions.IOStreams{Out: out, ErrOut: errout}
56-
5754
groups := ktemplates.CommandGroups{
5855
{
5956
Message: "Component Installation:",
6057
Commands: []*cobra.Command{
61-
router.NewCmdRouter(f, fullName, "router", out, errout),
62-
exipfailover.NewCmdIPFailoverConfig(f, fullName, "ipfailover", out, errout),
63-
registry.NewCmdRegistry(f, fullName, "registry", out, errout),
58+
router.NewCmdRouter(f, fullName, "router", streams.Out, streams.ErrOut),
59+
exipfailover.NewCmdIPFailoverConfig(f, fullName, "ipfailover", streams),
60+
registry.NewCmdRegistry(f, fullName, "registry", streams.Out, streams.ErrOut),
6461
},
6562
},
6663
{
6764
Message: "Security and Policy:",
6865
Commands: []*cobra.Command{
69-
project.NewCmdNewProject(project.NewProjectRecommendedName, fullName+" "+project.NewProjectRecommendedName, f, out),
70-
policy.NewCmdPolicy(policy.PolicyRecommendedName, fullName+" "+policy.PolicyRecommendedName, f, out, errout),
71-
groups.NewCmdGroups(groups.GroupsRecommendedName, fullName+" "+groups.GroupsRecommendedName, f, out, errout),
72-
cert.NewCmdCert(cert.CertRecommendedName, fullName+" "+cert.CertRecommendedName, out, errout),
66+
project.NewCmdNewProject(project.NewProjectRecommendedName, fullName+" "+project.NewProjectRecommendedName, f, streams.Out),
67+
policy.NewCmdPolicy(policy.PolicyRecommendedName, fullName+" "+policy.PolicyRecommendedName, f, streams.Out, streams.ErrOut),
68+
groups.NewCmdGroups(groups.GroupsRecommendedName, fullName+" "+groups.GroupsRecommendedName, f, streams),
69+
cert.NewCmdCert(cert.CertRecommendedName, fullName+" "+cert.CertRecommendedName, streams.Out, streams.ErrOut),
7370
kubecmd.NewCmdCertificate(f, streams),
7471
},
7572
},
7673
{
7774
Message: "Node Management:",
7875
Commands: []*cobra.Command{
79-
admin.NewCommandNodeConfig(admin.NodeConfigCommandName, fullName+" "+admin.NodeConfigCommandName, out),
80-
node.NewCommandManageNode(f, node.ManageNodeCommandName, fullName+" "+node.ManageNodeCommandName, out, errout),
76+
admin.NewCommandNodeConfig(admin.NodeConfigCommandName, fullName+" "+admin.NodeConfigCommandName, streams.Out),
77+
node.NewCommandManageNode(f, node.ManageNodeCommandName, fullName+" "+node.ManageNodeCommandName, streams.Out, streams.ErrOut),
8178
cmdutil.ReplaceCommandName("kubectl", fullName, ktemplates.Normalize(kubecmd.NewCmdCordon(f, streams))),
8279
cmdutil.ReplaceCommandName("kubectl", fullName, ktemplates.Normalize(kubecmd.NewCmdUncordon(f, streams))),
8380
cmdutil.ReplaceCommandName("kubectl", fullName, kubecmd.NewCmdDrain(f, streams)),
8481
cmdutil.ReplaceCommandName("kubectl", fullName, ktemplates.Normalize(kubecmd.NewCmdTaint(f, streams))),
85-
network.NewCmdPodNetwork(network.PodNetworkCommandName, fullName+" "+network.PodNetworkCommandName, f, out, errout),
82+
network.NewCmdPodNetwork(network.PodNetworkCommandName, fullName+" "+network.PodNetworkCommandName, f, streams.Out, streams.ErrOut),
8683
},
8784
},
8885
{
8986
Message: "Maintenance:",
9087
Commands: []*cobra.Command{
91-
diagnostics.NewCmdDiagnostics(diagnostics.DiagnosticsRecommendedName, fullName+" "+diagnostics.DiagnosticsRecommendedName, f, out),
92-
prune.NewCommandPrune(prune.PruneRecommendedName, fullName+" "+prune.PruneRecommendedName, f, out, errout),
93-
buildchain.NewCmdBuildChain(name, fullName+" "+buildchain.BuildChainRecommendedCommandName, f, out),
88+
diagnostics.NewCmdDiagnostics(diagnostics.DiagnosticsRecommendedName, fullName+" "+diagnostics.DiagnosticsRecommendedName, f, streams),
89+
prune.NewCommandPrune(prune.PruneRecommendedName, fullName+" "+prune.PruneRecommendedName, f, streams),
90+
buildchain.NewCmdBuildChain(name, fullName+" "+buildchain.BuildChainRecommendedCommandName, f, streams),
9491
migrate.NewCommandMigrate(
95-
migrate.MigrateRecommendedName, fullName+" "+migrate.MigrateRecommendedName, f, out, errout,
92+
migrate.MigrateRecommendedName, fullName+" "+migrate.MigrateRecommendedName, f, streams.Out, streams.ErrOut,
9693
// Migration commands
97-
migrateimages.NewCmdMigrateImageReferences("image-references", fullName+" "+migrate.MigrateRecommendedName+" image-references", f, in, out, errout),
98-
migratestorage.NewCmdMigrateAPIStorage("storage", fullName+" "+migrate.MigrateRecommendedName+" storage", f, in, out, errout),
99-
migrateetcd.NewCmdMigrateTTLs("etcd-ttl", fullName+" "+migrate.MigrateRecommendedName+" etcd-ttl", f, in, out, errout),
100-
migratehpa.NewCmdMigrateLegacyHPA("legacy-hpa", fullName+" "+migrate.MigrateRecommendedName+" legacy-hpa", f, in, out, errout),
101-
migratetemplateinstances.NewCmdMigrateTemplateInstances("template-instances", fullName+" "+migrate.MigrateRecommendedName+" template-instances", f, in, out, errout),
94+
migrateimages.NewCmdMigrateImageReferences("image-references", fullName+" "+migrate.MigrateRecommendedName+" image-references", f, streams.In, streams.Out, streams.ErrOut),
95+
migratestorage.NewCmdMigrateAPIStorage("storage", fullName+" "+migrate.MigrateRecommendedName+" storage", f, streams.In, streams.Out, streams.ErrOut),
96+
migrateetcd.NewCmdMigrateTTLs("etcd-ttl", fullName+" "+migrate.MigrateRecommendedName+" etcd-ttl", f, streams.In, streams.Out, streams.ErrOut),
97+
migratehpa.NewCmdMigrateLegacyHPA("legacy-hpa", fullName+" "+migrate.MigrateRecommendedName+" legacy-hpa", f, streams.In, streams.Out, streams.ErrOut),
98+
migratetemplateinstances.NewCmdMigrateTemplateInstances("template-instances", fullName+" "+migrate.MigrateRecommendedName+" template-instances", f, streams.In, streams.Out, streams.ErrOut),
10299
),
103-
top.NewCommandTop(top.TopRecommendedName, fullName+" "+top.TopRecommendedName, f, out, errout),
104-
image.NewCmdVerifyImageSignature(name, fullName+" "+image.VerifyRecommendedName, f, out, errout),
100+
top.NewCommandTop(top.TopRecommendedName, fullName+" "+top.TopRecommendedName, f, streams.Out, streams.ErrOut),
101+
image.NewCmdVerifyImageSignature(name, fullName+" "+image.VerifyRecommendedName, f, streams.Out, streams.ErrOut),
105102
},
106103
},
107104
{
108105
Message: "Configuration:",
109106
Commands: []*cobra.Command{
110-
admin.NewCommandCreateKubeConfig(admin.CreateKubeConfigCommandName, fullName+" "+admin.CreateKubeConfigCommandName, out),
111-
admin.NewCommandCreateClient(admin.CreateClientCommandName, fullName+" "+admin.CreateClientCommandName, out),
107+
admin.NewCommandCreateKubeConfig(admin.CreateKubeConfigCommandName, fullName+" "+admin.CreateKubeConfigCommandName, streams.Out),
108+
admin.NewCommandCreateClient(admin.CreateClientCommandName, fullName+" "+admin.CreateClientCommandName, streams.Out),
112109

113-
NewCommandCreateBootstrapProjectTemplate(f, CreateBootstrapProjectTemplateCommand, fullName+" "+CreateBootstrapProjectTemplateCommand, out),
114-
admin.NewCommandCreateBootstrapPolicyFile(admin.CreateBootstrapPolicyFileCommand, fullName+" "+admin.CreateBootstrapPolicyFileCommand, out),
110+
NewCommandCreateBootstrapProjectTemplate(f, CreateBootstrapProjectTemplateCommand, fullName+" "+CreateBootstrapProjectTemplateCommand, streams.Out),
111+
admin.NewCommandCreateBootstrapPolicyFile(admin.CreateBootstrapPolicyFileCommand, fullName+" "+admin.CreateBootstrapPolicyFileCommand, streams.Out),
115112

116-
NewCommandCreateLoginTemplate(f, CreateLoginTemplateCommand, fullName+" "+CreateLoginTemplateCommand, out),
117-
NewCommandCreateProviderSelectionTemplate(f, CreateProviderSelectionTemplateCommand, fullName+" "+CreateProviderSelectionTemplateCommand, out),
118-
NewCommandCreateErrorTemplate(f, CreateErrorTemplateCommand, fullName+" "+CreateErrorTemplateCommand, out),
113+
NewCommandCreateLoginTemplate(f, CreateLoginTemplateCommand, fullName+" "+CreateLoginTemplateCommand, streams.Out),
114+
NewCommandCreateProviderSelectionTemplate(f, CreateProviderSelectionTemplateCommand, fullName+" "+CreateProviderSelectionTemplateCommand, streams.Out),
115+
NewCommandCreateErrorTemplate(f, CreateErrorTemplateCommand, fullName+" "+CreateErrorTemplateCommand, streams.Out),
119116
},
120117
},
121118
}
@@ -125,10 +122,10 @@ func NewCommandAdmin(name, fullName string, f kcmdutil.Factory, in io.Reader, ou
125122

126123
// Deprecated commands that are bundled with the binary but not displayed to end users directly
127124
deprecatedCommands := []*cobra.Command{
128-
admin.NewCommandCreateMasterCerts(admin.CreateMasterCertsCommandName, fullName+" "+admin.CreateMasterCertsCommandName, out),
129-
admin.NewCommandCreateKeyPair(admin.CreateKeyPairCommandName, fullName+" "+admin.CreateKeyPairCommandName, out),
130-
admin.NewCommandCreateServerCert(admin.CreateServerCertCommandName, fullName+" "+admin.CreateServerCertCommandName, out),
131-
admin.NewCommandCreateSignerCert(admin.CreateSignerCertCommandName, fullName+" "+admin.CreateSignerCertCommandName, out),
125+
admin.NewCommandCreateMasterCerts(admin.CreateMasterCertsCommandName, fullName+" "+admin.CreateMasterCertsCommandName, streams.Out),
126+
admin.NewCommandCreateKeyPair(admin.CreateKeyPairCommandName, fullName+" "+admin.CreateKeyPairCommandName, streams.Out),
127+
admin.NewCommandCreateServerCert(admin.CreateServerCertCommandName, fullName+" "+admin.CreateServerCertCommandName, streams.Out),
128+
admin.NewCommandCreateSignerCert(admin.CreateSignerCertCommandName, fullName+" "+admin.CreateSignerCertCommandName, streams.Out),
132129
}
133130
for _, cmd := range deprecatedCommands {
134131
// Unsetting Short description will not show this command in help
@@ -139,15 +136,15 @@ func NewCommandAdmin(name, fullName string, f kcmdutil.Factory, in io.Reader, ou
139136

140137
cmds.AddCommand(
141138
// part of every root command
142-
cmd.NewCmdConfig(fullName, "config", f, out, errout),
143-
cmd.NewCmdCompletion(fullName, out),
139+
cmd.NewCmdConfig(fullName, "config", f, streams),
140+
cmd.NewCmdCompletion(fullName, streams),
144141

145142
// hidden
146-
cmd.NewCmdOptions(out),
143+
cmd.NewCmdOptions(streams),
147144
)
148145

149146
if name == fullName {
150-
cmds.AddCommand(cmd.NewCmdVersion(fullName, f, out, cmd.VersionOptions{}))
147+
cmds.AddCommand(cmd.NewCmdVersion(fullName, f, streams, cmd.VersionOptions{}))
151148
}
152149

153150
return cmds

‎pkg/oc/admin/diagnostics/diagnostics.go

+14-15
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@ package diagnostics
22

33
import (
44
"fmt"
5-
"io"
65
"os"
76
"runtime/debug"
87
"strings"
98

109
"github.com/spf13/cobra"
1110
flag "github.com/spf13/pflag"
12-
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
1311

1412
kutilerrors "k8s.io/apimachinery/pkg/util/errors"
1513
"k8s.io/apimachinery/pkg/util/sets"
1614
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
15+
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
1716

1817
"github.com/openshift/origin/pkg/cmd/flagtypes"
1918
poddiag "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/client/pod/in_pod"
@@ -106,12 +105,12 @@ var (
106105
)
107106

108107
// NewCmdDiagnostics is the base command for running a standard set of diagnostics with generic options only.
109-
func NewCmdDiagnostics(name string, fullName string, f genericclioptions.RESTClientGetter, out io.Writer) *cobra.Command {
108+
func NewCmdDiagnostics(name string, fullName string, f genericclioptions.RESTClientGetter, streams genericclioptions.IOStreams) *cobra.Command {
110109
available := availableDiagnostics()
111110
o := &DiagnosticsOptions{
112111
RequestedDiagnostics: available.Names().Difference(defaultSkipDiagnostics()),
113112
ParameterizedDiagnostics: types.NewParameterizedDiagnosticMap(available...),
114-
LogOptions: &log.LoggerOptions{Out: out},
113+
LogOptions: &log.LoggerOptions{Out: streams.Out},
115114
}
116115

117116
cmd := &cobra.Command{
@@ -120,32 +119,32 @@ func NewCmdDiagnostics(name string, fullName string, f genericclioptions.RESTCli
120119
Long: fmt.Sprintf(longDescription, fullName),
121120
Run: util.CommandRunFunc(o),
122121
}
123-
cmd.SetOutput(out) // for output re: usage / help
122+
cmd.SetOutput(streams.Out) // for output re: usage / help
124123
o.bindCommonFlags(cmd.Flags())
125124
o.bindClientFlags(cmd.Flags())
126125
o.bindHostFlags(cmd.Flags())
127126

128127
// add "all" subcommand
129-
cmd.AddCommand(NewCmdDiagnosticsAll(AllDiagnosticsRecommendedName, fullName+" "+AllDiagnosticsRecommendedName, f, out, available))
128+
cmd.AddCommand(NewCmdDiagnosticsAll(AllDiagnosticsRecommendedName, fullName+" "+AllDiagnosticsRecommendedName, f, streams, available))
130129
// add individual diagnostic subcommands
131130
for _, diag := range available {
132-
cmd.AddCommand(NewCmdDiagnosticsIndividual(strings.ToLower(diag.Name()), fullName+" "+strings.ToLower(diag.Name()), f, out, diag))
131+
cmd.AddCommand(NewCmdDiagnosticsIndividual(strings.ToLower(diag.Name()), fullName+" "+strings.ToLower(diag.Name()), f, streams, diag))
133132
}
134133
// add hidden in-pod subcommands
135134
cmd.AddCommand(
136-
poddiag.NewCommandPodDiagnostics(poddiag.InPodDiagnosticRecommendedName, out),
137-
networkpoddiag.NewCommandNetworkPodDiagnostics(networkpoddiag.InPodNetworkCheckRecommendedName, f, out),
135+
poddiag.NewCommandPodDiagnostics(poddiag.InPodDiagnosticRecommendedName, streams),
136+
networkpoddiag.NewCommandNetworkPodDiagnostics(networkpoddiag.InPodNetworkCheckRecommendedName, f, streams),
138137
)
139138

140139
return cmd
141140
}
142141

143142
// NewCmdDiagnosticsAll is the command for running ALL diagnostics and providing all flags.
144-
func NewCmdDiagnosticsAll(name string, fullName string, f genericclioptions.RESTClientGetter, out io.Writer, available types.DiagnosticList) *cobra.Command {
143+
func NewCmdDiagnosticsAll(name string, fullName string, f genericclioptions.RESTClientGetter, streams genericclioptions.IOStreams, available types.DiagnosticList) *cobra.Command {
145144
o := &DiagnosticsOptions{
146145
RequestedDiagnostics: available.Names(),
147146
ParameterizedDiagnostics: types.NewParameterizedDiagnosticMap(available...),
148-
LogOptions: &log.LoggerOptions{Out: out},
147+
LogOptions: &log.LoggerOptions{Out: streams.Out},
149148
Factory: f,
150149
}
151150

@@ -155,7 +154,7 @@ func NewCmdDiagnosticsAll(name string, fullName string, f genericclioptions.REST
155154
Long: fmt.Sprintf(longDescriptionAll, fullName),
156155
Run: util.CommandRunFunc(o),
157156
}
158-
cmd.SetOutput(out) // for output re: usage / help
157+
cmd.SetOutput(streams.Out) // for output re: usage / help
159158
o.bindCommonFlags(cmd.Flags())
160159
o.bindClientFlags(cmd.Flags())
161160
o.bindHostFlags(cmd.Flags())
@@ -164,11 +163,11 @@ func NewCmdDiagnosticsAll(name string, fullName string, f genericclioptions.REST
164163
}
165164

166165
// NewCmdDiagnosticsIndividual is a parameterized subcommand providing a single diagnostic and its flags.
167-
func NewCmdDiagnosticsIndividual(name string, fullName string, f genericclioptions.RESTClientGetter, out io.Writer, diagnostic types.Diagnostic) *cobra.Command {
166+
func NewCmdDiagnosticsIndividual(name string, fullName string, f genericclioptions.RESTClientGetter, streams genericclioptions.IOStreams, diagnostic types.Diagnostic) *cobra.Command {
168167
o := &DiagnosticsOptions{
169168
RequestedDiagnostics: sets.NewString(diagnostic.Name()),
170169
ParameterizedDiagnostics: types.NewParameterizedDiagnosticMap(diagnostic),
171-
LogOptions: &log.LoggerOptions{Out: out},
170+
LogOptions: &log.LoggerOptions{Out: streams.Out},
172171
Factory: f,
173172
}
174173

@@ -179,7 +178,7 @@ func NewCmdDiagnosticsIndividual(name string, fullName string, f genericclioptio
179178
Run: util.CommandRunFunc(o),
180179
Aliases: []string{diagnostic.Name()},
181180
}
182-
cmd.SetOutput(out) // for output re: usage / help
181+
cmd.SetOutput(streams.Out) // for output re: usage / help
183182
o.bindCommonFlags(cmd.Flags())
184183
needClient, needHost := diagnostic.Requirements()
185184
if pd, ok := diagnostic.(types.ParameterizedDiagnostic); ok {

‎pkg/oc/admin/diagnostics/diagnostics/client/pod/in_pod/cmd.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package in_pod
22

33
import (
44
"fmt"
5-
"io"
65
"runtime/debug"
76

87
"github.com/spf13/cobra"
98

109
"k8s.io/apimachinery/pkg/util/sets"
1110
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
11+
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
1212

1313
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/log"
1414
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
@@ -46,10 +46,10 @@ var longPodDiagDescription = templates.LongDesc(`
4646
log the results so that the calling diagnostic can report them.`)
4747

4848
// NewCommandPodDiagnostics is the command for running pod diagnostics.
49-
func NewCommandPodDiagnostics(name string, out io.Writer) *cobra.Command {
49+
func NewCommandPodDiagnostics(name string, streams genericclioptions.IOStreams) *cobra.Command {
5050
o := &PodDiagnosticsOptions{
5151
RequestedDiagnostics: []string{},
52-
LogOptions: &log.LoggerOptions{Out: out},
52+
LogOptions: &log.LoggerOptions{Out: streams.Out},
5353
}
5454

5555
cmd := &cobra.Command{
@@ -59,7 +59,7 @@ func NewCommandPodDiagnostics(name string, out io.Writer) *cobra.Command {
5959
Run: util.CommandRunFunc(o),
6060
Hidden: true,
6161
}
62-
cmd.SetOutput(out) // for output re: usage / help
62+
cmd.SetOutput(streams.Out) // for output re: usage / help
6363

6464
options.BindLoggerOptionFlags(cmd.Flags(), o.LogOptions, options.RecommendedLoggerOptionFlags())
6565

‎pkg/oc/admin/diagnostics/diagnostics/cluster/network/in_pod/cmd.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package in_pod
22

33
import (
44
"fmt"
5-
"io"
65
"runtime/debug"
76

87
"github.com/spf13/cobra"
@@ -47,10 +46,10 @@ var (
4746
)
4847

4948
// NewCommandNetworkPodDiagnostics is the command for running network diagnostics.
50-
func NewCommandNetworkPodDiagnostics(name string, f genericclioptions.RESTClientGetter, out io.Writer) *cobra.Command {
49+
func NewCommandNetworkPodDiagnostics(name string, f genericclioptions.RESTClientGetter, streams genericclioptions.IOStreams) *cobra.Command {
5150
o := &NetworkPodDiagnosticsOptions{
5251
RequestedDiagnostics: []string{},
53-
LogOptions: &log.LoggerOptions{Out: out},
52+
LogOptions: &log.LoggerOptions{Out: streams.Out},
5453
RESTClientGetter: f,
5554
}
5655

@@ -61,7 +60,7 @@ func NewCommandNetworkPodDiagnostics(name string, f genericclioptions.RESTClient
6160
Run: util.CommandRunFunc(o),
6261
Hidden: true,
6362
}
64-
cmd.SetOutput(out) // for output re: usage / help
63+
cmd.SetOutput(streams.Out) // for output re: usage / help
6564

6665
options.BindLoggerOptionFlags(cmd.Flags(), o.LogOptions, options.RecommendedLoggerOptionFlags())
6766

‎pkg/oc/admin/groups/changemembership.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"k8s.io/apimachinery/pkg/util/sets"
1010
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
1111
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
12+
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
1213

1314
"github.com/spf13/cobra"
1415

@@ -48,7 +49,7 @@ type GroupModificationOptions struct {
4849
Users []string
4950
}
5051

51-
func NewCmdAddUsers(name, fullName string, f kcmdutil.Factory, out io.Writer) *cobra.Command {
52+
func NewCmdAddUsers(name, fullName string, f kcmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
5253
options := &GroupModificationOptions{}
5354

5455
cmd := &cobra.Command{
@@ -64,14 +65,14 @@ func NewCmdAddUsers(name, fullName string, f kcmdutil.Factory, out io.Writer) *c
6465
kcmdutil.CheckErr(err)
6566
}
6667

67-
printSuccessForCommand(options.Group, true, options.Users, out)
68+
printSuccessForCommand(options.Group, true, options.Users, streams.Out)
6869
},
6970
}
7071

7172
return cmd
7273
}
7374

74-
func NewCmdRemoveUsers(name, fullName string, f kcmdutil.Factory, out io.Writer) *cobra.Command {
75+
func NewCmdRemoveUsers(name, fullName string, f kcmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
7576
options := &GroupModificationOptions{}
7677

7778
cmd := &cobra.Command{
@@ -87,7 +88,7 @@ func NewCmdRemoveUsers(name, fullName string, f kcmdutil.Factory, out io.Writer)
8788
kcmdutil.CheckErr(err)
8889
}
8990

90-
printSuccessForCommand(options.Group, false, options.Users, out)
91+
printSuccessForCommand(options.Group, false, options.Users, streams.Out)
9192
},
9293
}
9394

0 commit comments

Comments
 (0)