Use generator.NewImportTrackerForPackage for all generators to prevent generation of import to package being generated

jpbetz · thockin · jpbetz · commit 1606be697414 · 2024-09-03T13:49:58.000-04:00
Co-authored-by: Tim Hockin &lt;thockin@google.com&gt;
diff --git a/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/targets.go b/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/targets.go
@@ -188,7 +188,7 @@ func targetForApplyConfigurationsPackage(outputDirBase, outputPkgBase, pkgSubdir
 					localPkg:     outputPkg,
 					groupVersion: gv,
 					applyConfig:  toGenerate,
-					imports:      generator.NewImportTracker(),
+					imports:      generator.NewImportTrackerForPackage(outputPkg),
 					refGraph:     refs,
 					openAPIType:  openAPIType,
 				})
@@ -211,7 +211,7 @@ func targetForUtils(outputDirBase, outputPkgBase string, boilerplate []byte, gro
 					OutputFilename: "utils.go",
 				},
 				outputPackage:        outputPkgBase,
-				imports:              generator.NewImportTracker(),
+				imports:              generator.NewImportTrackerForPackage(outputPkgBase),
 				groupVersions:        groupVersions,
 				typesForGroupVersion: applyConfigsForGroupVersion,
 				groupGoNames:         groupGoNames,
@@ -236,7 +236,7 @@ func targetForInternal(outputDirBase, outputPkgBase string, boilerplate []byte,
 					OutputFilename: "internal.go",
 				},
 				outputPackage: outputPkgBase,
-				imports:       generator.NewImportTracker(),
+				imports:       generator.NewImportTrackerForPackage(outputPkg),
 				typeModels:    models,
 			})
 			return generators
diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go
@@ -161,7 +161,7 @@ func targetForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clie
 					version:                   gv.Version.String(),
 					groupGoName:               groupGoName,
 					typeToMatch:               t,
-					imports:                   generator.NewImportTracker(),
+					imports:                   generator.NewImportTrackerForPackage(gvPkg),
 				})
 			}
 
@@ -177,7 +177,7 @@ func targetForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clie
 				groupGoName:      groupGoName,
 				apiPath:          apiPath,
 				types:            typeList,
-				imports:          generator.NewImportTracker(),
+				imports:          generator.NewImportTrackerForPackage(gvPkg),
 			})
 
 			expansionFileName := "generated_expansion.go"
@@ -214,7 +214,7 @@ func targetForClientset(args *args.Args, clientsetDir, clientsetPkg string, grou
 					groups:           args.Groups,
 					groupGoNames:     groupGoNames,
 					clientsetPackage: clientsetPkg,
-					imports:          generator.NewImportTracker(),
+					imports:          generator.NewImportTrackerForPackage(clientsetPkg),
 				},
 			}
 			return generators
@@ -260,7 +260,7 @@ NextGroup:
 					OutputPath:     schemeDir,
 					Groups:         args.Groups,
 					GroupGoNames:   groupGoNames,
-					ImportTracker:  generator.NewImportTracker(),
+					ImportTracker:  generator.NewImportTrackerForPackage(schemePkg),
 					CreateRegistry: internalClient,
 				},
 			}
diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/fake_client_generator.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/fake_client_generator.go
@@ -63,7 +63,7 @@ func TargetForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clie
 					version:                   gv.Version.String(),
 					groupGoName:               groupGoName,
 					typeToMatch:               t,
-					imports:                   generator.NewImportTracker(),
+					imports:                   generator.NewImportTrackerForPackage(outputPkg),
 					applyConfigurationPackage: applyBuilderPackage,
 				})
 			}
@@ -78,7 +78,7 @@ func TargetForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clie
 				version:           gv.Version.String(),
 				groupGoName:       groupGoName,
 				types:             typeList,
-				imports:           generator.NewImportTracker(),
+				imports:           generator.NewImportTrackerForPackage(outputPkg),
 			})
 			return generators
 		},
@@ -111,7 +111,7 @@ func TargetForClientset(args *args.Args, clientsetDir, clientsetPkg string, appl
 					groups:                    args.Groups,
 					groupGoNames:              groupGoNames,
 					fakeClientsetPackage:      clientsetPkg,
-					imports:                   generator.NewImportTracker(),
+					imports:                   generator.NewImportTrackerForPackage(clientsetPkg),
 					realClientsetPackage:      clientsetPkg,
 					applyConfigurationPackage: applyConfigurationPkg,
 				},
@@ -123,7 +123,7 @@ func TargetForClientset(args *args.Args, clientsetDir, clientsetPkg string, appl
 					OutputPkg:     clientsetPkg,
 					Groups:        args.Groups,
 					GroupGoNames:  groupGoNames,
-					ImportTracker: generator.NewImportTracker(),
+					ImportTracker: generator.NewImportTrackerForPackage(clientsetPkg),
 					PrivateScheme: true,
 				},
 			}
diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_clientset.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_clientset.go
@@ -77,7 +77,6 @@ func (g *genClientset) Imports(c *generator.Context) (imports []string) {
 		"fakediscovery \"k8s.io/client-go/discovery/fake\"",
 		"k8s.io/apimachinery/pkg/runtime",
 		"k8s.io/apimachinery/pkg/watch",
-		"k8s.io/apimachinery/pkg/api/meta/testrestmapper",
 	)
 
 	return
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
@@ -478,7 +478,7 @@ func NewGenConversion(outputFilename, typesPackage, outputPackage string, manual
 		outputPackage:       outputPackage,
 		peerPackages:        peerPkgs,
 		manualConversions:   manualConversions,
-		imports:             generator.NewImportTracker(),
+		imports:             generator.NewImportTrackerForPackage(outputPackage),
 		types:               []*types.Type{},
 		explicitConversions: []conversionPair{},
 		skippedFields:       map[*types.Type][]string{},
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
@@ -222,7 +222,7 @@ func NewGenDeepCopy(outputFilename, targetPackage string, boundingDirs []string,
 		boundingDirs:  boundingDirs,
 		allTypes:      allTypes,
 		registerTypes: registerTypes,
-		imports:       generator.NewImportTracker(),
+		imports:       generator.NewImportTrackerForPackage(targetPackage),
 		typesForInit:  make([]*types.Type, 0),
 	}
 }
diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/targets.go b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/targets.go
@@ -249,7 +249,7 @@ func factoryTarget(outputDirBase, outputPkgBase string, boilerplate []byte, grou
 					OutputFilename: "factory.go",
 				},
 				outputPackage:             outputPkgBase,
-				imports:                   generator.NewImportTracker(),
+				imports:                   generator.NewImportTrackerForPackage(outputPkgBase),
 				groupVersions:             groupVersions,
 				clientSetPackage:          clientSetPackage,
 				internalInterfacesPackage: path.Join(outputPkgBase, subdirForInternalInterfaces),
@@ -261,7 +261,7 @@ func factoryTarget(outputDirBase, outputPkgBase string, boilerplate []byte, grou
 					OutputFilename: "generic.go",
 				},
 				outputPackage:        outputPkgBase,
-				imports:              generator.NewImportTracker(),
+				imports:              generator.NewImportTrackerForPackage(outputPkgBase),
 				groupVersions:        groupVersions,
 				pluralExceptions:     pluralExceptions,
 				typesForGroupVersion: typesForGroupVersion,
@@ -288,7 +288,7 @@ func factoryInterfaceTarget(outputDirBase, outputPkgBase string, boilerplate []b
 					OutputFilename: "factory_interfaces.go",
 				},
 				outputPackage:    outputPkg,
-				imports:          generator.NewImportTracker(),
+				imports:          generator.NewImportTrackerForPackage(outputPkg),
 				clientSetPackage: clientSetPackage,
 			})
 
@@ -314,7 +314,7 @@ func groupTarget(outputDirBase, outputPackageBase string, groupVersions clientge
 				},
 				outputPackage:             outputPkg,
 				groupVersions:             groupVersions,
-				imports:                   generator.NewImportTracker(),
+				imports:                   generator.NewImportTrackerForPackage(outputPkg),
 				internalInterfacesPackage: path.Join(outputPackageBase, subdirForInternalInterfaces),
 			})
 			return generators
@@ -342,7 +342,7 @@ func versionTarget(outputDirBase, outputPkgBase string, groupPkgName string, gv
 					OutputFilename: "interface.go",
 				},
 				outputPackage:             outputPkg,
-				imports:                   generator.NewImportTracker(),
+				imports:                   generator.NewImportTrackerForPackage(outputPkg),
 				types:                     typesToGenerate,
 				internalInterfacesPackage: path.Join(outputPkgBase, subdirForInternalInterfaces),
 			})
@@ -357,7 +357,7 @@ func versionTarget(outputDirBase, outputPkgBase string, groupPkgName string, gv
 					groupVersion:              gv,
 					groupGoName:               groupGoName,
 					typeToGenerate:            t,
-					imports:                   generator.NewImportTracker(),
+					imports:                   generator.NewImportTrackerForPackage(outputPkg),
 					clientSetPackage:          clientSetPackage,
 					listersPackage:            listersPackage,
 					internalInterfacesPackage: path.Join(outputPkgBase, subdirForInternalInterfaces),
diff --git a/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go b/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go
@@ -149,7 +149,7 @@ func GetTargets(context *generator.Context, args *args.Args) []generator.Target
 						groupVersion:   gv,
 						internalGVPkg:  internalGVPkg,
 						typeToGenerate: t,
-						imports:        generator.NewImportTracker(),
+						imports:        generator.NewImportTrackerForPackage(outputPkg),
 						objectMeta:     objectMeta,
 					})
 				}
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
@@ -115,7 +115,7 @@ func GetTargets(context *generator.Context, args *args.Args) []generator.Target
 							gv:              gv,
 							typesToGenerate: typesToRegister,
 							outputPackage:   pkg.Path,
-							imports:         generator.NewImportTracker(),
+							imports:         generator.NewImportTrackerForPackage(pkg.Path),
 						},
 					}
 				},

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,6 @@ func (g genClientset) Imports(c generator.Context) (imports []string) {`
`77`	`77`	`"fakediscovery \"k8s.io/client-go/discovery/fake\"",`
`78`	`78`	`"k8s.io/apimachinery/pkg/runtime",`
`79`	`79`	`"k8s.io/apimachinery/pkg/watch",`
`80`		`- "k8s.io/apimachinery/pkg/api/meta/testrestmapper",`
`81`	`80`	`)`
`82`	`81`
`83`	`82`	`return`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ func NewGenDeepCopy(outputFilename, targetPackage string, boundingDirs []string,`
`222`	`222`	`boundingDirs: boundingDirs,`
`223`	`223`	`allTypes: allTypes,`
`224`	`224`	`registerTypes: registerTypes,`
`225`		`- imports: generator.NewImportTracker(),`
	`225`	`+ imports: generator.NewImportTrackerForPackage(targetPackage),`
`226`	`226`	`typesForInit: make([]*types.Type, 0),`
`227`	`227`	`}`
`228`	`228`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ func GetTargets(context generator.Context, args args.Args) []generator.Target`
`149`	`149`	`groupVersion: gv,`
`150`	`150`	`internalGVPkg: internalGVPkg,`
`151`	`151`	`typeToGenerate: t,`
`152`		`- imports: generator.NewImportTracker(),`
	`152`	`+ imports: generator.NewImportTrackerForPackage(outputPkg),`
`153`	`153`	`objectMeta: objectMeta,`
`154`	`154`	`})`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ func GetTargets(context generator.Context, args args.Args) []generator.Target`
`115`	`115`	`gv: gv,`
`116`	`116`	`typesToGenerate: typesToRegister,`
`117`	`117`	`outputPackage: pkg.Path,`
`118`		`- imports: generator.NewImportTracker(),`
	`118`	`+ imports: generator.NewImportTrackerForPackage(pkg.Path),`
`119`	`119`	`},`
`120`	`120`	`}`
`121`	`121`	`},`