Helpers-gen calls deepcopy-gen

staging/src/k8s.io/code-generator/cmd/deepcopy-gen/gen/run.go

@@ -0,0 +1,46 @@
+/*
+ Copyright 2023 The Kubernetes Authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except In compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to In writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+package gen
+
+import (
+	"github.com/spf13/pflag"
+	generatorargs "k8s.io/code-generator/cmd/deepcopy-gen/args"
+	"k8s.io/gengo/examples/deepcopy-gen/generators"
+)
+
+// DeepCopy runs the deepcopy-gen with given flagset and args.
+func DeepCopy(fs *pflag.FlagSet, args []string) error {
+	genericArgs, customArgs := generatorargs.NewDefaults()
+
+	genericArgs.AddFlags(fs)
+	customArgs.AddFlags(fs)
+
+	if err := fs.Parse(args); err != nil {
+		return err
+	}
+
+	if err := generatorargs.Validate(genericArgs); err != nil {
+		return err
+	}
+
+	// Run it.
+	return genericArgs.Execute(
+		generators.NameSystems(),
+		generators.DefaultNameSystem(),
+		generators.Packages,
+	)
+}

staging/src/k8s.io/code-generator/cmd/deepcopy-gen/main.go

@@ -47,34 +47,19 @@ package main
 
 import (
 	"flag"
+	"k8s.io/code-generator/cmd/defaulter-gen/gen"
+	"os"
 
 	"github.com/spf13/pflag"
-	"k8s.io/gengo/examples/deepcopy-gen/generators"
 	"k8s.io/klog/v2"
-
-	generatorargs "k8s.io/code-generator/cmd/deepcopy-gen/args"
 )
 
 func main() {
 	klog.InitFlags(nil)
-	genericArgs, customArgs := generatorargs.NewDefaults()
-
-	genericArgs.AddFlags(pflag.CommandLine)
-	customArgs.AddFlags(pflag.CommandLine)
 	flag.Set("logtostderr", "true")
 	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
-	pflag.Parse()
-
-	if err := generatorargs.Validate(genericArgs); err != nil {
-		klog.Fatalf("Error: %v", err)
-	}
 
-	// Run it.
-	if err := genericArgs.Execute(
-		generators.NameSystems(),
-		generators.DefaultNameSystem(),
-		generators.Packages,
-	); err != nil {
+	if err := gen.Defaulter(pflag.CommandLine, os.Args[1:]); err != nil {
 		klog.Fatalf("Error: %v", err)
 	}
 	klog.V(2).Info("Completed successfully.")

staging/src/k8s.io/code-generator/cmd/defaulter-gen/gen/run.go

@@ -0,0 +1,46 @@
+/*
+ Copyright 2023 The Kubernetes Authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except In compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to In writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+package gen
+
+import (
+	"github.com/spf13/pflag"
+	generatorargs "k8s.io/code-generator/cmd/defaulter-gen/args"
+	"k8s.io/gengo/examples/defaulter-gen/generators"
+)
+
+// Defaulter runs the defaulter-gen with given flagset and args.
+func Defaulter(fs *pflag.FlagSet, args []string) error {
+	genericArgs, customArgs := generatorargs.NewDefaults()
+
+	genericArgs.AddFlags(fs)
+	customArgs.AddFlags(fs)
+
+	if err := fs.Parse(args); err != nil {
+		return err
+	}
+
+	if err := generatorargs.Validate(genericArgs); err != nil {
+		return err
+	}
+
+	// Run it.
+	return genericArgs.Execute(
+		generators.NameSystems(),
+		generators.DefaultNameSystem(),
+		generators.Packages,
+	)
+}

staging/src/k8s.io/code-generator/cmd/defaulter-gen/main.go

@@ -43,34 +43,19 @@ package main
 
 import (
 	"flag"
+	"k8s.io/code-generator/cmd/defaulter-gen/gen"
+	"os"
 
 	"github.com/spf13/pflag"
-	"k8s.io/gengo/examples/defaulter-gen/generators"
 	"k8s.io/klog/v2"
-
-	generatorargs "k8s.io/code-generator/cmd/defaulter-gen/args"
 )
 
 func main() {
 	klog.InitFlags(nil)
-	genericArgs, customArgs := generatorargs.NewDefaults()
-
-	genericArgs.AddFlags(pflag.CommandLine)
-	customArgs.AddFlags(pflag.CommandLine)
 	flag.Set("logtostderr", "true")
 	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
-	pflag.Parse()
-
-	if err := generatorargs.Validate(genericArgs); err != nil {
-		klog.Fatalf("Error: %v", err)
-	}
 
-	// Run it.
-	if err := genericArgs.Execute(
-		generators.NameSystems(),
-		generators.DefaultNameSystem(),
-		generators.Packages,
-	); err != nil {
+	if err := gen.Defaulter(pflag.CommandLine, os.Args[1:]); err != nil {
 		klog.Fatalf("Error: %v", err)
 	}
 	klog.V(2).Info("Completed successfully.")

staging/src/k8s.io/code-generator/codegen.go

@@ -17,13 +17,17 @@
 package main
 
 import (
+	"flag"
 	"k8s.io/code-generator/internal/codegen"
 	"k8s.io/code-generator/internal/codegen/execution"
+	"k8s.io/klog/v2"
 )
 
 var options []execution.Option
 
 func main() {
+	klog.InitFlags(nil)
+	_ = flag.Set("logtostderr", "true")
 	codegen.Run(options...)
 }
 

staging/src/k8s.io/code-generator/internal/codegen/command/client/cmd.go

@@ -17,6 +17,7 @@
 package client
 
 import (
+	goflag "flag"
 	"github.com/spf13/pflag"
 	"k8s.io/code-generator/internal/codegen/execution"
 	"k8s.io/code-generator/pkg/codegen/client"
@@ -39,7 +40,8 @@ func (c Command) Matches(ex *execution.Vars) bool {
 
 func (c Command) Run(ex *execution.Vars) {
 	args := &client.Args{}
-	fs := pflag.NewFlagSet(ex.Args[0], pflag.ExitOnError)
+	fs := pflag.NewFlagSet(ex.Args[0], pflag.ContinueOnError)
+	fs.AddGoFlagSet(goflag.CommandLine) // make sure we get the klog flags
 	defineFlags(fs, args)
 	if err := fs.Parse(ex.Args[1:]); err != nil {
 		ex.PrintErrln("Error parsing arguments:", err)

staging/src/k8s.io/code-generator/internal/codegen/command/client/cmd_test.go

@@ -17,9 +17,11 @@
 package client_test
 
 import (
+	"bytes"
 	"k8s.io/code-generator/internal/codegen/command/client"
 	"k8s.io/code-generator/internal/codegen/execution"
 	pkgclient "k8s.io/code-generator/pkg/codegen/client"
+	"math"
 	"testing"
 )
 
@@ -64,6 +66,31 @@ func TestCommandRun(t *testing.T) {
 	}
 }
 
+func TestCommandRunInvalidArgs(t *testing.T) {
+	t.Parallel()
+	var errstream bytes.Buffer
+	retcode := math.MinInt32
+	gen := &testGen{}
+	cmd := client.Command{Gen: gen}
+	ex := execution.New(func(v *execution.Vars) {
+		v.Args = []string{cmd.Name(), "--input-foo", "foo"}
+		v.Err = &errstream
+		v.Exit = func(code int) {
+			retcode = code
+		}
+	})
+	cmd.Run(ex)
+	if len(gen.calls) != 0 {
+		t.Errorf("expected gen to be called zero times, got %d", len(gen.calls))
+	}
+	if retcode != 8 {
+		t.Errorf("expected exit code 8, got %d", retcode)
+	}
+	if errstream.String() == "" {
+		t.Errorf("expected error message to be printed")
+	}
+}
+
 type testGen struct {
 	calls []pkgclient.Args
 }

staging/src/k8s.io/code-generator/internal/codegen/command/helpers/cmd.go

@@ -17,6 +17,7 @@
 package helpers
 
 import (
+	goflag "flag"
 	"github.com/spf13/pflag"
 	"k8s.io/code-generator/internal/codegen/execution"
 	"k8s.io/code-generator/pkg/codegen/helpers"
@@ -38,13 +39,15 @@ func (c Command) Matches(ex *execution.Vars) bool {
 
 func (c Command) Run(ex *execution.Vars) {
 	args := &helpers.Args{}
-	fs := pflag.NewFlagSet(ex.Args[0], pflag.ExitOnError)
+	fs := pflag.NewFlagSet(ex.Args[0], pflag.ContinueOnError)
+	fs.AddGoFlagSet(goflag.CommandLine) // make sure we get the klog flags
 	defineFlags(fs, args)
 	if err := fs.Parse(ex.Args[1:]); err != nil {
-		ex.PrintErrln("Error parsing arguments:", err)
-		ex.PrintErrln()
-		ex.PrintErrln(c.Help())
-		ex.Exit(10)
+		c.printErrorWithUsage(ex, "Error parsing arguments:", err)
+		return
+	}
+	if err := args.Validate(); err != nil {
+		c.printErrorWithUsage(ex, err)
 		return
 	}
 	gen := c.createOrGetGenerator(ex)
@@ -55,6 +58,13 @@ func (c Command) Run(ex *execution.Vars) {
 	}
 }
 
+func (c Command) printErrorWithUsage(ex *execution.Vars, i ...any) {
+	ex.PrintErrln(i...)
+	ex.PrintErrln()
+	ex.PrintErrln(c.Help())
+	ex.Exit(10)
+}
+
 func (c Command) createOrGetGenerator(pr printer.Printer) Generator {
 	if c.Gen == nil {
 		return &helpers.Generator{Printer: pr}

staging/src/k8s.io/code-generator/internal/codegen/command/helpers/cmd_test.go

@@ -17,9 +17,11 @@
 package helpers_test
 
 import (
+	"bytes"
 	"k8s.io/code-generator/internal/codegen/command/helpers"
 	"k8s.io/code-generator/internal/codegen/execution"
 	pkghelpers "k8s.io/code-generator/pkg/codegen/helpers"
+	"math"
 	"testing"
 )
 
@@ -64,6 +66,31 @@ func TestCommandRun(t *testing.T) {
 	}
 }
 
+func TestCommandRunInvalidArgs(t *testing.T) {
+	t.Parallel()
+	var errstream bytes.Buffer
+	retcode := math.MinInt32
+	gen := &testGen{}
+	cmd := helpers.Command{Gen: gen}
+	ex := execution.New(func(v *execution.Vars) {
+		v.Args = []string{cmd.Name(), "--input-foo", "foo"}
+		v.Err = &errstream
+		v.Exit = func(code int) {
+			retcode = code
+		}
+	})
+	cmd.Run(ex)
+	if len(gen.calls) != 0 {
+		t.Errorf("expected gen to be called zero times, got %d", len(gen.calls))
+	}
+	if retcode != 10 {
+		t.Errorf("expected exit code 10, got %d", retcode)
+	}
+	if errstream.String() == "" {
+		t.Errorf("expected error message to be printed")
+	}
+}
+
 type testGen struct {
 	calls []pkghelpers.Args
 }

staging/src/k8s.io/code-generator/internal/codegen/command/openapi/cmd.go

@@ -17,6 +17,7 @@
 package openapi
 
 import (
+	goflag "flag"
 	"github.com/spf13/pflag"
 	"k8s.io/code-generator/internal/codegen/execution"
 	"k8s.io/code-generator/pkg/codegen/openapi"
@@ -39,7 +40,8 @@ func (c Command) Matches(ex *execution.Vars) bool {
 
 func (c Command) Run(ex *execution.Vars) {
 	args := &openapi.Args{}
-	fs := pflag.NewFlagSet(ex.Args[0], pflag.ExitOnError)
+	fs := pflag.NewFlagSet(ex.Args[0], pflag.ContinueOnError)
+	fs.AddGoFlagSet(goflag.CommandLine) // make sure we get the klog flags
 	defineFlags(fs, args)
 	if err := fs.Parse(ex.Args[1:]); err != nil {
 		ex.PrintErrln("Error parsing arguments:", err)

staging/src/k8s.io/code-generator/internal/codegen/command/openapi/cmd_test.go

@@ -17,9 +17,11 @@
 package openapi_test
 
 import (
+	"bytes"
 	"k8s.io/code-generator/internal/codegen/command/openapi"
 	"k8s.io/code-generator/internal/codegen/execution"
 	pkgopenapi "k8s.io/code-generator/pkg/codegen/openapi"
+	"math"
 	"testing"
 )
 
@@ -64,6 +66,31 @@ func TestCommandRun(t *testing.T) {
 	}
 }
 
+func TestCommandRunInvalidArgs(t *testing.T) {
+	t.Parallel()
+	var errstream bytes.Buffer
+	retcode := math.MinInt32
+	gen := &testGen{}
+	cmd := openapi.Command{Gen: gen}
+	ex := execution.New(func(v *execution.Vars) {
+		v.Args = []string{cmd.Name(), "--input-foo", "foo"}
+		v.Err = &errstream
+		v.Exit = func(code int) {
+			retcode = code
+		}
+	})
+	cmd.Run(ex)
+	if len(gen.calls) != 0 {
+		t.Errorf("expected gen to be called zero times, got %d", len(gen.calls))
+	}
+	if retcode != 12 {
+		t.Errorf("expected exit code 12, got %d", retcode)
+	}
+	if errstream.String() == "" {
+		t.Errorf("expected error message to be printed")
+	}
+}
+
 type testGen struct {
 	calls []pkgopenapi.Args
 }