Add ImportPath for v2

rancher · Sep 1, 2023 · b9331c2 · b9331c2
1 parent 3604a6b
commit b9331c2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/pkg/codegen/main.go b/pkg/codegen/main.go
@@ -19,6 +19,7 @@ import (
 
 func main() {
 	controllergen.Run(args.Options{
+		ImportPackage: "github.com/rancher/wrangler/v2/pkg/generated",
 		OutputPackage: "github.com/rancher/wrangler/pkg/generated",
 		Boilerplate:   "scripts/boilerplate.go.txt",
 		Groups: map[string]args.Group{

diff --git a/pkg/controller-gen/args/args.go b/pkg/controller-gen/args/args.go
@@ -6,13 +6,15 @@ import (
 )
 
 type CustomArgs struct {
-	Package      string
-	TypesByGroup map[schema.GroupVersion][]*types.Name
-	Options      Options
-	OutputBase   string
+	Package       string
+	ImportPackage string
+	TypesByGroup  map[schema.GroupVersion][]*types.Name
+	Options       Options
+	OutputBase    string
 }
 
 type Options struct {
+	ImportPackage string
 	OutputPackage string
 	Groups        map[string]Group
 	Boilerplate   string

diff --git a/pkg/controller-gen/generators/group_interface_go.go b/pkg/controller-gen/generators/group_interface_go.go
@@ -37,7 +37,11 @@ func (f *interfaceGo) Imports(context *generator.Context) []string {
 		if gv.Group != f.group {
 			continue
 		}
-		packages = append(packages, fmt.Sprintf("%s \"%s/controllers/%s/%s\"", gv.Version, f.customArgs.Package,
+		pkg := f.customArgs.ImportPackage
+		if pkg == "" {
+			pkg = f.customArgs.Package
+		}
+		packages = append(packages, fmt.Sprintf("%s \"%s/controllers/%s/%s\"", gv.Version, pkg,
 			groupPackageName(gv.Group, f.customArgs.Options.Groups[gv.Group].OutputControllerPackageName), gv.Version))
 	}
 

diff --git a/pkg/controller-gen/main.go b/pkg/controller-gen/main.go
@@ -30,11 +30,11 @@ import (
 
 func Run(opts cgargs.Options) {
 	customArgs := &cgargs.CustomArgs{
-		Options:      opts,
-		TypesByGroup: map[schema.GroupVersion][]*types.Name{},
-		Package:      opts.OutputPackage,
+		ImportPackage: opts.ImportPackage,
+		Options:       opts,
+		TypesByGroup:  map[schema.GroupVersion][]*types.Name{},
+		Package:       opts.OutputPackage,
 	}
-
 	genericArgs := args.Default().WithoutDefaultFlagParsing()
 	genericArgs.CustomArgs = customArgs
 	genericArgs.GoHeaderFilePath = opts.Boilerplate