Migrate to gengo v2

Author: JoelSpeed

pkg/applyconfigurations/gen.go

@@ -23,9 +23,13 @@ import (
 	"path/filepath"
 
 	"k8s.io/apimachinery/pkg/util/sets"
-	generatorargs "k8s.io/code-generator/cmd/applyconfiguration-gen/args"
-	applygenerator "k8s.io/code-generator/cmd/applyconfiguration-gen/generators"
-	"k8s.io/gengo/generator"
+	"k8s.io/code-generator/cmd/applyconfiguration-gen/args"
+	"k8s.io/code-generator/cmd/applyconfiguration-gen/generators"
+
+	"k8s.io/gengo/v2"
+	"k8s.io/gengo/v2/generator"
+	"k8s.io/gengo/v2/parser"
+
 	crdmarkers "sigs.k8s.io/controller-tools/pkg/crd/markers"
 	"sigs.k8s.io/controller-tools/pkg/genall"
 	"sigs.k8s.io/controller-tools/pkg/loader"
@@ -74,7 +78,6 @@ func (Generator) RegisterMarkers(into *markers.Registry) error {
 	into.AddHelp(
 		outputPkgMarker, markers.SimpleHelp("apply", "overrides the default output package for the applyconfigurations generation"))
 	return nil
-
 }
 
 func enabledOnPackage(col *markers.Collector, pkg *loader.Package) (bool, error) {
@@ -165,42 +168,31 @@ func (ctx *ObjectGenCtx) generateForPackage(root *loader.Package) error {
 		return nil
 	}
 
-	genericArgs, _ := generatorargs.NewDefaults()
-	genericArgs.InputDirs = []string{root.PkgPath}
-	genericArgs.GoHeaderFilePath = ctx.HeaderFilePath
+	arguments := args.New()
+	arguments.GoHeaderFile = ctx.HeaderFilePath
 
 	outpkg, _ := outputPkg(ctx.Collector, root)
 	if outpkg == "" {
 		outpkg = importPathSuffix
 	}
-	genericArgs.OutputPackagePath = filepath.Join(root.PkgPath, outpkg)
-
-	// attempts to retrieve the correct base directory to output apply configurations to by
-	// looking into the package and retrieving the first go file it finds, and using that as the output base.
-	// this is because we cannot rely on gogen calculating the correct output base.
-	// if we leave this empty, gogen will attempt to use GOPATH to write the files which is not wanted
-	genericArgs.OutputBase = filepath.Dir(root.GoFiles[0])
-	trimPathPrefix := filepath.Join(genericArgs.OutputBase, root.PkgPath) + "/"
-
-	// Make the generated header static so that it doesn't rely on the compiled binary name.
-	genericArgs.GeneratedByCommentTemplate = "// Code generated by applyconfiguration-gen. DO NOT EDIT.\n"
 
-	if err := generatorargs.Validate(genericArgs); err != nil {
-		return err
-	}
+	arguments.OutputDir = filepath.Join(root.Dir, outpkg)
+	arguments.OutputPkg = filepath.Join(root.Package.PkgPath, outpkg)
 
-	b, err := genericArgs.NewBuilder()
-	if err != nil {
-		return err
+	// The following code is based on gengo/v2.Execute.
+	// We have lifted it from there so that we can adjust the markers on the types to make sure
+	// that Kubebuilder generation markers are converted into the genclient marker
+	// prior to executing the targets.
+	buildTags := []string{gengo.StdBuildTag}
+	p := parser.NewWithOptions(parser.Options{BuildTags: buildTags})
+	if err := p.LoadPackages(root.PkgPath); err != nil {
+		return fmt.Errorf("failed making a parser: %w", err)
 	}
 
-	c, err := generator.NewContext(b, applygenerator.NameSystems(), applygenerator.DefaultNameSystem())
+	c, err := generator.NewContext(p, generators.NameSystems(), generators.DefaultNameSystem())
 	if err != nil {
-		return err
+		return fmt.Errorf("failed making a context: %w", err)
 	}
-	// The output package path is fully qualified. It contains the OutputBase (which is the module directory)
-	// that means we will have to trim the fully qualified pkg down again.
-	c.TrimPathPrefix = trimPathPrefix
 
 	pkg, ok := c.Universe[root.PkgPath]
 	if !ok {
@@ -229,9 +221,9 @@ func (ctx *ObjectGenCtx) generateForPackage(root *loader.Package) error {
 		return err
 	}
 
-	packages := applygenerator.Packages(c, genericArgs)
-	if err := c.ExecutePackages(genericArgs.OutputBase, packages); err != nil {
-		return fmt.Errorf("error executing packages: %w", err)
+	targets := generators.GetTargets(c, arguments)
+	if err := c.ExecuteTargets(targets); err != nil {
+		return fmt.Errorf("failed executing generator: %w", err)
 	}
 
 	return nil