Skip to content

Commit 74422ad

Browse files
mjudeikismjudeikis
committed
Generated code
Signed-off-by: Mangirdas Judeikis <[email protected]> On-behalf-of: SAP [email protected]
1 parent b6ef9af commit 74422ad

File tree

8 files changed

+45
-21
lines changed

8 files changed

+45
-21
lines changed

‎pkg/generators/clientgen/clientgen.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
154154

155155
for group, versions := range groupVersionKinds {
156156
for version, kinds := range versions {
157-
groupDir := filepath.Join(clientsetDir, "typed", group.PackageName(), version.PackageName())
157+
groupDir := filepath.Join(clientsetDir, "typed", group.PackagePath(), version.PackageName())
158158
outputFile := filepath.Join(groupDir, group.PackageName()+"_client.go")
159159
logger := logger.WithValues(
160160
"group", group.String(),
@@ -244,8 +244,8 @@ func toGroupVersionInfo(group parser.Group, version types.PackageVersion) types.
244244
return types.GroupVersionInfo{
245245
Group: group.Group,
246246
Version: types.Version(namer.IC(version.Version.String())),
247-
PackageAlias: strings.ToLower(group.GoName + version.Version.NonEmpty()),
248-
GroupGoName: group.GoName,
249-
LowerCaseGroupGoName: namer.IL(group.GoName),
247+
PackageAlias: strings.ReplaceAll(strings.ToLower(group.GoName+version.Version.NonEmpty()), "-", ""),
248+
GroupGoName: strings.ReplaceAll(group.GoName, "-", ""),
249+
LowerCaseGroupGoName: strings.ReplaceAll(namer.IL(group.GoName), "-", ""),
250250
}
251251
}

‎pkg/generators/informergen/informergen.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
178178
}
179179

180180
for group, versions := range groupVersionKinds {
181-
groupDir := filepath.Join(informersDir, group.PackageName())
181+
groupDir := filepath.Join(informersDir, group.PackagePath())
182182
outputFile := filepath.Join(groupDir, "interface.go")
183183
logger := logger.WithValues(
184184
"group", group.String(),
@@ -264,8 +264,8 @@ func toGroupVersionInfo(group parser.Group, version types.PackageVersion) types.
264264
return types.GroupVersionInfo{
265265
Group: group.Group,
266266
Version: types.Version(namer.IC(version.Version.String())),
267-
PackageAlias: strings.ToLower(group.GoName + version.Version.NonEmpty()),
268-
GroupGoName: group.GoName,
269-
LowerCaseGroupGoName: namer.IL(group.GoName),
267+
PackageAlias: strings.ReplaceAll(strings.ToLower(group.GoName+version.Version.NonEmpty()), "-", ""),
268+
GroupGoName: strings.ReplaceAll(group.GoName, "-", ""),
269+
LowerCaseGroupGoName: strings.ReplaceAll(namer.IL(group.GoName), "-", ""),
270270
}
271271
}

‎pkg/generators/listergen/listergen.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
8686
for version, kinds := range versions {
8787
groupInfo := toGroupVersionInfo(group, version)
8888
for _, kind := range kinds {
89-
listerDir := filepath.Join("listers", group.PackageName(), version.PackageName())
89+
listerDir := filepath.Join("listers", group.PackagePath(), version.PackageName())
9090
outputFile := filepath.Join(listerDir, strings.ToLower(kind.String())+".go")
9191
logger := klog.Background().WithValues(
9292
"group", group.String(),
@@ -130,8 +130,8 @@ func toGroupVersionInfo(group parser.Group, version types.PackageVersion) types.
130130
return types.GroupVersionInfo{
131131
Group: group.Group,
132132
Version: types.Version(namer.IC(version.Version.String())),
133-
PackageAlias: strings.ToLower(group.GoName + version.Version.NonEmpty()),
134-
GroupGoName: group.GoName,
135-
LowerCaseGroupGoName: namer.IL(group.GoName),
133+
PackageAlias: strings.ReplaceAll(strings.ToLower(group.GoName+version.Version.NonEmpty()), "-", ""),
134+
GroupGoName: strings.ReplaceAll(group.GoName, "-", ""),
135+
LowerCaseGroupGoName: strings.ReplaceAll(namer.IL(group.GoName), "-", ""),
136136
}
137137
}

‎pkg/internal/clientgen/clientset.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ func (c *ClientSet) WriteContent(w io.Writer) error {
3838

3939
m := map[string]interface{}{
4040
"name": c.Name,
41+
"packageName": strings.ReplaceAll(c.Name, "-", ""),
4142
"packagePath": c.PackagePath,
4243
"groups": c.Groups,
4344
"singleClusterClientPackagePath": c.SingleClusterClientPackagePath,
@@ -51,7 +52,7 @@ var clientset = `
5152
5253
// Code generated by kcp code-generator. DO NOT EDIT.
5354
54-
package {{.name}}
55+
package {{.packageName}}
5556
5657
import (
5758
"fmt"

‎pkg/internal/informergen/factory.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ import (
9292
upstreaminformers "{{.singleClusterInformerPackagePath}}"
9393
{{end -}}
9494
95-
{{range .groups}} {{.Group.PackageName}}informers "{{$.packagePath}}/{{.Group.PackageName}}"
95+
{{range .groups}} {{.PackageName}}informers "{{$.packagePath}}/{{.Group.PackageName}}"
9696
{{end -}}
9797
9898
"{{.packagePath}}/internalinterfaces"
@@ -329,12 +329,12 @@ type SharedInformerFactory interface {
329329
// InformerFor returns the SharedIndexInformer for obj.
330330
InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) kcpcache.ScopeableSharedIndexInformer
331331
332-
{{range .groups}} {{.GoName}}() {{.Group.PackageName}}informers.ClusterInterface
332+
{{range .groups}} {{.GoNameAlias}}() {{.PackageName}}informers.ClusterInterface
333333
{{end -}}
334334
}
335335
336336
{{range .groups}}
337-
func (f *sharedInformerFactory) {{.GoName}}() {{.Group.PackageName}}informers.ClusterInterface {
337+
func (f *sharedInformerFactory) {{.GoNameAlias}}() {{.PackageName}}informers.ClusterInterface {
338338
return {{.Group.PackageName}}informers.New(f, f.tweakListOptions)
339339
}
340340
{{end}}
@@ -485,13 +485,13 @@ type SharedScopedInformerFactory interface {
485485
ForResource(resource schema.GroupVersionResource) (GenericInformer, error)
486486
WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool
487487
488-
{{range .groups}} {{.GoName}}() {{.Group.PackageName}}informers.Interface
488+
{{range .groups}} {{.GoNameAlias}}() {{.PackageName}}informers.Interface
489489
{{end -}}
490490
}
491491
492492
493493
{{range .groups}}
494-
func (f *sharedScopedInformerFactory) {{.GoName}}() {{.Group.PackageName}}informers.Interface {
494+
func (f *sharedScopedInformerFactory) {{.GoNameAlias}}() {{.PackageName}}informers.Interface {
495495
return {{.Group.PackageName}}informers.NewScoped(f, f.namespace, f.tweakListOptions)
496496
}
497497
{{end}}

‎pkg/internal/informergen/groupinterface.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package informergen
1818

1919
import (
2020
"io"
21+
"strings"
2122
"text/template"
2223

2324
"k8s.io/code-generator/cmd/client-gen/types"
@@ -49,6 +50,7 @@ func (g GroupInterface) WriteContent(w io.Writer) error {
4950

5051
m := map[string]interface{}{
5152
"group": g.Group,
53+
"packageName": strings.ReplaceAll(g.Group.PackageName(), "-", ""),
5254
"packagePath": g.PackagePath,
5355
"versions": g.Versions,
5456
"useUpstreamInterfaces": g.UseUpstreamInterfaces,
@@ -62,7 +64,7 @@ var groupInterface = `
6264
6365
// Code generated by kcp code-generator. DO NOT EDIT.
6466
65-
package {{.group.Group.PackageName}}
67+
package {{.packageName}}
6668
6769
import (
6870
{{range .versions}} "{{$.packagePath}}/{{$.group.Group.PackageName}}/{{.PackageName}}"

‎pkg/internal/informergen/versioninterface.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package informergen
1818

1919
import (
2020
"io"
21+
"strings"
2122
"text/template"
2223

2324
"k8s.io/code-generator/cmd/client-gen/types"
@@ -51,6 +52,7 @@ func (v *VersionInterface) WriteContent(w io.Writer) error {
5152
"version": v.Version,
5253
"kinds": v.Kinds,
5354
"packagePath": v.PackagePath,
55+
"packageName": strings.ReplaceAll(v.Version.PackageName(), "-", ""),
5456
"useUpstreamInterfaces": v.UseUpstreamInterfaces,
5557
}
5658
return templ.Execute(w, m)
@@ -62,7 +64,7 @@ var versionInterfaceTemplate = `
6264
6365
// Code generated by kcp code-generator. DO NOT EDIT.
6466
65-
package {{.version.PackageName}}
67+
package {{.packageName}}
6668
6769
import (
6870
"{{.packagePath}}/internalinterfaces"

‎pkg/parser/types.go‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ limitations under the License.
1717
package parser
1818

1919
import (
20+
"strings"
21+
2022
"k8s.io/apimachinery/pkg/util/sets"
2123
"k8s.io/code-generator/cmd/client-gen/types"
2224

@@ -34,7 +36,24 @@ type Kind struct {
3436

3537
type Group struct {
3638
types.Group
37-
GoName string
39+
GoName string `marker:",+groupGoName"`
40+
PackageAlias string
41+
}
42+
43+
func (g *Group) GoPackageAlias() string {
44+
return strings.ToLower(strings.ReplaceAll(g.GoName, "-", ""))
45+
}
46+
47+
func (g Group) GoNameAlias() string {
48+
return strings.ReplaceAll(g.GoName, "-", "")
49+
}
50+
51+
func (g Group) PackagePath() string {
52+
return strings.ToLower(g.Group.PackageName())
53+
}
54+
55+
func (g Group) PackageName() string {
56+
return strings.ToLower(strings.ReplaceAll(g.Group.PackageName(), "-", ""))
3857
}
3958

4059
func (k *Kind) Plural() string {

0 commit comments

Comments
 (0)