github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 22:05:59 +00:00
Code Issues Projects Releases Wiki Activity

Drop generator.Packages type

Browse Source
This commit is contained in:
Tim Hockin 2024-01-15 16:08:50 -08:00
parent b2832697d5
commit d2c7401910
No known key found for this signature in database
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/packages.go
View File

@ -55,7 +55,7 @@ func DefaultNameSystem() string {
} }
// Packages makes the client package definition. // Packages makes the client package definition.
func Packages(context *generator.Context, arguments *args.GeneratorArgs) generator.Packages { func Packages(context *generator.Context, arguments *args.GeneratorArgs) []generator.Package {
boilerplate, err := arguments.LoadGoBoilerplate() boilerplate, err := arguments.LoadGoBoilerplate()
if err != nil { if err != nil {
klog.Fatalf("Failed loading boilerplate: %v", err) klog.Fatalf("Failed loading boilerplate: %v", err)
@ -75,7 +75,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
groupGoNames := make(map[string]string) groupGoNames := make(map[string]string)
applyConfigsForGroupVersion := make(map[clientgentypes.GroupVersion][]applyConfig) applyConfigsForGroupVersion := make(map[clientgentypes.GroupVersion][]applyConfig)
var packageList generator.Packages var packageList []generator.Package
for pkg, p := range pkgTypes { for pkg, p := range pkgTypes {
gv := groupVersion(p) gv := groupVersion(p)

6
staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go
View File

@ -340,7 +340,7 @@ func sanitizePackagePaths(context *generator.Context, ca *clientgenargs.CustomAr
} }
// Packages makes the client package definition. // Packages makes the client package definition.
func Packages(context *generator.Context, arguments *args.GeneratorArgs) generator.Packages { func Packages(context *generator.Context, arguments *args.GeneratorArgs) []generator.Package {
boilerplate, err := arguments.LoadGoBoilerplate() boilerplate, err := arguments.LoadGoBoilerplate()
if err != nil { if err != nil {
klog.Fatalf("Failed loading boilerplate: %v", err) klog.Fatalf("Failed loading boilerplate: %v", err)
@ -413,7 +413,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
// If --clientset-only=true, we don't regenerate the individual typed clients. // If --clientset-only=true, we don't regenerate the individual typed clients.
if customArgs.ClientsetOnly { if customArgs.ClientsetOnly {
return generator.Packages(packageList) return []generator.Package(packageList)
} }
orderer := namer.Orderer{Namer: namer.NewPrivateNamer(0)} orderer := namer.Orderer{Namer: namer.NewPrivateNamer(0)}
@ -435,5 +435,5 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
} }
} }
return generator.Packages(packageList) return []generator.Package(packageList)
} }

4
staging/src/k8s.io/code-generator/cmd/conversion-gen/generators/conversion.go
View File

@ -197,13 +197,13 @@ func getManualConversionFunctions(context *generator.Context, pkg *types.Package
} }
} }
func Packages(context *generator.Context, arguments *args.GeneratorArgs) generator.Packages { func Packages(context *generator.Context, arguments *args.GeneratorArgs) []generator.Package {
boilerplate, err := arguments.LoadGoBoilerplate() boilerplate, err := arguments.LoadGoBoilerplate()
if err != nil { if err != nil {
klog.Fatalf("Failed loading boilerplate: %v", err) klog.Fatalf("Failed loading boilerplate: %v", err)
} }
packages := generator.Packages{} packages := []generator.Package{}
header := append([]byte(fmt.Sprintf("// +build !%s\n\n", arguments.GeneratedBuildTag)), boilerplate...) header := append([]byte(fmt.Sprintf("// +build !%s\n\n", arguments.GeneratedBuildTag)), boilerplate...)
// Accumulate pre-existing conversion functions. // Accumulate pre-existing conversion functions.

4
staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/cmd.go
View File

@ -184,7 +184,7 @@ func Run(g *Generator) {
} }
protobufNames := NewProtobufNamer() protobufNames := NewProtobufNamer()
outputPackages := generator.Packages{} outputPackages := []generator.Package{}
nonOutputPackages := map[string]struct{}{} nonOutputPackages := map[string]struct{}{}
for _, input := range c.Inputs { for _, input := range c.Inputs {
@ -230,7 +230,7 @@ func Run(g *Generator) {
} }
sort.Sort(positionOrder{topologicalPos, protobufNames.packages}) sort.Sort(positionOrder{topologicalPos, protobufNames.packages})
var localOutputPackages generator.Packages var localOutputPackages []generator.Package
for _, p := range protobufNames.packages { for _, p := range protobufNames.packages {
if _, ok := nonOutputPackages[p.Name()]; ok { if _, ok := nonOutputPackages[p.Name()]; ok {
// if we're not outputting the package, don't include it in either package list // if we're not outputting the package, don't include it in either package list

4
staging/src/k8s.io/code-generator/cmd/informer-gen/generators/packages.go
View File

@ -93,7 +93,7 @@ func subdirForInternalInterfaces(base string) string {
} }
// Packages makes the client package definition. // Packages makes the client package definition.
func Packages(context *generator.Context, arguments *args.GeneratorArgs) generator.Packages { func Packages(context *generator.Context, arguments *args.GeneratorArgs) []generator.Package {
boilerplate, err := arguments.LoadGoBoilerplate() boilerplate, err := arguments.LoadGoBoilerplate()
if err != nil { if err != nil {
klog.Fatalf("Failed loading boilerplate: %v", err) klog.Fatalf("Failed loading boilerplate: %v", err)
@ -115,7 +115,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
externalVersionOutputPkg = filepath.Join(externalVersionOutputPkg, "externalversions") externalVersionOutputPkg = filepath.Join(externalVersionOutputPkg, "externalversions")
} }
var packageList generator.Packages var packageList []generator.Package
typesForGroupVersion := make(map[clientgentypes.GroupVersion][]*types.Type) typesForGroupVersion := make(map[clientgentypes.GroupVersion][]*types.Type)
externalGroupVersions := make(map[string]clientgentypes.GroupVersions) externalGroupVersions := make(map[string]clientgentypes.GroupVersions)

4
staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go
View File

@ -59,7 +59,7 @@ func DefaultNameSystem() string {
} }
// Packages makes the client package definition. // Packages makes the client package definition.
func Packages(context *generator.Context, arguments *args.GeneratorArgs) generator.Packages { func Packages(context *generator.Context, arguments *args.GeneratorArgs) []generator.Package {
boilerplate, err := arguments.LoadGoBoilerplate() boilerplate, err := arguments.LoadGoBoilerplate()
if err != nil { if err != nil {
klog.Fatalf("Failed loading boilerplate: %v", err) klog.Fatalf("Failed loading boilerplate: %v", err)
@ -67,7 +67,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
customArgs := arguments.CustomArgs.(*listergenargs.CustomArgs) customArgs := arguments.CustomArgs.(*listergenargs.CustomArgs)
var packageList generator.Packages var packageList []generator.Package
for _, inputDir := range arguments.InputDirs { for _, inputDir := range arguments.InputDirs {
p := context.Universe.Package(inputDir) p := context.Universe.Package(inputDir)

4
staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/prerelease-lifecycle-generators/status.go
View File

@ -180,13 +180,13 @@ func DefaultNameSystem() string {
} }
// Packages makes the package definition. // Packages makes the package definition.
func Packages(context *generator.Context, arguments *args.GeneratorArgs) generator.Packages { func Packages(context *generator.Context, arguments *args.GeneratorArgs) []generator.Package {
boilerplate, err := arguments.LoadGoBoilerplate() boilerplate, err := arguments.LoadGoBoilerplate()
if err != nil { if err != nil {
klog.Fatalf("Failed loading boilerplate: %v", err) klog.Fatalf("Failed loading boilerplate: %v", err)
} }
packages := generator.Packages{} packages := []generator.Package{}
header := append([]byte(fmt.Sprintf("// +build !%s\n\n", arguments.GeneratedBuildTag)), boilerplate...) header := append([]byte(fmt.Sprintf("// +build !%s\n\n", arguments.GeneratedBuildTag)), boilerplate...)
for _, i := range context.Inputs { for _, i := range context.Inputs {

4
staging/src/k8s.io/code-generator/cmd/register-gen/generators/packages.go
View File

@ -43,13 +43,13 @@ func DefaultNameSystem() string {
} }
// Packages makes packages to generate. // Packages makes packages to generate.
func Packages(context *generator.Context, arguments *args.GeneratorArgs) generator.Packages { func Packages(context *generator.Context, arguments *args.GeneratorArgs) []generator.Package {
boilerplate, err := arguments.LoadGoBoilerplate() boilerplate, err := arguments.LoadGoBoilerplate()
if err != nil { if err != nil {
klog.Fatalf("Failed loading boilerplate: %v", err) klog.Fatalf("Failed loading boilerplate: %v", err)
} }
packages := generator.Packages{} packages := []generator.Package{}
for _, input := range context.Inputs { for _, input := range context.Inputs {
pkg := context.Universe.Package(input) pkg := context.Universe.Package(input)
internal, err := isInternal(pkg) internal, err := isInternal(pkg)