Commit 42e2ca8c authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

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
parents 7386f0df 4039a722
...@@ -45,7 +45,7 @@ var _ generator.Generator = &genFakeForGroup{} ...@@ -45,7 +45,7 @@ var _ generator.Generator = &genFakeForGroup{}
// We only want to call GenerateType() once per group. // We only want to call GenerateType() once per group.
func (g *genFakeForGroup) Filter(c *generator.Context, t *types.Type) bool { 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 { func (g *genFakeForGroup) Namers(c *generator.Context) namer.NameSystems {
......
...@@ -36,7 +36,7 @@ type genExpansion struct { ...@@ -36,7 +36,7 @@ type genExpansion struct {
// We only want to call GenerateType() once per group. // We only want to call GenerateType() once per group.
func (g *genExpansion) Filter(c *generator.Context, t *types.Type) bool { 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 { func (g *genExpansion) GenerateType(c *generator.Context, t *types.Type, w io.Writer) error {
......
...@@ -46,7 +46,7 @@ var _ generator.Generator = &genGroup{} ...@@ -46,7 +46,7 @@ var _ generator.Generator = &genGroup{}
// We only want to call GenerateType() once per group. // We only want to call GenerateType() once per group.
func (g *genGroup) Filter(c *generator.Context, t *types.Type) bool { 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 { func (g *genGroup) Namers(c *generator.Context) namer.NameSystems {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment