Merge pull request #1403 from estroz/feature/plugins-config-layout

feature/plugins: config `layout`, `--plugins` flag, and plugin name validation
kubernetes-sigs · Mar 25, 2020 · 505e23d · 505e23d
2 parents cf728d8 + f460cc7
commit 505e23d
Show file tree

Hide file tree

Showing 16 changed files with 342 additions and 147 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -31,6 +31,10 @@ func main() {
 			&pluginv1.Plugin{},
 			&pluginv2.Plugin{},
 		),
+		cli.WithDefaultPlugins(
+			&pluginv1.Plugin{},
+			&pluginv2.Plugin{},
+		),
 		cli.WithExtraCommands(
 			newEditCmd(),
 			newUpdateCmd(),

diff --git a/designs/extensible-cli-and-scaffolding-plugins-phase-1.md b/designs/extensible-cli-and-scaffolding-plugins-phase-1.md
@@ -62,7 +62,7 @@ project versions (via `SupportedProjectVersions()`).
 Example `PROJECT` file:
 
 ```yaml
-version: "3-alpha"
+version: "2"
 layout: go/v1.0.0
 domain: testproject.org
 repo: github.com/test-inc/testproject

diff --git a/pkg/cli/api.go b/pkg/cli/api.go
@@ -55,14 +55,9 @@ func (c cli) newAPIContext() plugin.Context {
 }
 
 func (c cli) bindCreateAPI(ctx plugin.Context, cmd *cobra.Command) {
-	versionedPlugins, err := c.getVersionedPlugins()
-	if err != nil {
-		cmdErr(cmd, err)
-		return
-	}
 	var getter plugin.CreateAPIPluginGetter
 	var hasGetter bool
-	for _, p := range versionedPlugins {
+	for _, p := range c.resolvedPlugins {
 		tmpGetter, isGetter := p.(plugin.CreateAPIPluginGetter)
 		if isGetter {
 			if hasGetter {