From c8b61bb98b4d7e022489da1cb5e974e58a0145e8 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Sun, 24 Dec 2023 09:59:59 -0800 Subject: [PATCH] Fix register-gen wrt gengo/v2 --- .../cmd/register-gen/generators/packages.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/code-generator/cmd/register-gen/generators/packages.go b/staging/src/k8s.io/code-generator/cmd/register-gen/generators/packages.go index 50e1dbcb9a5..81af7bcd70b 100644 --- a/staging/src/k8s.io/code-generator/cmd/register-gen/generators/packages.go +++ b/staging/src/k8s.io/code-generator/cmd/register-gen/generators/packages.go @@ -50,8 +50,8 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat } packages := generator.Packages{} - for _, inputDir := range arguments.InputDirs { - pkg := context.Universe.Package(inputDir) + for _, input := range context.Inputs { + pkg := context.Universe.Package(input) internal, err := isInternal(pkg) if err != nil { klog.V(5).Infof("skipping the generation of %s file, due to err %v", arguments.OutputFileBaseName, err) @@ -62,7 +62,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat continue } registerFileName := "register.go" - searchPath := path.Join(args.DefaultSourceTree(), inputDir, registerFileName) + searchPath := path.Join(pkg.SourcePath, registerFileName) if _, err := os.Stat(path.Join(searchPath)); err == nil { klog.V(5).Infof("skipping the generation of %s file because %s already exists in the path %s", arguments.OutputFileBaseName, registerFileName, searchPath) continue @@ -102,7 +102,8 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat packages = append(packages, &generator.DefaultPackage{ PackageName: pkg.Name, - PackagePath: pkg.Path, + PackagePath: pkg.Path, // output to same pkg as input + Source: pkg.SourcePath, // output to same pkg as input HeaderText: boilerplate, GeneratorFunc: func(c *generator.Context) (generators []generator.Generator) { return []generator.Generator{