github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-15 14:53:44 +00:00
Code Issues Projects Releases Wiki Activity

Remove always-nil setConfigDefaults error return value in generated clients

Browse Source 
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.
This commit is contained in:
Tobias Klauser 2024-12-15 23:19:00 +01:00
parent cb93d6ee69
commit c3eba35aa2
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,9 +169,7 @@ var newClientForConfigTemplate = `
// where httpClient was generated with rest.HTTPClientFor(c). // where httpClient was generated with rest.HTTPClientFor(c).
func NewForConfig(c *$.restConfig|raw$) (*$.GroupGoName$$.Version$Client, error) { func NewForConfig(c *$.restConfig|raw$) (*$.GroupGoName$$.Version$Client, error) {
config := *c config := *c
if err := setConfigDefaults(&config); err != nil { setConfigDefaults(&config)
return nil, err
}
httpClient, err := $.RESTHTTPClientFor|raw$(&config) httpClient, err := $.RESTHTTPClientFor|raw$(&config)
if err != nil { if err != nil {
return nil, err return nil, err
@ -185,9 +183,7 @@ var newClientForConfigAndClientTemplate = `
// Note the http client provided takes precedence over the configured transport values. // Note the http client provided takes precedence over the configured transport values.
func NewForConfigAndClient(c *$.restConfig|raw$, h *$.httpClient|raw$) (*$.GroupGoName$$.Version$Client, error) { func NewForConfigAndClient(c *$.restConfig|raw$, h *$.httpClient|raw$) (*$.GroupGoName$$.Version$Client, error) {
config := *c config := *c
if err := setConfigDefaults(&config); err != nil { setConfigDefaults(&config)
return nil, err
}
client, err := $.restRESTClientForConfigAndClient|raw$(&config, h) client, err := $.restRESTClientForConfigAndClient|raw$(&config, h)
if err != nil { if err != nil {
return nil, err return nil, err
@ -227,7 +223,7 @@ func New(c $.restRESTClientInterface|raw$) *$.GroupGoName$$.Version$Client {
` `
var setInternalVersionClientDefaultsTemplate = ` var setInternalVersionClientDefaultsTemplate = `
func setConfigDefaults(config *$.restConfig|raw$) error { func setConfigDefaults(config *$.restConfig|raw$) {
config.APIPath = $.apiPath$ config.APIPath = $.apiPath$
if config.UserAgent == "" { if config.UserAgent == "" {
config.UserAgent = $.restDefaultKubernetesUserAgent|raw$() config.UserAgent = $.restDefaultKubernetesUserAgent|raw$()
@ -244,13 +240,11 @@ func setConfigDefaults(config *$.restConfig|raw$) error {
if config.Burst == 0 { if config.Burst == 0 {
config.Burst = 10 config.Burst = 10
} }
return nil
} }
` `
var setClientDefaultsTemplate = ` var setClientDefaultsTemplate = `
func setConfigDefaults(config *$.restConfig|raw$) error { func setConfigDefaults(config *$.restConfig|raw$) {
gv := $.SchemeGroupVersion|raw$ gv := $.SchemeGroupVersion|raw$
config.GroupVersion = &gv config.GroupVersion = &gv
config.APIPath = $.apiPath$ config.APIPath = $.apiPath$
@ -259,7 +253,5 @@ func setConfigDefaults(config *$.restConfig|raw$) error {
if config.UserAgent == "" { if config.UserAgent == "" {
config.UserAgent = $.restDefaultKubernetesUserAgent|raw$() config.UserAgent = $.restDefaultKubernetesUserAgent|raw$()
} }
return nil
} }
` `