Validate resources for webhooks and tests

Signed-off-by: Adrian Orive <[email protected]>

cmd/webhook_v1.go

@@ -21,9 +21,7 @@ import (
 	"log"
 	"os"
 	"os/exec"
-	"strings"
 
-	"github.com/gobuffalo/flect"
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 
@@ -63,12 +61,12 @@ This command is only available for v1 scaffolding project.
 				os.Exit(1)
 			}
 
-			fmt.Println("Writing scaffold for you to edit...")
-
-			if len(o.res.Resource) == 0 {
-				o.res.Resource = flect.Pluralize(strings.ToLower(o.res.Kind))
+			if err := o.res.Validate(); err != nil {
+				log.Fatal(err)
 			}
 
+			fmt.Println("Writing scaffold for you to edit...")
+
 			err = (&scaffold.Scaffold{}).Execute(
 				&model.Universe{},
 				input.Options{},

cmd/webhook_v2.go

@@ -23,7 +23,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/gobuffalo/flect"
 	"github.com/spf13/cobra"
 
 	"sigs.k8s.io/kubebuilder/pkg/model"
@@ -66,11 +65,12 @@ func newWebhookV2Cmd() *cobra.Command {
 				os.Exit(1)
 			}
 
-			if len(o.res.Resource) == 0 {
-				o.res.Resource = flect.Pluralize(strings.ToLower(o.res.Kind))
+			if err := o.res.Validate(); err != nil {
+				log.Fatal(err)
 			}
 
 			fmt.Println("Writing scaffold for you to edit...")
+
 			fmt.Println(filepath.Join("api", o.res.Version,
 				fmt.Sprintf("%s_webhook.go", strings.ToLower(o.res.Kind))))
 			if o.conversion {

pkg/scaffold/v1/crd/suite_test.go

@@ -30,6 +30,8 @@ var _ = Describe("Resource", func() {
 
 	for i := range resources {
 		r := resources[i]
+		_ = r.Validate()
+
 		Describe(fmt.Sprintf("scaffolding API %s", r.Kind), func() {
 			files := []struct {
 				instance input.File

pkg/scaffold/v1/webhook/webhook_test.go

@@ -65,6 +65,8 @@ var _ = Describe("Webhook", func() {
 
 	for i := range inputs {
 		in := inputs[i]
+		_ = in.Validate()
+
 		Describe(fmt.Sprintf("scaffolding webhook %s", in.Kind), func() {
 			files := []struct {
 				instance input.File