From 0b7f767c4b41cf431bf01aed384198fb08e1c402 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Mon, 9 Oct 2017 08:20:30 +0200 Subject: [PATCH] generators: allow +groupName everywhere in doc.go ... not only directly above the package directive. --- .../cmd/client-gen/generators/client_generator.go | 2 +- .../cmd/client-gen/generators/fake/generator_fake_for_type.go | 2 +- .../cmd/client-gen/generators/generator_for_group.go | 2 +- .../code-generator/cmd/informer-gen/generators/packages.go | 2 +- .../k8s.io/code-generator/cmd/lister-gen/generators/lister.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go index 70bbf3d3977..4e22d06c4b1 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go @@ -250,7 +250,7 @@ func applyGroupOverrides(universe types.Universe, customArgs *clientgenargs.Cust changes := make(map[clientgentypes.GroupVersion]clientgentypes.GroupVersion) for gv, inputDir := range customArgs.GroupVersionToInputPath { p := universe.Package(inputDir) - if override := types.ExtractCommentTags("+", p.DocComments)["groupName"]; override != nil { + if override := types.ExtractCommentTags("+", p.Comments)["groupName"]; override != nil { newGV := clientgentypes.GroupVersion{ Group: clientgentypes.Group(strings.SplitN(override[0], ".", 2)[0]), Version: gv.Version, diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_type.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_type.go index f3deb368500..0e78bd963ff 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_type.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_type.go @@ -102,7 +102,7 @@ func (g *genFakeForType) GenerateType(c *generator.Context, t *types.Type, w io. // allow user to define a group name that's different from the one parsed from the directory. p := c.Universe.Package(path.Vendorless(g.inputPackage)) - if override := types.ExtractCommentTags("+", p.DocComments)["groupName"]; override != nil { + if override := types.ExtractCommentTags("+", p.Comments)["groupName"]; override != nil { groupName = override[0] } 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 632e17fd825..337ec4d49fb 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 @@ -80,7 +80,7 @@ func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer } // allow user to define a group name that's different from the one parsed from the directory. p := c.Universe.Package(path.Vendorless(g.inputPackage)) - if override := types.ExtractCommentTags("+", p.DocComments)["groupName"]; override != nil { + if override := types.ExtractCommentTags("+", p.Comments)["groupName"]; override != nil { groupName = override[0] } diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/packages.go b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/packages.go index 593e56a2b5f..c7c04e998d9 100644 --- a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/packages.go +++ b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/packages.go @@ -165,7 +165,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat // If there's a comment of the form "// +groupName=somegroup" or // "// +groupName=somegroup.foo.bar.io", use the first field (somegroup) as the name of the // group when generating. - if override := types.ExtractCommentTags("+", p.DocComments)["groupName"]; override != nil { + if override := types.ExtractCommentTags("+", p.Comments)["groupName"]; override != nil { gv.Group = clientgentypes.Group(strings.SplitN(override[0], ".", 2)[0]) } diff --git a/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go b/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go index 9466e3cb07d..69b1c2799c6 100644 --- a/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go +++ b/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go @@ -111,7 +111,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat // If there's a comment of the form "// +groupName=somegroup" or // "// +groupName=somegroup.foo.bar.io", use the first field (somegroup) as the name of the // group when generating. - if override := types.ExtractCommentTags("+", p.DocComments)["groupName"]; override != nil { + if override := types.ExtractCommentTags("+", p.Comments)["groupName"]; override != nil { gv.Group = clientgentypes.Group(strings.SplitN(override[0], ".", 2)[0]) }