Generated code

Signed-off-by: Mangirdas Judeikis <Mangirdas@Judeikis.LT> On-behalf-of: SAP mangirdas.judeikis@sap.com
kcp-dev · Dec 8, 2024 · 74422ad · 74422ad
1 parent b6ef9af
commit 74422ad
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 21 deletions.
diff --git a/pkg/generators/clientgen/clientgen.go b/pkg/generators/clientgen/clientgen.go
@@ -154,7 +154,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
 
 	for group, versions := range groupVersionKinds {
 		for version, kinds := range versions {
-			groupDir := filepath.Join(clientsetDir, "typed", group.PackageName(), version.PackageName())
+			groupDir := filepath.Join(clientsetDir, "typed", group.PackagePath(), version.PackageName())
 			outputFile := filepath.Join(groupDir, group.PackageName()+"_client.go")
 			logger := logger.WithValues(
 				"group", group.String(),
@@ -244,8 +244,8 @@ func toGroupVersionInfo(group parser.Group, version types.PackageVersion) types.
 	return types.GroupVersionInfo{
 		Group:                group.Group,
 		Version:              types.Version(namer.IC(version.Version.String())),
-		PackageAlias:         strings.ToLower(group.GoName + version.Version.NonEmpty()),
-		GroupGoName:          group.GoName,
-		LowerCaseGroupGoName: namer.IL(group.GoName),
+		PackageAlias:         strings.ReplaceAll(strings.ToLower(group.GoName+version.Version.NonEmpty()), "-", ""),
+		GroupGoName:          strings.ReplaceAll(group.GoName, "-", ""),
+		LowerCaseGroupGoName: strings.ReplaceAll(namer.IL(group.GoName), "-", ""),
 	}
 }
diff --git a/pkg/generators/informergen/informergen.go b/pkg/generators/informergen/informergen.go
@@ -178,7 +178,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
 	}
 
 	for group, versions := range groupVersionKinds {
-		groupDir := filepath.Join(informersDir, group.PackageName())
+		groupDir := filepath.Join(informersDir, group.PackagePath())
 		outputFile := filepath.Join(groupDir, "interface.go")
 		logger := logger.WithValues(
 			"group", group.String(),
@@ -264,8 +264,8 @@ func toGroupVersionInfo(group parser.Group, version types.PackageVersion) types.
 	return types.GroupVersionInfo{
 		Group:                group.Group,
 		Version:              types.Version(namer.IC(version.Version.String())),
-		PackageAlias:         strings.ToLower(group.GoName + version.Version.NonEmpty()),
-		GroupGoName:          group.GoName,
-		LowerCaseGroupGoName: namer.IL(group.GoName),
+		PackageAlias:         strings.ReplaceAll(strings.ToLower(group.GoName+version.Version.NonEmpty()), "-", ""),
+		GroupGoName:          strings.ReplaceAll(group.GoName, "-", ""),
+		LowerCaseGroupGoName: strings.ReplaceAll(namer.IL(group.GoName), "-", ""),
 	}
 }
diff --git a/pkg/generators/listergen/listergen.go b/pkg/generators/listergen/listergen.go
@@ -86,7 +86,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
 		for version, kinds := range versions {
 			groupInfo := toGroupVersionInfo(group, version)
 			for _, kind := range kinds {
-				listerDir := filepath.Join("listers", group.PackageName(), version.PackageName())
+				listerDir := filepath.Join("listers", group.PackagePath(), version.PackageName())
 				outputFile := filepath.Join(listerDir, strings.ToLower(kind.String())+".go")
 				logger := klog.Background().WithValues(
 					"group", group.String(),
@@ -130,8 +130,8 @@ func toGroupVersionInfo(group parser.Group, version types.PackageVersion) types.
 	return types.GroupVersionInfo{
 		Group:                group.Group,
 		Version:              types.Version(namer.IC(version.Version.String())),
-		PackageAlias:         strings.ToLower(group.GoName + version.Version.NonEmpty()),
-		GroupGoName:          group.GoName,
-		LowerCaseGroupGoName: namer.IL(group.GoName),
+		PackageAlias:         strings.ReplaceAll(strings.ToLower(group.GoName+version.Version.NonEmpty()), "-", ""),
+		GroupGoName:          strings.ReplaceAll(group.GoName, "-", ""),
+		LowerCaseGroupGoName: strings.ReplaceAll(namer.IL(group.GoName), "-", ""),
 	}
 }
diff --git a/pkg/internal/clientgen/clientset.go b/pkg/internal/clientgen/clientset.go
@@ -38,6 +38,7 @@ func (c *ClientSet) WriteContent(w io.Writer) error {
 
 	m := map[string]interface{}{
 		"name":                           c.Name,
+		"packageName":                    strings.ReplaceAll(c.Name, "-", ""),
 		"packagePath":                    c.PackagePath,
 		"groups":                         c.Groups,
 		"singleClusterClientPackagePath": c.SingleClusterClientPackagePath,
@@ -51,7 +52,7 @@ var clientset = `
 
 // Code generated by kcp code-generator. DO NOT EDIT.
 
-package {{.name}}
+package {{.packageName}}
 
 import (
 	"fmt"

diff --git a/pkg/internal/informergen/factory.go b/pkg/internal/informergen/factory.go
@@ -92,7 +92,7 @@ import (
 	upstreaminformers "{{.singleClusterInformerPackagePath}}"
 	{{end -}}
 
-{{range .groups}}	{{.Group.PackageName}}informers "{{$.packagePath}}/{{.Group.PackageName}}"
+{{range .groups}}	{{.PackageName}}informers "{{$.packagePath}}/{{.Group.PackageName}}"
 {{end -}}
 
 	"{{.packagePath}}/internalinterfaces"
@@ -329,12 +329,12 @@ type SharedInformerFactory interface {
 	// InformerFor returns the SharedIndexInformer for obj.
 	InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) kcpcache.ScopeableSharedIndexInformer
 
-{{range .groups}}	{{.GoName}}() {{.Group.PackageName}}informers.ClusterInterface
+{{range .groups}}	{{.GoNameAlias}}() {{.PackageName}}informers.ClusterInterface
 {{end -}}
 }
 
 {{range .groups}}
-func (f *sharedInformerFactory) {{.GoName}}() {{.Group.PackageName}}informers.ClusterInterface {
+func (f *sharedInformerFactory) {{.GoNameAlias}}() {{.PackageName}}informers.ClusterInterface {
   return {{.Group.PackageName}}informers.New(f, f.tweakListOptions)
 }
 {{end}}
@@ -485,13 +485,13 @@ type SharedScopedInformerFactory interface {
 	ForResource(resource schema.GroupVersionResource) (GenericInformer, error)
 	WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool
 
-{{range .groups}}	{{.GoName}}() {{.Group.PackageName}}informers.Interface
+{{range .groups}}	{{.GoNameAlias}}() {{.PackageName}}informers.Interface
 {{end -}}
 }
 
 
 {{range .groups}}
-func (f *sharedScopedInformerFactory) {{.GoName}}() {{.Group.PackageName}}informers.Interface {
+func (f *sharedScopedInformerFactory) {{.GoNameAlias}}() {{.PackageName}}informers.Interface {
   return {{.Group.PackageName}}informers.NewScoped(f, f.namespace, f.tweakListOptions)
 }
 {{end}}

diff --git a/pkg/internal/informergen/groupinterface.go b/pkg/internal/informergen/groupinterface.go
@@ -18,6 +18,7 @@ package informergen
 
 import (
 	"io"
+	"strings"
 	"text/template"
 
 	"k8s.io/code-generator/cmd/client-gen/types"
@@ -49,6 +50,7 @@ func (g GroupInterface) WriteContent(w io.Writer) error {
 
 	m := map[string]interface{}{
 		"group":                 g.Group,
+		"packageName":           strings.ReplaceAll(g.Group.PackageName(), "-", ""),
 		"packagePath":           g.PackagePath,
 		"versions":              g.Versions,
 		"useUpstreamInterfaces": g.UseUpstreamInterfaces,
@@ -62,7 +64,7 @@ var groupInterface = `
 
 // Code generated by kcp code-generator. DO NOT EDIT.
 
-package {{.group.Group.PackageName}}
+package {{.packageName}}
 
 import (
 {{range .versions}}	"{{$.packagePath}}/{{$.group.Group.PackageName}}/{{.PackageName}}"

diff --git a/pkg/internal/informergen/versioninterface.go b/pkg/internal/informergen/versioninterface.go
@@ -18,6 +18,7 @@ package informergen
 
 import (
 	"io"
+	"strings"
 	"text/template"
 
 	"k8s.io/code-generator/cmd/client-gen/types"
@@ -51,6 +52,7 @@ func (v *VersionInterface) WriteContent(w io.Writer) error {
 		"version":               v.Version,
 		"kinds":                 v.Kinds,
 		"packagePath":           v.PackagePath,
+		"packageName":           strings.ReplaceAll(v.Version.PackageName(), "-", ""),
 		"useUpstreamInterfaces": v.UseUpstreamInterfaces,
 	}
 	return templ.Execute(w, m)
@@ -62,7 +64,7 @@ var versionInterfaceTemplate = `
 
 // Code generated by kcp code-generator. DO NOT EDIT.
 
-package {{.version.PackageName}}
+package {{.packageName}}
 
 import (
 	"{{.packagePath}}/internalinterfaces"

diff --git a/pkg/parser/types.go b/pkg/parser/types.go
@@ -17,6 +17,8 @@ limitations under the License.
 package parser
 
 import (
+	"strings"
+
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/code-generator/cmd/client-gen/types"
 
@@ -34,7 +36,24 @@ type Kind struct {
 
 type Group struct {
 	types.Group
-	GoName string
+	GoName       string `marker:",+groupGoName"`
+	PackageAlias string
+}
+
+func (g *Group) GoPackageAlias() string {
+	return strings.ToLower(strings.ReplaceAll(g.GoName, "-", ""))
+}
+
+func (g Group) GoNameAlias() string {
+	return strings.ReplaceAll(g.GoName, "-", "")
+}
+
+func (g Group) PackagePath() string {
+	return strings.ToLower(g.Group.PackageName())
+}
+
+func (g Group) PackageName() string {
+	return strings.ToLower(strings.ReplaceAll(g.Group.PackageName(), "-", ""))
 }
 
 func (k *Kind) Plural() string {