github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #52079 from sttts/sttts-clientgen-panic-empty-group 

Automatic merge from submit-queue (batch tested with PRs 52073, 52079)

client-gen: avoid panic for empty groups
pull/6/head
Kubernetes Submit Queue 2017-09-07 10:11:16 -07:00 committed by GitHub
parent 7386f0df9c 4039a72234
commit 42e2ca8c18
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_group.go
View File

@ -45,7 +45,7 @@ var _ generator.Generator = &genFakeForGroup{}
// We only want to call GenerateType() once per group.
func (g *genFakeForGroup) Filter(c *generator.Context, t *types.Type) bool {
return t == g.types[0]
return len(g.types) == 0 || t == g.types[0]
}
func (g *genFakeForGroup) Namers(c *generator.Context) namer.NameSystems {

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

@ -36,7 +36,7 @@ type genExpansion struct {
// We only want to call GenerateType() once per group.
func (g *genExpansion) Filter(c *generator.Context, t *types.Type) bool {
return t == g.types[0]
return len(g.types) == 0 || t == g.types[0]
}
func (g *genExpansion) GenerateType(c *generator.Context, t *types.Type, w io.Writer) error {

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

@ -46,7 +46,7 @@ var _ generator.Generator = &genGroup{}
// We only want to call GenerateType() once per group.
func (g *genGroup) Filter(c *generator.Context, t *types.Type) bool {
return t == g.types[0]
return len(g.types) == 0 || t == g.types[0]
}
func (g *genGroup) Namers(c *generator.Context) namer.NameSystems {