Skip to content

Commit d8485e4

Browse files
committed
replace ClientFn with Client field
1 parent 97d3aa9 commit d8485e4

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

pkg/cmd/cli/cmd/projects.go

+6-10
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
type ProjectsOptions struct {
2121
Config clientcmdapi.Config
2222
ClientConfig *restclient.Config
23-
ClientFn func() (*client.Client, error)
23+
Client *client.Client
2424
Out io.Writer
2525
PathOptions *kubecmdconfig.PathOptions
2626

@@ -65,12 +65,11 @@ func NewCmdProjects(fullName string, f *clientcmd.Factory, out io.Writer) *cobra
6565
}
6666

6767
func (o *ProjectsOptions) Complete(f *clientcmd.Factory, args []string, out io.Writer) error {
68-
var err error
69-
7068
if len(args) > 0 {
7169
return fmt.Errorf("no arguments should be passed")
7270
}
7371

72+
var err error
7473
o.Config, err = f.OpenShiftClientConfig.RawConfig()
7574
if err != nil {
7675
return err
@@ -81,9 +80,9 @@ func (o *ProjectsOptions) Complete(f *clientcmd.Factory, args []string, out io.W
8180
return err
8281
}
8382

84-
o.ClientFn = func() (*client.Client, error) {
85-
client, _, err := f.Clients()
86-
return client, err
83+
o.Client, _, err = f.Clients()
84+
if err != nil {
85+
return err
8786
}
8887

8988
o.Out = out
@@ -103,10 +102,7 @@ func (o ProjectsOptions) RunProjects() error {
103102
var currentProjectExists bool = false
104103
var currentProjectErr error = nil
105104

106-
client, err := o.ClientFn()
107-
if err != nil {
108-
return err
109-
}
105+
client := o.Client
110106

111107
if len(currentProject) > 0 {
112108
if _, currentProjectErr := client.Projects().Get(currentProject); currentProjectErr == nil {

0 commit comments

Comments
 (0)