github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

generator's changes to remove underscore from imported package names

pull/6/head
Chao Xu 2016-02-16 10:12:35 -08:00
parent e482501e8c
commit b165ba2e00
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go
View File

@ -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}
}
`

4
cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go
View File

@ -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{}{