From 91735425d3bb66f5ac4a856fd885316f9f287dfa Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Tue, 7 Nov 2017 12:51:39 +0100 Subject: [PATCH] code-generators: remove distinction of 1st and 2nd comment block for tags Kubernetes-commit: b0291f90d1ea0c22230c6bb464ddb3233b09c3b3 --- cmd/client-gen/generators/client_generator.go | 6 +++--- cmd/client-gen/generators/fake/fake_client_generator.go | 2 +- .../generators/fake/generator_fake_for_group.go | 2 +- cmd/client-gen/generators/fake/generator_fake_for_type.go | 4 ++-- cmd/client-gen/generators/generator_for_group.go | 2 +- cmd/client-gen/generators/generator_for_type.go | 4 ++-- cmd/informer-gen/generators/informer.go | 2 +- cmd/informer-gen/generators/packages.go | 8 ++++---- cmd/lister-gen/generators/expansion.go | 2 +- cmd/lister-gen/generators/lister.go | 8 ++++---- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cmd/client-gen/generators/client_generator.go b/cmd/client-gen/generators/client_generator.go index 77e08db5..185dd256 100644 --- a/cmd/client-gen/generators/client_generator.go +++ b/cmd/client-gen/generators/client_generator.go @@ -163,7 +163,7 @@ func packageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, cli return generators }, FilterFunc: func(c *generator.Context, t *types.Type) bool { - return util.MustParseClientGenTags(t.SecondClosestCommentLines).GenerateClient + return util.MustParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)).GenerateClient }, } } @@ -346,7 +346,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat } else { // User has not specified any override for this group version. // filter out types which dont have genclient. - if tags := util.MustParseClientGenTags(t.SecondClosestCommentLines); !tags.GenerateClient { + if tags := util.MustParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)); !tags.GenerateClient { continue } } @@ -395,7 +395,7 @@ type tagOverrideNamer struct { } func (n *tagOverrideNamer) Name(t *types.Type) string { - if nameOverride := extractTag(n.tagName, t.SecondClosestCommentLines); nameOverride != "" { + if nameOverride := extractTag(n.tagName, append(t.SecondClosestCommentLines, t.CommentLines...)); nameOverride != "" { return nameOverride } diff --git a/cmd/client-gen/generators/fake/fake_client_generator.go b/cmd/client-gen/generators/fake/fake_client_generator.go index b1d34951..941cc35b 100644 --- a/cmd/client-gen/generators/fake/fake_client_generator.go +++ b/cmd/client-gen/generators/fake/fake_client_generator.go @@ -79,7 +79,7 @@ func PackageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, cli return generators }, FilterFunc: func(c *generator.Context, t *types.Type) bool { - return util.MustParseClientGenTags(t.SecondClosestCommentLines).GenerateClient + return util.MustParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)).GenerateClient }, } } diff --git a/cmd/client-gen/generators/fake/generator_fake_for_group.go b/cmd/client-gen/generators/fake/generator_fake_for_group.go index 542d2bfa..527395c2 100644 --- a/cmd/client-gen/generators/fake/generator_fake_for_group.go +++ b/cmd/client-gen/generators/fake/generator_fake_for_group.go @@ -73,7 +73,7 @@ func (g *genFakeForGroup) GenerateType(c *generator.Context, t *types.Type, w io sw.Do(groupClientTemplate, m) for _, t := range g.types { - tags, err := util.ParseClientGenTags(t.SecondClosestCommentLines) + tags, err := util.ParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)) if err != nil { return err } diff --git a/cmd/client-gen/generators/fake/generator_fake_for_type.go b/cmd/client-gen/generators/fake/generator_fake_for_type.go index 64060a01..c129a5f4 100644 --- a/cmd/client-gen/generators/fake/generator_fake_for_type.go +++ b/cmd/client-gen/generators/fake/generator_fake_for_type.go @@ -69,7 +69,7 @@ func genStatus(t *types.Type) bool { } } - tags := util.MustParseClientGenTags(t.SecondClosestCommentLines) + tags := util.MustParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)) return hasStatus && !tags.NoStatus } @@ -87,7 +87,7 @@ func hasObjectMeta(t *types.Type) bool { func (g *genFakeForType) GenerateType(c *generator.Context, t *types.Type, w io.Writer) error { sw := generator.NewSnippetWriter(w, c, "$", "$") pkg := filepath.Base(t.Name.Package) - tags, err := util.ParseClientGenTags(t.SecondClosestCommentLines) + tags, err := util.ParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)) if err != nil { return err } diff --git a/cmd/client-gen/generators/generator_for_group.go b/cmd/client-gen/generators/generator_for_group.go index c37a5536..cea097e4 100644 --- a/cmd/client-gen/generators/generator_for_group.go +++ b/cmd/client-gen/generators/generator_for_group.go @@ -105,7 +105,7 @@ func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer sw.Do(groupInterfaceTemplate, m) sw.Do(groupClientTemplate, m) for _, t := range g.types { - tags, err := util.ParseClientGenTags(t.SecondClosestCommentLines) + tags, err := util.ParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)) if err != nil { return err } diff --git a/cmd/client-gen/generators/generator_for_type.go b/cmd/client-gen/generators/generator_for_type.go index 5484717f..92e2a97f 100644 --- a/cmd/client-gen/generators/generator_for_type.go +++ b/cmd/client-gen/generators/generator_for_type.go @@ -67,14 +67,14 @@ func genStatus(t *types.Type) bool { break } } - return hasStatus && !util.MustParseClientGenTags(t.SecondClosestCommentLines).NoStatus + return hasStatus && !util.MustParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)).NoStatus } // GenerateType makes the body of a file implementing the individual typed client for type t. func (g *genClientForType) GenerateType(c *generator.Context, t *types.Type, w io.Writer) error { sw := generator.NewSnippetWriter(w, c, "$", "$") pkg := filepath.Base(t.Name.Package) - tags, err := util.ParseClientGenTags(t.SecondClosestCommentLines) + tags, err := util.ParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)) if err != nil { return err } diff --git a/cmd/informer-gen/generators/informer.go b/cmd/informer-gen/generators/informer.go index 22b09fd5..88cc08df 100644 --- a/cmd/informer-gen/generators/informer.go +++ b/cmd/informer-gen/generators/informer.go @@ -72,7 +72,7 @@ func (g *informerGenerator) GenerateType(c *generator.Context, t *types.Type, w clientSetInterface := c.Universe.Type(types.Name{Package: g.clientSetPackage, Name: "Interface"}) informerFor := "InformerFor" - tags, err := util.ParseClientGenTags(t.SecondClosestCommentLines) + tags, err := util.ParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)) if err != nil { return err } diff --git a/cmd/informer-gen/generators/packages.go b/cmd/informer-gen/generators/packages.go index f65443af..faa01218 100644 --- a/cmd/informer-gen/generators/packages.go +++ b/cmd/informer-gen/generators/packages.go @@ -71,7 +71,7 @@ func generatedBy() string { func objectMetaForPackage(p *types.Package) (*types.Type, bool, error) { generatingForPackage := false for _, t := range p.Types { - if !util.MustParseClientGenTags(t.SecondClosestCommentLines).GenerateClient { + if !util.MustParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)).GenerateClient { continue } generatingForPackage = true @@ -176,7 +176,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat var typesToGenerate []*types.Type for _, t := range p.Types { - tags := util.MustParseClientGenTags(t.SecondClosestCommentLines) + tags := util.MustParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)) if !tags.GenerateClient || tags.NoVerbs || !tags.HasVerb("list") || !tags.HasVerb("watch") { continue } @@ -308,7 +308,7 @@ func groupPackage(basePackage string, groupVersions clientgentypes.GroupVersions return generators }, FilterFunc: func(c *generator.Context, t *types.Type) bool { - tags := util.MustParseClientGenTags(t.SecondClosestCommentLines) + tags := util.MustParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)) return tags.GenerateClient && tags.HasVerb("list") && tags.HasVerb("watch") }, } @@ -351,7 +351,7 @@ func versionPackage(basePackage string, groupPkgName string, gv clientgentypes.G return generators }, FilterFunc: func(c *generator.Context, t *types.Type) bool { - tags := util.MustParseClientGenTags(t.SecondClosestCommentLines) + tags := util.MustParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)) return tags.GenerateClient && tags.HasVerb("list") && tags.HasVerb("watch") }, } diff --git a/cmd/lister-gen/generators/expansion.go b/cmd/lister-gen/generators/expansion.go index 98436846..dd45d774 100644 --- a/cmd/lister-gen/generators/expansion.go +++ b/cmd/lister-gen/generators/expansion.go @@ -43,7 +43,7 @@ func (g *expansionGenerator) Filter(c *generator.Context, t *types.Type) bool { func (g *expansionGenerator) GenerateType(c *generator.Context, t *types.Type, w io.Writer) error { sw := generator.NewSnippetWriter(w, c, "$", "$") for _, t := range g.types { - tags := util.MustParseClientGenTags(t.SecondClosestCommentLines) + tags := util.MustParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)) if _, err := os.Stat(filepath.Join(g.packagePath, strings.ToLower(t.Name.Name+"_expansion.go"))); os.IsNotExist(err) { sw.Do(expansionInterfaceTemplate, t) if !tags.NonNamespaced { diff --git a/cmd/lister-gen/generators/lister.go b/cmd/lister-gen/generators/lister.go index 11e1af0a..3da8d2dd 100644 --- a/cmd/lister-gen/generators/lister.go +++ b/cmd/lister-gen/generators/lister.go @@ -118,7 +118,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat var typesToGenerate []*types.Type for _, t := range p.Types { - tags := util.MustParseClientGenTags(t.SecondClosestCommentLines) + tags := util.MustParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)) if !tags.GenerateClient || !tags.HasVerb("list") || !tags.HasVerb("get") { continue } @@ -160,7 +160,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat return generators }, FilterFunc: func(c *generator.Context, t *types.Type) bool { - tags := util.MustParseClientGenTags(t.SecondClosestCommentLines) + tags := util.MustParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)) return tags.GenerateClient && tags.HasVerb("list") && tags.HasVerb("get") }, }) @@ -174,7 +174,7 @@ func objectMetaForPackage(p *types.Package) (*types.Type, bool, error) { generatingForPackage := false for _, t := range p.Types { // filter out types which dont have genclient. - if !util.MustParseClientGenTags(t.SecondClosestCommentLines).GenerateClient { + if !util.MustParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)).GenerateClient { continue } generatingForPackage = true @@ -238,7 +238,7 @@ func (g *listerGenerator) GenerateType(c *generator.Context, t *types.Type, w io "objectMeta": g.objectMeta, } - tags, err := util.ParseClientGenTags(t.SecondClosestCommentLines) + tags, err := util.ParseClientGenTags(append(t.SecondClosestCommentLines, t.CommentLines...)) if err != nil { return err }