Skip to content

Commit c3eba35

Browse files
committed
Remove always-nil setConfigDefaults error return value in generated clients
The error returned by setConfigDefaults called in NewForConfig{,AndClient} in generated clients is always nil. Hence, the error return can be omitted and the respective error checking code can be avoided.
1 parent cb93d6e commit c3eba35

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,7 @@ var newClientForConfigTemplate = `
169169
// where httpClient was generated with rest.HTTPClientFor(c).
170170
func NewForConfig(c *$.restConfig|raw$) (*$.GroupGoName$$.Version$Client, error) {
171171
config := *c
172-
if err := setConfigDefaults(&config); err != nil {
173-
return nil, err
174-
}
172+
setConfigDefaults(&config)
175173
httpClient, err := $.RESTHTTPClientFor|raw$(&config)
176174
if err != nil {
177175
return nil, err
@@ -185,9 +183,7 @@ var newClientForConfigAndClientTemplate = `
185183
// Note the http client provided takes precedence over the configured transport values.
186184
func NewForConfigAndClient(c *$.restConfig|raw$, h *$.httpClient|raw$) (*$.GroupGoName$$.Version$Client, error) {
187185
config := *c
188-
if err := setConfigDefaults(&config); err != nil {
189-
return nil, err
190-
}
186+
setConfigDefaults(&config)
191187
client, err := $.restRESTClientForConfigAndClient|raw$(&config, h)
192188
if err != nil {
193189
return nil, err
@@ -227,7 +223,7 @@ func New(c $.restRESTClientInterface|raw$) *$.GroupGoName$$.Version$Client {
227223
`
228224

229225
var setInternalVersionClientDefaultsTemplate = `
230-
func setConfigDefaults(config *$.restConfig|raw$) error {
226+
func setConfigDefaults(config *$.restConfig|raw$) {
231227
config.APIPath = $.apiPath$
232228
if config.UserAgent == "" {
233229
config.UserAgent = $.restDefaultKubernetesUserAgent|raw$()
@@ -244,13 +240,11 @@ func setConfigDefaults(config *$.restConfig|raw$) error {
244240
if config.Burst == 0 {
245241
config.Burst = 10
246242
}
247-
248-
return nil
249243
}
250244
`
251245

252246
var setClientDefaultsTemplate = `
253-
func setConfigDefaults(config *$.restConfig|raw$) error {
247+
func setConfigDefaults(config *$.restConfig|raw$) {
254248
gv := $.SchemeGroupVersion|raw$
255249
config.GroupVersion = &gv
256250
config.APIPath = $.apiPath$
@@ -259,7 +253,5 @@ func setConfigDefaults(config *$.restConfig|raw$) error {
259253
if config.UserAgent == "" {
260254
config.UserAgent = $.restDefaultKubernetesUserAgent|raw$()
261255
}
262-
263-
return nil
264256
}
265257
`

0 commit comments

Comments
 (0)