From 7a084b33528c6396a5d3442f6fbfbe169366d0d4 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Tue, 16 Jan 2024 22:05:12 -0800 Subject: [PATCH] Renamed gengo SourcePath -> Dir --- .../cmd/conversion-gen/generators/conversion.go | 2 +- .../code-generator/cmd/deepcopy-gen/generators/deepcopy.go | 2 +- .../cmd/defaulter-gen/generators/defaulter.go | 2 +- .../code-generator/cmd/go-to-protobuf/protobuf/cmd.go | 2 +- .../prerelease-lifecycle-generators/status.go | 2 +- .../code-generator/cmd/register-gen/generators/targets.go | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/staging/src/k8s.io/code-generator/cmd/conversion-gen/generators/conversion.go b/staging/src/k8s.io/code-generator/cmd/conversion-gen/generators/conversion.go index 1303c45cf43..56611247323 100644 --- a/staging/src/k8s.io/code-generator/cmd/conversion-gen/generators/conversion.go +++ b/staging/src/k8s.io/code-generator/cmd/conversion-gen/generators/conversion.go @@ -325,7 +325,7 @@ func GetTargets(context *generator.Context, args *args.Args) []generator.Target &generator.SimpleTarget{ PkgName: filepath.Base(pkg.Path), PkgPath: pkg.Path, - PkgDir: pkg.SourcePath, // output pkg is the same as the input + PkgDir: pkg.Dir, // output pkg is the same as the input HeaderComment: boilerplate, FilterFunc: func(c *generator.Context, t *types.Type) bool { return t.Name.Package == typesPkg.Path diff --git a/staging/src/k8s.io/code-generator/cmd/deepcopy-gen/generators/deepcopy.go b/staging/src/k8s.io/code-generator/cmd/deepcopy-gen/generators/deepcopy.go index 937d6243e0e..a362838dbca 100644 --- a/staging/src/k8s.io/code-generator/cmd/deepcopy-gen/generators/deepcopy.go +++ b/staging/src/k8s.io/code-generator/cmd/deepcopy-gen/generators/deepcopy.go @@ -189,7 +189,7 @@ func GetTargets(context *generator.Context, args *args.Args) []generator.Target &generator.SimpleTarget{ PkgName: strings.Split(filepath.Base(pkg.Path), ".")[0], PkgPath: pkg.Path, - PkgDir: pkg.SourcePath, // output pkg is the same as the input + PkgDir: pkg.Dir, // output pkg is the same as the input HeaderComment: boilerplate, FilterFunc: func(c *generator.Context, t *types.Type) bool { return t.Name.Package == pkg.Path diff --git a/staging/src/k8s.io/code-generator/cmd/defaulter-gen/generators/defaulter.go b/staging/src/k8s.io/code-generator/cmd/defaulter-gen/generators/defaulter.go index ee8447ffa74..e2991102c36 100644 --- a/staging/src/k8s.io/code-generator/cmd/defaulter-gen/generators/defaulter.go +++ b/staging/src/k8s.io/code-generator/cmd/defaulter-gen/generators/defaulter.go @@ -419,7 +419,7 @@ func GetTargets(context *generator.Context, args *args.Args) []generator.Target &generator.SimpleTarget{ PkgName: filepath.Base(pkg.Path), PkgPath: pkg.Path, - PkgDir: pkg.SourcePath, // output pkg is the same as the input + PkgDir: pkg.Dir, // output pkg is the same as the input HeaderComment: boilerplate, FilterFunc: func(c *generator.Context, t *types.Type) bool { diff --git a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/cmd.go b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/cmd.go index 0ef7b93e530..ca21c76c344 100644 --- a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/cmd.go +++ b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/cmd.go @@ -182,7 +182,7 @@ func Run(g *Generator) { log.Fatalf("BUG: can't find input modifiers for %q", input) } pkg := c.Universe[input] - protopkg := newProtobufPackage(pkg.Path, pkg.SourcePath, mod.name, mod.allTypes, omitTypes) + protopkg := newProtobufPackage(pkg.Path, pkg.Dir, mod.name, mod.allTypes, omitTypes) header := append([]byte{}, boilerplate...) header = append(header, protopkg.HeaderComment...) protopkg.HeaderComment = header diff --git a/staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/prerelease-lifecycle-generators/status.go b/staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/prerelease-lifecycle-generators/status.go index c6c297a92c6..ee037e3920b 100644 --- a/staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/prerelease-lifecycle-generators/status.go +++ b/staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/prerelease-lifecycle-generators/status.go @@ -230,7 +230,7 @@ func GetTargets(context *generator.Context, args *args.Args) []generator.Target &generator.SimpleTarget{ PkgName: strings.Split(filepath.Base(pkg.Path), ".")[0], PkgPath: pkg.Path, - PkgDir: pkg.SourcePath, // output pkg is the same as the input + PkgDir: pkg.Dir, // output pkg is the same as the input HeaderComment: boilerplate, FilterFunc: func(c *generator.Context, t *types.Type) bool { return t.Name.Package == pkg.Path diff --git a/staging/src/k8s.io/code-generator/cmd/register-gen/generators/targets.go b/staging/src/k8s.io/code-generator/cmd/register-gen/generators/targets.go index bb90a1ad0fa..d2998261c8d 100644 --- a/staging/src/k8s.io/code-generator/cmd/register-gen/generators/targets.go +++ b/staging/src/k8s.io/code-generator/cmd/register-gen/generators/targets.go @@ -63,7 +63,7 @@ func GetTargets(context *generator.Context, args *args.Args) []generator.Target continue } registerFileName := "register.go" - searchPath := path.Join(pkg.SourcePath, registerFileName) + searchPath := path.Join(pkg.Dir, 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", args.OutputFile, registerFileName, searchPath) continue @@ -103,8 +103,8 @@ func GetTargets(context *generator.Context, args *args.Args) []generator.Target targets = append(targets, &generator.SimpleTarget{ PkgName: pkg.Name, - PkgPath: pkg.Path, // output to same pkg as input - PkgDir: pkg.SourcePath, // output to same pkg as input + PkgPath: pkg.Path, // output to same pkg as input + PkgDir: pkg.Dir, // output to same pkg as input HeaderComment: boilerplate, GeneratorsFunc: func(c *generator.Context) (generators []generator.Generator) { return []generator.Generator{