github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

client-gen: use template function declarations for gentype

Browse Source 
Instead of hard-coding gentype in the templates, use template function
declarations; this ensures that the package is correctly imported.

Signed-off-by: Stephen Kitt <skitt@redhat.com>
This commit is contained in:
Stephen Kitt 2024-07-05 14:27:41 +02:00
parent 58c44005cd
commit 61aefc609f
No known key found for this signature in database
GPG Key ID: 1CC5FA453662A71D
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,6 +180,10 @@ func (g *genClientForType) GenerateType(c *generator.Context, t *types.Type, w i
"ClientWithList": c.Universe.Type(types.Name{Package: "k8s.io/client-go/gentype", Name: "ClientWithList"}), "ClientWithList": c.Universe.Type(types.Name{Package: "k8s.io/client-go/gentype", Name: "ClientWithList"}),
"ClientWithApply": c.Universe.Type(types.Name{Package: "k8s.io/client-go/gentype", Name: "ClientWithApply"}), "ClientWithApply": c.Universe.Type(types.Name{Package: "k8s.io/client-go/gentype", Name: "ClientWithApply"}),
"ClientWithListAndApply": c.Universe.Type(types.Name{Package: "k8s.io/client-go/gentype", Name: "ClientWithListAndApply"}), "ClientWithListAndApply": c.Universe.Type(types.Name{Package: "k8s.io/client-go/gentype", Name: "ClientWithListAndApply"}),
"NewClient": c.Universe.Function(types.Name{Package: "k8s.io/client-go/gentype", Name: "NewClient"}),
"NewClientWithApply": c.Universe.Function(types.Name{Package: "k8s.io/client-go/gentype", Name: "NewClientWithApply"}),
"NewClientWithList": c.Universe.Function(types.Name{Package: "k8s.io/client-go/gentype", Name: "NewClientWithList"}),
"NewClientWithListAndApply": c.Universe.Function(types.Name{Package: "k8s.io/client-go/gentype", Name: "NewClientWithListAndApply"}),
} }
if generateApply { if generateApply {
@ -472,7 +476,7 @@ var newStruct = []string{
// new$.type|publicPlural$ returns a $.type|publicPlural$ // new$.type|publicPlural$ returns a $.type|publicPlural$
func new$.type|publicPlural$(c *$.GroupGoName$$.Version$Client, namespace string) *$.type|privatePlural$ { func new$.type|publicPlural$(c *$.GroupGoName$$.Version$Client, namespace string) *$.type|privatePlural$ {
return &$.type|privatePlural${ return &$.type|privatePlural${
gentype.NewClient[*$.resultType|raw$]( $.NewClient|raw$[*$.resultType|raw$](
"$.type|resource$", "$.type|resource$",
c.RESTClient(), c.RESTClient(),
$.schemeParameterCodec|raw$, $.schemeParameterCodec|raw$,
@ -485,7 +489,7 @@ var newStruct = []string{
// new$.type|publicPlural$ returns a $.type|publicPlural$ // new$.type|publicPlural$ returns a $.type|publicPlural$
func new$.type|publicPlural$(c *$.GroupGoName$$.Version$Client, namespace string) *$.type|privatePlural$ { func new$.type|publicPlural$(c *$.GroupGoName$$.Version$Client, namespace string) *$.type|privatePlural$ {
return &$.type|privatePlural${ return &$.type|privatePlural${
gentype.NewClientWithApply[*$.resultType|raw$, *$.inputApplyConfig|raw$]( $.NewClientWithApply|raw$[*$.resultType|raw$, *$.inputApplyConfig|raw$](
"$.type|resource$", "$.type|resource$",
c.RESTClient(), c.RESTClient(),
$.schemeParameterCodec|raw$, $.schemeParameterCodec|raw$,
@ -498,7 +502,7 @@ var newStruct = []string{
// new$.type|publicPlural$ returns a $.type|publicPlural$ // new$.type|publicPlural$ returns a $.type|publicPlural$
func new$.type|publicPlural$(c *$.GroupGoName$$.Version$Client, namespace string) *$.type|privatePlural$ { func new$.type|publicPlural$(c *$.GroupGoName$$.Version$Client, namespace string) *$.type|privatePlural$ {
return &$.type|privatePlural${ return &$.type|privatePlural${
gentype.NewClientWithList[*$.resultType|raw$, *$.resultType|raw$List]( $.NewClientWithList|raw$[*$.resultType|raw$, *$.resultType|raw$List](
"$.type|resource$", "$.type|resource$",
c.RESTClient(), c.RESTClient(),
$.schemeParameterCodec|raw$, $.schemeParameterCodec|raw$,
@ -512,7 +516,7 @@ var newStruct = []string{
// new$.type|publicPlural$ returns a $.type|publicPlural$ // new$.type|publicPlural$ returns a $.type|publicPlural$
func new$.type|publicPlural$(c *$.GroupGoName$$.Version$Client, namespace string) *$.type|privatePlural$ { func new$.type|publicPlural$(c *$.GroupGoName$$.Version$Client, namespace string) *$.type|privatePlural$ {
return &$.type|privatePlural${ return &$.type|privatePlural${
gentype.NewClientWithListAndApply[*$.resultType|raw$, *$.resultType|raw$List, *$.inputApplyConfig|raw$]( $.NewClientWithListAndApply|raw$[*$.resultType|raw$, *$.resultType|raw$List, *$.inputApplyConfig|raw$](
"$.type|resource$", "$.type|resource$",
c.RESTClient(), c.RESTClient(),
$.schemeParameterCodec|raw$, $.schemeParameterCodec|raw$,
@ -526,7 +530,7 @@ var newStruct = []string{
// new$.type|publicPlural$ returns a $.type|publicPlural$ // new$.type|publicPlural$ returns a $.type|publicPlural$
func new$.type|publicPlural$(c *$.GroupGoName$$.Version$Client) *$.type|privatePlural$ { func new$.type|publicPlural$(c *$.GroupGoName$$.Version$Client) *$.type|privatePlural$ {
return &$.type|privatePlural${ return &$.type|privatePlural${
gentype.NewClient[*$.resultType|raw$]( $.NewClient|raw$[*$.resultType|raw$](
"$.type|resource$", "$.type|resource$",
c.RESTClient(), c.RESTClient(),
$.schemeParameterCodec|raw$, $.schemeParameterCodec|raw$,
@ -539,7 +543,7 @@ var newStruct = []string{
// new$.type|publicPlural$ returns a $.type|publicPlural$ // new$.type|publicPlural$ returns a $.type|publicPlural$
func new$.type|publicPlural$(c *$.GroupGoName$$.Version$Client) *$.type|privatePlural$ { func new$.type|publicPlural$(c *$.GroupGoName$$.Version$Client) *$.type|privatePlural$ {
return &$.type|privatePlural${ return &$.type|privatePlural${
gentype.NewClientWithApply[*$.resultType|raw$, *$.inputApplyConfig|raw$]( $.NewClientWithApply|raw$[*$.resultType|raw$, *$.inputApplyConfig|raw$](
"$.type|resource$", "$.type|resource$",
c.RESTClient(), c.RESTClient(),
$.schemeParameterCodec|raw$, $.schemeParameterCodec|raw$,
@ -552,7 +556,7 @@ var newStruct = []string{
// new$.type|publicPlural$ returns a $.type|publicPlural$ // new$.type|publicPlural$ returns a $.type|publicPlural$
func new$.type|publicPlural$(c *$.GroupGoName$$.Version$Client) *$.type|privatePlural$ { func new$.type|publicPlural$(c *$.GroupGoName$$.Version$Client) *$.type|privatePlural$ {
return &$.type|privatePlural${ return &$.type|privatePlural${
gentype.NewClientWithList[*$.resultType|raw$, *$.resultType|raw$List]( $.NewClientWithList|raw$[*$.resultType|raw$, *$.resultType|raw$List](
"$.type|resource$", "$.type|resource$",
c.RESTClient(), c.RESTClient(),
$.schemeParameterCodec|raw$, $.schemeParameterCodec|raw$,
@ -566,7 +570,7 @@ var newStruct = []string{
// new$.type|publicPlural$ returns a $.type|publicPlural$ // new$.type|publicPlural$ returns a $.type|publicPlural$
func new$.type|publicPlural$(c *$.GroupGoName$$.Version$Client) *$.type|privatePlural$ { func new$.type|publicPlural$(c *$.GroupGoName$$.Version$Client) *$.type|privatePlural$ {
return &$.type|privatePlural${ return &$.type|privatePlural${
gentype.NewClientWithListAndApply[*$.resultType|raw$, *$.resultType|raw$List, *$.inputApplyConfig|raw$]( $.NewClientWithListAndApply|raw$[*$.resultType|raw$, *$.resultType|raw$List, *$.inputApplyConfig|raw$](
"$.type|resource$", "$.type|resource$",
c.RESTClient(), c.RESTClient(),
$.schemeParameterCodec|raw$, $.schemeParameterCodec|raw$,