Merge pull request #1828 from Adirio/cli-refactoring

⚠ pkg/cli overhaul
kubernetes-sigs · Dec 4, 2020 · 593f2e8 · 593f2e8
2 parents 6b775b8 + cb369d9
commit 593f2e8
Show file tree

Hide file tree

Showing 19 changed files with 1,427 additions and 894 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -20,6 +20,7 @@ import (
 	"log"
 
 	"sigs.k8s.io/kubebuilder/v2/pkg/cli"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
 	pluginv2 "sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2"
 	pluginv3 "sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3"
 )
@@ -28,11 +29,15 @@ func main() {
 	c, err := cli.New(
 		cli.WithCommandName("kubebuilder"),
 		cli.WithVersion(versionString()),
+		cli.WithDefaultProjectVersion(config.Version3Alpha),
 		cli.WithPlugins(
 			&pluginv2.Plugin{},
 			&pluginv3.Plugin{},
 		),
-		cli.WithDefaultPlugins(
+		cli.WithDefaultPlugins(config.Version2,
+			&pluginv2.Plugin{},
+		),
+		cli.WithDefaultPlugins(config.Version3Alpha,
 			&pluginv2.Plugin{},
 		),
 		cli.WithCompletion,

diff --git a/pkg/cli/api.go b/pkg/cli/api.go
@@ -25,7 +25,7 @@ import (
 	"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
 )
 
-func (c *cli) newCreateAPICmd() *cobra.Command {
+func (c cli) newCreateAPICmd() *cobra.Command {
 	ctx := c.newAPIContext()
 	cmd := &cobra.Command{
 		Use:     "api",
@@ -43,19 +43,20 @@ func (c *cli) newCreateAPICmd() *cobra.Command {
 }
 
 func (c cli) newAPIContext() plugin.Context {
-	ctx := plugin.Context{
+	return plugin.Context{
 		CommandName: c.commandName,
 		Description: `Scaffold a Kubernetes API.
 `,
 	}
-	if !c.configured {
-		ctx.Description = fmt.Sprintf("%s\n%s", ctx.Description, runInProjectRootMsg)
-	}
-	return ctx
 }
 
 // nolint:dupl
 func (c cli) bindCreateAPI(ctx plugin.Context, cmd *cobra.Command) {
+	if len(c.resolvedPlugins) == 0 {
+		cmdErr(cmd, fmt.Errorf(noPluginError))
+		return
+	}
+
 	var createAPIPlugin plugin.CreateAPI
 	for _, p := range c.resolvedPlugins {
 		tmpPlugin, isValid := p.(plugin.CreateAPI)
@@ -71,8 +72,7 @@ func (c cli) bindCreateAPI(ctx plugin.Context, cmd *cobra.Command) {
 	}
 
 	if createAPIPlugin == nil {
-		err := fmt.Errorf("relevant plugins do not provide an API creation plugin")
-		cmdErr(cmd, err)
+		cmdErr(cmd, fmt.Errorf("resolved plugins do not provide an API creation plugin: %v", c.pluginKeys))
 		return
 	}