From b165ba2e001dc097772a08e9b5ad916da83fd8b3 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Tue, 16 Feb 2016 10:12:35 -0800 Subject: [PATCH] generator's changes to remove underscore from imported package names --- .../generators/fake/generator_fake_for_clientset.go | 8 ++++---- .../client-gen/generators/generator_for_clientset.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go index 94e453a042d..ff894f1a262 100644 --- a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go +++ b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go @@ -59,9 +59,9 @@ func (g *genClientset) Imports(c *generator.Context) (imports []string) { group := normalization.Group(gv.Group) version := normalization.Version(gv.Version) typedClientPath := filepath.Join(g.typedClientPath, group, version) - imports = append(imports, fmt.Sprintf("%s_%s \"%s\"", group, version, typedClientPath)) + imports = append(imports, fmt.Sprintf("%s%s \"%s\"", version, group, typedClientPath)) fakeTypedClientPath := filepath.Join(typedClientPath, "fake") - imports = append(imports, fmt.Sprintf("%s_%s_fake \"%s\"", group, version, fakeTypedClientPath)) + imports = append(imports, fmt.Sprintf("fake%s%s \"%s\"", version, group, fakeTypedClientPath)) } return } @@ -79,7 +79,7 @@ func (g *genClientset) GenerateType(c *generator.Context, t *types.Type, w io.Wr for _, gv := range g.groupVersions { group := normalization.Group(gv.Group) version := normalization.Version(gv.Version) - allGroups = append(allGroups, arg{namer.IC(group), group + "_" + version}) + allGroups = append(allGroups, arg{namer.IC(group), version + group}) } for _, g := range allGroups { @@ -92,6 +92,6 @@ func (g *genClientset) GenerateType(c *generator.Context, t *types.Type, w io.Wr var clientsetInterfaceImplTemplate = ` // $.Group$ retrieves the $.Group$Client func (c *Clientset) $.Group$() $.PackageName$.$.Group$Interface { - return &$.PackageName$_fake.Fake$.Group${&c.Fake} + return &fake$.PackageName$.Fake$.Group${&c.Fake} } ` diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go b/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go index 2d57224a430..a0868969e69 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go @@ -59,7 +59,7 @@ func (g *genClientset) Imports(c *generator.Context) (imports []string) { group := normalization.Group(gv.Group) version := normalization.Version(gv.Version) typedClientPath := filepath.Join(g.typedClientPath, group, version) - imports = append(imports, fmt.Sprintf("%s_%s \"%s\"", group, version, typedClientPath)) + imports = append(imports, fmt.Sprintf("%s%s \"%s\"", version, group, typedClientPath)) imports = append(imports, "github.com/golang/glog") } return @@ -80,7 +80,7 @@ func (g *genClientset) GenerateType(c *generator.Context, t *types.Type, w io.Wr for _, gv := range g.groupVersions { group := normalization.Group(gv.Group) version := normalization.Version(gv.Version) - allGroups = append(allGroups, arg{namer.IC(group), group + "_" + version}) + allGroups = append(allGroups, arg{namer.IC(group), version + group}) } m := map[string]interface{}{