diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 78e4f210e86..77a335aeb48 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -140,7 +140,7 @@ function codegen::deepcopy() { k8s.io/code-generator/cmd/deepcopy-gen # The result file, in each pkg, of deep-copy generation. - local output_file="${GENERATED_FILE_PREFIX}deepcopy" + local output_file="${GENERATED_FILE_PREFIX}deepcopy.go" # The tool used to generate deep copies. local gen_deepcopy_bin @@ -172,7 +172,7 @@ function codegen::deepcopy() { done fi - git_find -z ':(glob)**'/"${output_file}.go" | xargs -0 rm -f + git_find -z ':(glob)**'/"${output_file}" | xargs -0 rm -f "${gen_deepcopy_bin}" \ -v "${KUBE_VERBOSE}" \ @@ -272,7 +272,7 @@ function codegen::prerelease() { k8s.io/code-generator/cmd/prerelease-lifecycle-gen # The result file, in each pkg, of prerelease-lifecycle generation. - local output_file="${GENERATED_FILE_PREFIX}prerelease-lifecycle" + local output_file="${GENERATED_FILE_PREFIX}prerelease-lifecycle.go" # The tool used to generate prerelease-lifecycle code. local gen_prerelease_bin @@ -304,7 +304,7 @@ function codegen::prerelease() { done fi - git_find -z ':(glob)**'/"${output_file}.go" | xargs -0 rm -f + git_find -z ':(glob)**'/"${output_file}" | xargs -0 rm -f "${gen_prerelease_bin}" \ -v "${KUBE_VERBOSE}" \ @@ -340,7 +340,7 @@ function codegen::defaults() { k8s.io/code-generator/cmd/defaulter-gen # The result file, in each pkg, of defaulter generation. - local output_file="${GENERATED_FILE_PREFIX}defaults" + local output_file="${GENERATED_FILE_PREFIX}defaults.go" # The tool used to generate defaulters. local gen_defaulter_bin @@ -372,7 +372,7 @@ function codegen::defaults() { done fi - git_find -z ':(glob)**'/"${output_file}.go" | xargs -0 rm -f + git_find -z ':(glob)**'/"${output_file}" | xargs -0 rm -f "${gen_defaulter_bin}" \ -v "${KUBE_VERBOSE}" \ @@ -413,7 +413,7 @@ function codegen::conversions() { k8s.io/code-generator/cmd/conversion-gen # The result file, in each pkg, of conversion generation. - local output_file="${GENERATED_FILE_PREFIX}conversion" + local output_file="${GENERATED_FILE_PREFIX}conversion.go" # The tool used to generate conversions. local gen_conversion_bin @@ -451,7 +451,7 @@ function codegen::conversions() { done fi - git_find -z ':(glob)**'/"${output_file}.go" | xargs -0 rm -f + git_find -z ':(glob)**'/"${output_file}" | xargs -0 rm -f "${gen_conversion_bin}" \ -v "${KUBE_VERBOSE}" \ @@ -495,7 +495,7 @@ function codegen::openapi() { k8s.io/code-generator/cmd/openapi-gen # The result file, in each pkg, of open-api generation. - local output_file="${GENERATED_FILE_PREFIX}openapi" + local output_file="${GENERATED_FILE_PREFIX}openapi.go" # The tool used to generate open apis. local gen_openapi_bin @@ -546,7 +546,7 @@ function codegen::openapi() { done fi - git_find -z ':(glob)pkg/generated/**'/"${output_file}.go" | xargs -0 rm -f + git_find -z ':(glob)pkg/generated/**'/"${output_file}" | xargs -0 rm -f "${gen_openapi_bin}" \ -v "${KUBE_VERBOSE}" \ diff --git a/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/applyconfiguration.go b/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/applyconfiguration.go index 3051435a23a..07756168f00 100644 --- a/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/applyconfiguration.go +++ b/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/applyconfiguration.go @@ -32,7 +32,7 @@ import ( // applyConfigurationGenerator produces apply configurations for a given GroupVersion and type. type applyConfigurationGenerator struct { - generator.DefaultGen + generator.GoGenerator // outPkgBase is the base package, under which the "internal" and GV-specific subdirs live outPkgBase string // must be a Go import-path groupVersion clientgentypes.GroupVersion diff --git a/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/internal.go b/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/internal.go index 20a4f169e8f..abd65010007 100644 --- a/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/internal.go +++ b/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/internal.go @@ -30,7 +30,7 @@ import ( // utilGenerator generates the ForKind() utility function. type internalGenerator struct { - generator.DefaultGen + generator.GoGenerator outputPackage string imports namer.ImportTracker typeModels *typeModels 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 index 769dc40e461..ecc592fbbe4 100644 --- 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 @@ -183,8 +183,8 @@ func targetForApplyConfigurationsPackage(outputDirBase, outputPkgBase, pkgSubdir } generators = append(generators, &applyConfigurationGenerator{ - DefaultGen: generator.DefaultGen{ - OptionalName: strings.ToLower(toGenerate.Type.Name.Name), + GoGenerator: generator.GoGenerator{ + OutputFilename: strings.ToLower(toGenerate.Type.Name.Name) + ".go", }, outPkgBase: outputPkgBase, groupVersion: gv, @@ -207,8 +207,8 @@ func targetForUtils(outputDirBase, outputPkgBase string, boilerplate []byte, gro HeaderComment: boilerplate, GeneratorsFunc: func(c *generator.Context) (generators []generator.Generator) { generators = append(generators, &utilGenerator{ - DefaultGen: generator.DefaultGen{ - OptionalName: "utils", + GoGenerator: generator.GoGenerator{ + OutputFilename: "utils.go", }, outputPackage: outputPkgBase, imports: generator.NewImportTracker(), @@ -231,8 +231,8 @@ func targetForInternal(outputDirBase, outputPkgBase string, boilerplate []byte, HeaderComment: boilerplate, GeneratorsFunc: func(c *generator.Context) (generators []generator.Generator) { generators = append(generators, &internalGenerator{ - DefaultGen: generator.DefaultGen{ - OptionalName: "internal", + GoGenerator: generator.GoGenerator{ + OutputFilename: "internal.go", }, outputPackage: outputPkgBase, imports: generator.NewImportTracker(), diff --git a/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/util.go b/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/util.go index b09e393e11b..4d4333d755a 100644 --- a/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/util.go +++ b/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/util.go @@ -30,7 +30,7 @@ import ( // utilGenerator generates the ForKind() utility function. type utilGenerator struct { - generator.DefaultGen + generator.GoGenerator outputPackage string imports namer.ImportTracker groupVersions map[string]clientgentypes.GroupVersions 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 index 484189252da..9c949d4d4b0 100644 --- 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 @@ -143,14 +143,14 @@ func targetForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clie GeneratorsFunc: func(c *generator.Context) (generators []generator.Generator) { generators = []generator.Generator{ // Always generate a "doc.go" file. - generator.DefaultGen{OptionalName: "doc"}, + generator.GoGenerator{OutputFilename: "doc.go"}, } // Since we want a file per type that we generate a client for, we // have to provide a function for this. for _, t := range typeList { generators = append(generators, &genClientForType{ - DefaultGen: generator.DefaultGen{ - OptionalName: strings.ToLower(c.Namers["private"].Name(t)), + GoGenerator: generator.GoGenerator{ + OutputFilename: strings.ToLower(c.Namers["private"].Name(t)) + ".go", }, outputPackage: gvPkg, inputPackage: inputPkg, @@ -165,8 +165,8 @@ func targetForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clie } generators = append(generators, &genGroup{ - DefaultGen: generator.DefaultGen{ - OptionalName: groupPkgName + "_client", + GoGenerator: generator.GoGenerator{ + OutputFilename: groupPkgName + "_client.go", }, outputPackage: gvPkg, inputPackage: inputPkg, @@ -179,11 +179,11 @@ func targetForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clie imports: generator.NewImportTracker(), }) - expansionFileName := "generated_expansion" + expansionFileName := "generated_expansion.go" generators = append(generators, &genExpansion{ groupPackagePath: gvDir, - DefaultGen: generator.DefaultGen{ - OptionalName: expansionFileName, + GoGenerator: generator.GoGenerator{ + OutputFilename: expansionFileName, }, types: typeList, }) @@ -207,8 +207,8 @@ func targetForClientset(customArgs *clientgenargs.CustomArgs, clientsetDir, clie GeneratorsFunc: func(c *generator.Context) (generators []generator.Generator) { generators = []generator.Generator{ &genClientset{ - DefaultGen: generator.DefaultGen{ - OptionalName: "clientset", + GoGenerator: generator.GoGenerator{ + OutputFilename: "clientset.go", }, groups: customArgs.Groups, groupGoNames: groupGoNames, @@ -248,11 +248,11 @@ NextGroup: GeneratorsFunc: func(c *generator.Context) (generators []generator.Generator) { generators = []generator.Generator{ // Always generate a "doc.go" file. - generator.DefaultGen{OptionalName: "doc"}, + generator.GoGenerator{OutputFilename: "doc.go"}, &scheme.GenScheme{ - DefaultGen: generator.DefaultGen{ - OptionalName: "register", + GoGenerator: generator.GoGenerator{ + OutputFilename: "register.go", }, InputPackages: customArgs.GroupVersionPackages(), OutputPackage: schemePkg, 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 index e9a5f8f4d71..8a3168617a4 100644 --- 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 @@ -47,14 +47,14 @@ func TargetForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clie GeneratorsFunc: func(c *generator.Context) (generators []generator.Generator) { generators = []generator.Generator{ // Always generate a "doc.go" file. - generator.DefaultGen{OptionalName: "doc"}, + generator.GoGenerator{OutputFilename: "doc.go"}, } // Since we want a file per type that we generate a client for, we // have to provide a function for this. for _, t := range typeList { generators = append(generators, &genFakeForType{ - DefaultGen: generator.DefaultGen{ - OptionalName: "fake_" + strings.ToLower(c.Namers["private"].Name(t)), + GoGenerator: generator.GoGenerator{ + OutputFilename: "fake_" + strings.ToLower(c.Namers["private"].Name(t)) + ".go", }, outputPackage: outputPkg, inputPackage: inputPkg, @@ -68,8 +68,8 @@ func TargetForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clie } generators = append(generators, &genFakeForGroup{ - DefaultGen: generator.DefaultGen{ - OptionalName: "fake_" + groupPkgName + "_client", + GoGenerator: generator.GoGenerator{ + OutputFilename: "fake_" + groupPkgName + "_client.go", }, outputPackage: outputPkg, realClientPackage: realClientPkg, @@ -101,11 +101,11 @@ func TargetForClientset(customArgs *clientgenargs.CustomArgs, clientsetDir, clie GeneratorsFunc: func(c *generator.Context) (generators []generator.Generator) { generators = []generator.Generator{ // Always generate a "doc.go" file. - generator.DefaultGen{OptionalName: "doc"}, + generator.GoGenerator{OutputFilename: "doc.go"}, &genClientset{ - DefaultGen: generator.DefaultGen{ - OptionalName: "clientset_generated", + GoGenerator: generator.GoGenerator{ + OutputFilename: "clientset_generated.go", }, groups: customArgs.Groups, groupGoNames: groupGoNames, @@ -114,8 +114,8 @@ func TargetForClientset(customArgs *clientgenargs.CustomArgs, clientsetDir, clie realClientsetPackage: clientsetPkg, }, &scheme.GenScheme{ - DefaultGen: generator.DefaultGen{ - OptionalName: "register", + GoGenerator: generator.GoGenerator{ + OutputFilename: "register.go", }, InputPackages: customArgs.GroupVersionPackages(), OutputPackage: clientsetPkg, 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 index 12bf0a856ef..ee883cf49f2 100644 --- 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 @@ -30,7 +30,7 @@ import ( // genClientset generates a package for a clientset. type genClientset struct { - generator.DefaultGen + generator.GoGenerator groups []clientgentypes.GroupVersions groupGoNames map[clientgentypes.GroupVersion]string fakeClientsetPackage string // must be a Go import-path diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_group.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_group.go index b4d7586835b..60a3ca02fb6 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_group.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_group.go @@ -31,7 +31,7 @@ import ( // genFakeForGroup produces a file for a group client, e.g. ExtensionsClient for the extension group. type genFakeForGroup struct { - generator.DefaultGen + generator.GoGenerator outputPackage string // must be a Go import-path realClientPackage string // must be a Go import-path group string diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_type.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_type.go index 18ea1595460..d2b8d5bcd9f 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_type.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_type.go @@ -30,7 +30,7 @@ import ( // genFakeForType produces a file for each top-level type. type genFakeForType struct { - generator.DefaultGen + generator.GoGenerator outputPackage string // Must be a Go import-path group string version string diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_clientset.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_clientset.go index 5feb24b7516..e0413d13790 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_clientset.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_clientset.go @@ -30,7 +30,7 @@ import ( // genClientset generates a package for a clientset. type genClientset struct { - generator.DefaultGen + generator.GoGenerator groups []clientgentypes.GroupVersions groupGoNames map[clientgentypes.GroupVersion]string clientsetPackage string // must be a Go import-path diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_expansion.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_expansion.go index 25a3bc6ac84..5971cc5bcd2 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_expansion.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_expansion.go @@ -28,7 +28,7 @@ import ( // genExpansion produces a file for a group client, e.g. ExtensionsClient for the extension group. type genExpansion struct { - generator.DefaultGen + generator.GoGenerator groupPackagePath string // types in a group types []*types.Type diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go index 08fcac47897..03e822cd3e2 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go @@ -29,7 +29,7 @@ import ( // genGroup produces a file for a group client, e.g. ExtensionsClient for the extension group. type genGroup struct { - generator.DefaultGen + generator.GoGenerator outputPackage string group string version string diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_type.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_type.go index 34fe32d6db8..6c0f2f441a4 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_type.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_type.go @@ -31,7 +31,7 @@ import ( // genClientForType produces a file for each top-level type. type genClientForType struct { - generator.DefaultGen + generator.GoGenerator outputPackage string // must be a Go import-path inputPackage string clientsetPackage string // must be a Go import-path diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme/generator_for_scheme.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme/generator_for_scheme.go index eae3a3ae94b..c1e3e9d5bf6 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme/generator_for_scheme.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme/generator_for_scheme.go @@ -31,7 +31,7 @@ import ( // GenScheme produces a package for a clientset with the scheme, codecs and parameter codecs. type GenScheme struct { - generator.DefaultGen + generator.GoGenerator OutputPackage string // Must be a Go import-path OutputPath string // optional Groups []clientgentypes.GroupVersions 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 3a7fcf1c3bb..9de181f7628 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 @@ -466,7 +466,7 @@ type TypesEqual interface { // genConversion produces a file with a autogenerated conversions. type genConversion struct { - generator.DefaultGen + generator.GoGenerator // the package that contains the types that conversion func are going to be // generated for typesPackage string @@ -482,10 +482,10 @@ type genConversion struct { useUnsafe TypesEqual } -func NewGenConversion(sanitizedName, typesPackage, outputPackage string, manualConversions conversionFuncMap, peerPkgs []string, useUnsafe TypesEqual) generator.Generator { +func NewGenConversion(outputFilename, typesPackage, outputPackage string, manualConversions conversionFuncMap, peerPkgs []string, useUnsafe TypesEqual) generator.Generator { return &genConversion{ - DefaultGen: generator.DefaultGen{ - OptionalName: sanitizedName, + GoGenerator: generator.GoGenerator{ + OutputFilename: outputFilename, }, typesPackage: typesPackage, outputPackage: outputPackage, diff --git a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/generator.go b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/generator.go index d45d8010164..f4fd81abed8 100644 --- a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/generator.go +++ b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/generator.go @@ -34,7 +34,9 @@ import ( // genProtoIDL produces a .proto IDL. type genProtoIDL struct { - generator.DefaultGen + // This base type is close enough to what we need, if we redefine some + // methods. + generator.GoGenerator localPackage types.Name localGoPackage types.Name imports namer.ImportTracker @@ -63,8 +65,11 @@ func (g *genProtoIDL) PackageVars(c *generator.Context) []string { fmt.Sprintf("option go_package = %q;", g.localGoPackage.Package), } } -func (g *genProtoIDL) Filename() string { return g.OptionalName + ".proto" } + +func (g *genProtoIDL) Filename() string { return g.OutputFilename + ".proto" } + func (g *genProtoIDL) FileType() string { return "protoidl" } + func (g *genProtoIDL) Namers(c *generator.Context) namer.NameSystems { return namer.NameSystems{ // The local namer returns the correct protobuf name for a proto type diff --git a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/package.go b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/package.go index c29eca0d1f0..83da937e539 100644 --- a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/package.go +++ b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/package.go @@ -175,8 +175,8 @@ func (p *protobufPackage) generatorsFunc(c *generator.Context) []generator.Gener p.Imports.AddNullable() generators = append(generators, &genProtoIDL{ - DefaultGen: generator.DefaultGen{ - OptionalName: "generated", + GoGenerator: generator.GoGenerator{ + OutputFilename: "generated", // the extension is added later }, localPackage: types.Name{Package: p.Name(), Path: p.Path()}, localGoPackage: types.Name{Package: p.Path(), Name: p.GoPackageName()}, diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/factory.go b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/factory.go index 0dadd21698d..ee69aac35d9 100644 --- a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/factory.go +++ b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/factory.go @@ -31,7 +31,7 @@ import ( // factoryGenerator produces a file of listers for a given GroupVersion and // type. type factoryGenerator struct { - generator.DefaultGen + generator.GoGenerator outputPackage string imports namer.ImportTracker groupVersions map[string]clientgentypes.GroupVersions diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/factoryinterface.go b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/factoryinterface.go index 7644bb57e34..278f8ed915c 100644 --- a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/factoryinterface.go +++ b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/factoryinterface.go @@ -29,7 +29,7 @@ import ( // factoryInterfaceGenerator produces a file of interfaces used to break a dependency cycle for // informer registration type factoryInterfaceGenerator struct { - generator.DefaultGen + generator.GoGenerator outputPackage string imports namer.ImportTracker clientSetPackage string diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/generic.go b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/generic.go index a61d3d089a7..d8e8873aab6 100644 --- a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/generic.go +++ b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/generic.go @@ -30,7 +30,7 @@ import ( // genericGenerator generates the generic informer. type genericGenerator struct { - generator.DefaultGen + generator.GoGenerator outputPackage string imports namer.ImportTracker groupVersions map[string]clientgentypes.GroupVersions diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/groupinterface.go b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/groupinterface.go index 59fa7f313b3..8358c08af5e 100644 --- a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/groupinterface.go +++ b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/groupinterface.go @@ -29,7 +29,7 @@ import ( // groupInterfaceGenerator generates the per-group interface file. type groupInterfaceGenerator struct { - generator.DefaultGen + generator.GoGenerator outputPackage string imports namer.ImportTracker groupVersions clientgentypes.GroupVersions diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/informer.go b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/informer.go index 005d80392aa..9d786ea07d6 100644 --- a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/informer.go +++ b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/informer.go @@ -34,7 +34,7 @@ import ( // informerGenerator produces a file of listers for a given GroupVersion and // type. type informerGenerator struct { - generator.DefaultGen + generator.GoGenerator outputPackage string groupPkgName string groupVersion clientgentypes.GroupVersion 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 index fd59f05c0ff..41adb3c6ce6 100644 --- 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 @@ -256,8 +256,8 @@ func factoryTarget(outputDirBase, outputPkgBase string, boilerplate []byte, grou HeaderComment: boilerplate, GeneratorsFunc: func(c *generator.Context) (generators []generator.Generator) { generators = append(generators, &factoryGenerator{ - DefaultGen: generator.DefaultGen{ - OptionalName: "factory", + GoGenerator: generator.GoGenerator{ + OutputFilename: "factory.go", }, outputPackage: outputPkgBase, imports: generator.NewImportTracker(), @@ -268,8 +268,8 @@ func factoryTarget(outputDirBase, outputPkgBase string, boilerplate []byte, grou }) generators = append(generators, &genericGenerator{ - DefaultGen: generator.DefaultGen{ - OptionalName: "generic", + GoGenerator: generator.GoGenerator{ + OutputFilename: "generic.go", }, outputPackage: outputPkgBase, imports: generator.NewImportTracker(), @@ -295,8 +295,8 @@ func factoryInterfaceTarget(outputDirBase, outputPkgBase string, boilerplate []b HeaderComment: boilerplate, GeneratorsFunc: func(c *generator.Context) (generators []generator.Generator) { generators = append(generators, &factoryInterfaceGenerator{ - DefaultGen: generator.DefaultGen{ - OptionalName: "factory_interfaces", + GoGenerator: generator.GoGenerator{ + OutputFilename: "factory_interfaces.go", }, outputPackage: outputPkg, imports: generator.NewImportTracker(), @@ -320,8 +320,8 @@ func groupTarget(outputDirBase, outputPackageBase string, groupVersions clientge HeaderComment: boilerplate, GeneratorsFunc: func(c *generator.Context) (generators []generator.Generator) { generators = append(generators, &groupInterfaceGenerator{ - DefaultGen: generator.DefaultGen{ - OptionalName: "interface", + GoGenerator: generator.GoGenerator{ + OutputFilename: "interface.go", }, outputPackage: outputPkg, groupVersions: groupVersions, @@ -349,8 +349,8 @@ func versionTarget(outputDirBase, outputPkgBase string, groupPkgName string, gv HeaderComment: boilerplate, GeneratorsFunc: func(c *generator.Context) (generators []generator.Generator) { generators = append(generators, &versionInterfaceGenerator{ - DefaultGen: generator.DefaultGen{ - OptionalName: "interface", + GoGenerator: generator.GoGenerator{ + OutputFilename: "interface.go", }, outputPackage: outputPkg, imports: generator.NewImportTracker(), @@ -360,8 +360,8 @@ func versionTarget(outputDirBase, outputPkgBase string, groupPkgName string, gv for _, t := range typesToGenerate { generators = append(generators, &informerGenerator{ - DefaultGen: generator.DefaultGen{ - OptionalName: strings.ToLower(t.Name.Name), + GoGenerator: generator.GoGenerator{ + OutputFilename: strings.ToLower(t.Name.Name) + ".go", }, outputPackage: outputPkg, groupPkgName: groupPkgName, diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/versioninterface.go b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/versioninterface.go index 6d0ce8994fe..5f9a0c218d6 100644 --- a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/versioninterface.go +++ b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/versioninterface.go @@ -28,7 +28,7 @@ import ( // versionInterfaceGenerator generates the per-version interface file. type versionInterfaceGenerator struct { - generator.DefaultGen + generator.GoGenerator outputPackage string imports namer.ImportTracker types []*types.Type diff --git a/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/expansion.go b/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/expansion.go index 87f88208ad1..4755f2ed1e6 100644 --- a/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/expansion.go +++ b/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/expansion.go @@ -31,7 +31,7 @@ import ( // expansionGenerator produces a file for a expansion interfaces. type expansionGenerator struct { - generator.DefaultGen + generator.GoGenerator outputPath string types []*types.Type } 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 index a791d4b1bba..f5d8d81a97e 100644 --- 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 @@ -134,8 +134,8 @@ func GetTargets(context *generator.Context, arguments *args.GeneratorArgs) []gen }, GeneratorsFunc: func(c *generator.Context) (generators []generator.Generator) { generators = append(generators, &expansionGenerator{ - DefaultGen: generator.DefaultGen{ - OptionalName: "expansion_generated", + GoGenerator: generator.GoGenerator{ + OutputFilename: "expansion_generated.go", }, outputPath: outputDir, types: typesToGenerate, @@ -143,8 +143,8 @@ func GetTargets(context *generator.Context, arguments *args.GeneratorArgs) []gen for _, t := range typesToGenerate { generators = append(generators, &listerGenerator{ - DefaultGen: generator.DefaultGen{ - OptionalName: strings.ToLower(t.Name.Name), + GoGenerator: generator.GoGenerator{ + OutputFilename: strings.ToLower(t.Name.Name) + ".go", }, outputPackage: outputPkg, groupVersion: gv, @@ -191,7 +191,7 @@ func isInternal(m types.Member) bool { // listerGenerator produces a file of listers for a given GroupVersion and // type. type listerGenerator struct { - generator.DefaultGen + generator.GoGenerator outputPackage string groupVersion clientgentypes.GroupVersion internalGVPkg string 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 a1d40a9a6eb..4749a148c34 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 @@ -252,17 +252,17 @@ func GetTargets(context *generator.Context, arguments *args.GeneratorArgs) []gen // genDeepCopy produces a file with autogenerated deep-copy functions. type genPreleaseLifecycle struct { - generator.DefaultGen + generator.GoGenerator targetPackage string imports namer.ImportTracker typesForInit []*types.Type } // NewPrereleaseLifecycleGen creates a generator for the prerelease-lifecycle-generator -func NewPrereleaseLifecycleGen(sanitizedName, targetPackage string) generator.Generator { +func NewPrereleaseLifecycleGen(outputFilename, targetPackage string) generator.Generator { return &genPreleaseLifecycle{ - DefaultGen: generator.DefaultGen{ - OptionalName: sanitizedName, + GoGenerator: generator.GoGenerator{ + OutputFilename: outputFilename, }, targetPackage: targetPackage, imports: generator.NewImportTracker(), diff --git a/staging/src/k8s.io/code-generator/cmd/register-gen/generators/register_external.go b/staging/src/k8s.io/code-generator/cmd/register-gen/generators/register_external.go index c071534eacd..7eb7793e408 100644 --- a/staging/src/k8s.io/code-generator/cmd/register-gen/generators/register_external.go +++ b/staging/src/k8s.io/code-generator/cmd/register-gen/generators/register_external.go @@ -27,7 +27,7 @@ import ( ) type registerExternalGenerator struct { - generator.DefaultGen + generator.GoGenerator outputPackage string gv clientgentypes.GroupVersion typesToGenerate []*types.Type 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 e260f4c72ad..bdbb60159b7 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 @@ -108,8 +108,8 @@ func GetTargets(context *generator.Context, arguments *args.GeneratorArgs) []gen GeneratorsFunc: func(c *generator.Context) (generators []generator.Generator) { return []generator.Generator{ ®isterExternalGenerator{ - DefaultGen: generator.DefaultGen{ - OptionalName: arguments.OutputFileBaseName, + GoGenerator: generator.GoGenerator{ + OutputFilename: arguments.OutputFileBaseName, }, gv: gv, typesToGenerate: typesToRegister, diff --git a/staging/src/k8s.io/code-generator/kube_codegen.sh b/staging/src/k8s.io/code-generator/kube_codegen.sh index a41ecef5240..4c881553d08 100755 --- a/staging/src/k8s.io/code-generator/kube_codegen.sh +++ b/staging/src/k8s.io/code-generator/kube_codegen.sh @@ -144,7 +144,7 @@ function kube::codegen::gen_helpers() { done "${gobin}/deepcopy-gen" \ -v "${v}" \ - --output-file-base zz_generated.deepcopy \ + --output-file-base zz_generated.deepcopy.go \ --go-header-file "${boilerplate}" \ "${input_args[@]}" fi @@ -180,7 +180,7 @@ function kube::codegen::gen_helpers() { done "${gobin}/defaulter-gen" \ -v "${v}" \ - --output-file-base zz_generated.defaults \ + --output-file-base zz_generated.defaults.go \ --go-header-file "${boilerplate}" \ "${input_args[@]}" fi @@ -220,7 +220,7 @@ function kube::codegen::gen_helpers() { done "${gobin}/conversion-gen" \ -v "${v}" \ - --output-file-base zz_generated.conversion \ + --output-file-base zz_generated.conversion.go \ --go-header-file "${boilerplate}" \ "${extra_peer_args[@]:+"${extra_peer_args[@]}"}" \ "${input_args[@]}" @@ -373,7 +373,7 @@ function kube::codegen::gen_openapi() { done "${gobin}/openapi-gen" \ -v "${v}" \ - --output-file-base zz_generated.openapi \ + --output-file-base zz_generated.openapi.go \ --go-header-file "${boilerplate}" \ --output-base "${out_dir}" \ --output-package "${out_pkg}" \