@@ -20,7 +20,7 @@ import (
20
20
type ProjectsOptions struct {
21
21
Config clientcmdapi.Config
22
22
ClientConfig * restclient.Config
23
- ClientFn func () ( * client.Client , error )
23
+ Client * client.Client
24
24
Out io.Writer
25
25
PathOptions * kubecmdconfig.PathOptions
26
26
@@ -65,12 +65,11 @@ func NewCmdProjects(fullName string, f *clientcmd.Factory, out io.Writer) *cobra
65
65
}
66
66
67
67
func (o * ProjectsOptions ) Complete (f * clientcmd.Factory , args []string , out io.Writer ) error {
68
- var err error
69
-
70
68
if len (args ) > 0 {
71
69
return fmt .Errorf ("no arguments should be passed" )
72
70
}
73
71
72
+ var err error
74
73
o .Config , err = f .OpenShiftClientConfig .RawConfig ()
75
74
if err != nil {
76
75
return err
@@ -81,9 +80,9 @@ func (o *ProjectsOptions) Complete(f *clientcmd.Factory, args []string, out io.W
81
80
return err
82
81
}
83
82
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
87
86
}
88
87
89
88
o .Out = out
@@ -103,10 +102,7 @@ func (o ProjectsOptions) RunProjects() error {
103
102
var currentProjectExists bool = false
104
103
var currentProjectErr error = nil
105
104
106
- client , err := o .ClientFn ()
107
- if err != nil {
108
- return err
109
- }
105
+ client := o .Client
110
106
111
107
if len (currentProject ) > 0 {
112
108
if _ , currentProjectErr := client .Projects ().Get (currentProject ); currentProjectErr == nil {
0 commit comments