From 4039a722345065fb252775a180283fec417ce501 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Thu, 7 Sep 2017 10:40:39 +0200 Subject: [PATCH] client-gen: avoid panic for empty groups --- .../cmd/client-gen/generators/fake/generator_fake_for_group.go | 2 +- .../cmd/client-gen/generators/generator_for_expansion.go | 2 +- .../cmd/client-gen/generators/generator_for_group.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_group.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_group.go index 31f49c6131a..83b7fe78a60 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_group.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_group.go @@ -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 { diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_expansion.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_expansion.go index 67bac65735a..f47c079e02f 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_expansion.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_expansion.go @@ -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 { diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go index d1fda0c8d88..632e17fd825 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go @@ -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 {