From d06b7036e7dfc29e9639f5f86646cefaf7de4140 Mon Sep 17 00:00:00 2001
From: Joe Lanford <joe.lanford@gmail.com>
Date: Wed, 15 Jul 2020 16:53:27 -0400
Subject: [PATCH] pkg/plugin: updates based on review in SDK repo

---
 pkg/plugin/v1/api.go           |  2 --
 pkg/plugin/v1/init.go          |  5 +++--
 pkg/plugin/v1/scaffolds/api.go | 23 +++++++----------------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/pkg/plugin/v1/api.go b/pkg/plugin/v1/api.go
index 16bb9617..0a47bb61 100644
--- a/pkg/plugin/v1/api.go
+++ b/pkg/plugin/v1/api.go
@@ -21,7 +21,6 @@ import (
 	"strings"
 
 	"github.com/spf13/pflag"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/kubebuilder/pkg/model/config"
 	"sigs.k8s.io/kubebuilder/pkg/model/resource"
 	"sigs.k8s.io/kubebuilder/pkg/plugin"
@@ -36,7 +35,6 @@ type createAPIPlugin struct {
 	config *config.Config
 
 	createOptions chartutil.CreateOptions
-	gvk           schema.GroupVersionKind
 }
 
 var (
diff --git a/pkg/plugin/v1/init.go b/pkg/plugin/v1/init.go
index ca2c56e9..0e053a43 100644
--- a/pkg/plugin/v1/init.go
+++ b/pkg/plugin/v1/init.go
@@ -139,7 +139,7 @@ func (p *initPlugin) Validate() error {
 	}
 
 	defaultOpts := chartutil.CreateOptions{CRDVersion: "v1"}
-	if !p.apiPlugin.gvk.Empty() || p.apiPlugin.createOptions != defaultOpts {
+	if !p.apiPlugin.createOptions.GVK.Empty() || p.apiPlugin.createOptions != defaultOpts {
 		p.doAPIScaffold = true
 		return p.apiPlugin.Validate()
 	}
@@ -164,6 +164,7 @@ func (p *initPlugin) GetScaffolder() (scaffold.Scaffolder, error) {
 func (p *initPlugin) PostScaffold() error {
 	if !p.doAPIScaffold {
 		fmt.Printf("Next: define a resource with:\n$ %s create api\n", p.commandName)
+		return nil
 	}
-	return nil
+	return p.apiPlugin.PostScaffold()
 }
diff --git a/pkg/plugin/v1/scaffolds/api.go b/pkg/plugin/v1/scaffolds/api.go
index 26c93520..dc5c76d2 100644
--- a/pkg/plugin/v1/scaffolds/api.go
+++ b/pkg/plugin/v1/scaffolds/api.go
@@ -55,22 +55,6 @@ func NewAPIScaffolder(config *config.Config, opts chartutil.CreateOptions) scaff
 
 // Scaffold implements Scaffolder
 func (s *apiScaffolder) Scaffold() error {
-	switch {
-	case s.config.IsV2(), s.config.IsV3():
-		return s.scaffold()
-	default:
-		return fmt.Errorf("unknown project version %v", s.config.Version)
-	}
-}
-
-func (s *apiScaffolder) newUniverse(r *resource.Resource) *model.Universe {
-	return model.NewUniverse(
-		model.WithConfig(s.config),
-		model.WithResource(r),
-	)
-}
-
-func (s *apiScaffolder) scaffold() error {
 	projectDir, err := os.Getwd()
 	if err != nil {
 		return err
@@ -136,3 +120,10 @@ func (s *apiScaffolder) scaffold() error {
 
 	return nil
 }
+
+func (s *apiScaffolder) newUniverse(r *resource.Resource) *model.Universe {
+	return model.NewUniverse(
+		model.WithConfig(s.config),
+		model.WithResource(r),
+	)
+}