@@ -22,12 +22,12 @@ import (
22
22
23
23
"github.com/fidelity/kconnect/pkg/config"
24
24
"github.com/fidelity/kconnect/pkg/oidc"
25
- "github.com/fidelity/kconnect/pkg/prompt"
26
25
"github.com/fidelity/kconnect/pkg/provider"
27
26
"github.com/fidelity/kconnect/pkg/provider/common"
28
27
"github.com/fidelity/kconnect/pkg/provider/discovery"
29
28
"github.com/fidelity/kconnect/pkg/provider/identity"
30
29
"github.com/fidelity/kconnect/pkg/provider/registry"
30
+ "github.com/fidelity/kconnect/pkg/utils"
31
31
"go.uber.org/zap"
32
32
)
33
33
@@ -123,48 +123,24 @@ func (p *oidcClusterProvider) logParameters() {
123
123
// For required parameter, if not exists in default config file or config url, read user input.
124
124
func (p * oidcClusterProvider ) readRequiredFields () error {
125
125
126
- if p .identity .OidcId == "" {
127
- value , err := readUserInput (oidc .OidcIdConfigItem , oidc .OidcIdConfigDescription )
128
- if err != nil {
129
- return err
130
- }
131
- p .identity .OidcId = value
132
- }
133
-
134
- if p .identity .OidcServer == "" {
135
- value , err := readUserInput (oidc .OidcServerConfigItem , oidc .OidcServerConfigDescription )
136
- if err != nil {
137
- return err
138
- }
139
- p .identity .OidcServer = value
140
- }
141
-
142
- if p .identity .UsePkce != True && p .identity .OidcSecret == "" {
143
- value , err := readUserInput (oidc .OidcSecretConfigItem , oidc .OidcSecretConfigDescription )
144
- if err != nil {
145
- return err
146
- }
147
- p .identity .OidcSecret = value
148
- }
149
-
150
126
if p .config .ClusterUrl == "" {
151
- value , err := readUserInput (oidc .ClusterUrlConfigItem , oidc .ClusterUrlConfigDescription )
127
+ value , err := oidc . ReadUserInput (oidc .ClusterUrlConfigItem , oidc .ClusterUrlConfigDescription )
152
128
if err != nil {
153
129
return err
154
130
}
155
131
p .config .ClusterUrl = value
156
132
}
157
133
158
134
if p .config .ClusterAuth == "" {
159
- value , err := readUserInput (oidc .ClusterAuthConfigItem , oidc .ClusterAuthConfigDescription )
135
+ value , err := oidc . ReadUserInput (oidc .ClusterAuthConfigItem , oidc .ClusterAuthConfigDescription )
160
136
if err != nil {
161
137
return err
162
138
}
163
139
p .config .ClusterAuth = value
164
140
}
165
141
166
142
if * p .config .ClusterID == "" {
167
- value , err := readUserInput (oidc .ClusterIdConfigItem , oidc .ClusterIdConfigDescription )
143
+ value , err := oidc . ReadUserInput (oidc .ClusterIdConfigItem , oidc .ClusterIdConfigDescription )
168
144
if err != nil {
169
145
return err
170
146
}
@@ -175,20 +151,12 @@ func (p *oidcClusterProvider) readRequiredFields() error {
175
151
176
152
}
177
153
178
- func readUserInput (key string , msg string ) (string , error ) {
179
- userInput , err := prompt .Input (key , msg , false )
180
- if userInput == "" || err != nil {
181
- return userInput , fmt .Errorf ("error reading input for %s" , key )
182
- }
183
- return userInput , nil
184
- }
185
-
186
154
func (p * oidcClusterProvider ) ListPreReqs () []* provider.PreReq {
187
155
return []* provider.PreReq {}
188
156
}
189
157
190
158
func (p * oidcClusterProvider ) CheckPreReqs () error {
191
- return nil
159
+ return utils . CheckKubectlOidcLoginPrereq ()
192
160
}
193
161
194
162
// ConfigurationItems returns the configuration items for this provider
0 commit comments