The gengo "args" package is gone

This commit is contained in:
Tim Hockin 2024-01-16 21:59:34 -08:00
parent b40e4d7e70
commit 236ce54aa8
No known key found for this signature in database
20 changed files with 25 additions and 25 deletions

View File

@ -23,7 +23,7 @@ import (
"sort"
"strings"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"

View File

@ -23,7 +23,7 @@ import (
"github.com/spf13/pflag"
"k8s.io/code-generator/cmd/applyconfiguration-gen/args"
"k8s.io/code-generator/cmd/applyconfiguration-gen/generators"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
"k8s.io/klog/v2"
)

View File

@ -28,7 +28,7 @@ import (
"k8s.io/code-generator/cmd/client-gen/generators/util"
clientgentypes "k8s.io/code-generator/cmd/client-gen/types"
codegennamer "k8s.io/code-generator/pkg/namer"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"

View File

@ -26,7 +26,7 @@ import (
"k8s.io/code-generator/cmd/client-gen/args"
"k8s.io/code-generator/cmd/client-gen/generators"
"k8s.io/code-generator/pkg/util"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
)

View File

@ -26,7 +26,7 @@ import (
"strings"
"k8s.io/code-generator/cmd/conversion-gen/args"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"

View File

@ -102,7 +102,7 @@ import (
generatorargs "k8s.io/code-generator/cmd/conversion-gen/args"
"k8s.io/code-generator/cmd/conversion-gen/generators"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
)

View File

@ -24,7 +24,7 @@ import (
"strings"
"k8s.io/code-generator/cmd/deepcopy-gen/args"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"

View File

@ -74,7 +74,7 @@ import (
"github.com/spf13/pflag"
"k8s.io/code-generator/cmd/deepcopy-gen/args"
"k8s.io/code-generator/cmd/deepcopy-gen/generators"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
"k8s.io/klog/v2"
)

View File

@ -28,7 +28,7 @@ import (
"strings"
"k8s.io/code-generator/cmd/defaulter-gen/args"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"

View File

@ -47,7 +47,7 @@ import (
"github.com/spf13/pflag"
"k8s.io/code-generator/cmd/defaulter-gen/args"
"k8s.io/code-generator/cmd/defaulter-gen/generators"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
"k8s.io/klog/v2"
)

View File

@ -29,7 +29,7 @@ import (
flag "github.com/spf13/pflag"
"k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/parser"
@ -82,9 +82,9 @@ func (g *Generator) BindFlags(flag *flag.FlagSet) {
flag.StringVar(&g.DropEmbeddedFields, "drop-embedded-fields", g.DropEmbeddedFields, "Comma-delimited list of embedded Go types to omit from generated protobufs")
}
// This roughly models gengo/v2/args.GeneratorArgs.Execute.
// This roughly models gengo/v2.Execute.
func Run(g *Generator) {
// Roughly models gengo/v2/args.GeneratorArgs.NewBuilder.
// Roughly models gengo/v2.newBuilder.
b := parser.NewWithOptions(parser.Options{BuildTags: []string{"proto"}})
@ -150,10 +150,10 @@ func Run(g *Generator) {
c.FileTypes["protoidl"] = NewProtoFile()
// Roughly models gengo/v2/args.GeneratorArgs.Execute calling the
// tool-provided Packages() callback.
// Roughly models gengo/v2.Execute calling the
// tool-provided Targets() callback.
boilerplate, err := args.GoBoilerplate(g.GoHeaderFile, "", "")
boilerplate, err := gengo.GoBoilerplate(g.GoHeaderFile, "", "")
if err != nil {
log.Fatalf("Failed loading boilerplate (consider using the go-header-file flag): %v", err)
}

View File

@ -26,7 +26,7 @@ import (
clientgentypes "k8s.io/code-generator/cmd/client-gen/types"
"k8s.io/code-generator/cmd/informer-gen/args"
genutil "k8s.io/code-generator/pkg/util"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"

View File

@ -23,7 +23,7 @@ import (
"k8s.io/code-generator/cmd/informer-gen/args"
"k8s.io/code-generator/cmd/informer-gen/generators"
"k8s.io/code-generator/pkg/util"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
"k8s.io/klog/v2"
)

View File

@ -25,7 +25,7 @@ import (
"k8s.io/code-generator/cmd/client-gen/generators/util"
clientgentypes "k8s.io/code-generator/cmd/client-gen/types"
"k8s.io/code-generator/cmd/lister-gen/args"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"

View File

@ -23,7 +23,7 @@ import (
"k8s.io/code-generator/cmd/lister-gen/args"
"k8s.io/code-generator/cmd/lister-gen/generators"
"k8s.io/code-generator/pkg/util"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
"k8s.io/klog/v2"
)

View File

@ -25,7 +25,7 @@ import (
"log"
"github.com/spf13/pflag"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
"k8s.io/klog/v2"
"k8s.io/kube-openapi/cmd/openapi-gen/args"

View File

@ -40,7 +40,7 @@ import (
"github.com/spf13/pflag"
"k8s.io/code-generator/cmd/prerelease-lifecycle-gen/args"
statusgenerators "k8s.io/code-generator/cmd/prerelease-lifecycle-gen/prerelease-lifecycle-generators"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
"k8s.io/klog/v2"
)

View File

@ -24,7 +24,7 @@ import (
"strings"
"k8s.io/code-generator/cmd/prerelease-lifecycle-gen/args"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"

View File

@ -26,7 +26,7 @@ import (
clientgentypes "k8s.io/code-generator/cmd/client-gen/types"
"k8s.io/code-generator/cmd/register-gen/args"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"

View File

@ -22,7 +22,7 @@ import (
"github.com/spf13/pflag"
"k8s.io/code-generator/cmd/register-gen/args"
"k8s.io/code-generator/cmd/register-gen/generators"
gengo "k8s.io/gengo/v2/args"
"k8s.io/gengo/v2"
"k8s.io/gengo/v2/generator"
"k8s.io/klog/v2"
)