cleanup: remove v1 code source which is deprecated

kubernetes-sigs · Apr 29, 2020 · 0115566 · 0115566
1 parent bd2bfc6
commit 0115566
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -39,6 +39,7 @@ func main() {
 		),
 		cli.WithExtraCommands(
 			newEditCmd(),
+			newUpdateCmd(),
 			newCompletionCmd(),
 			version.NewCmd(),
 		),

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -183,7 +183,6 @@ func (e saveError) Error() string {
 	return fmt.Sprintf("unable to save the configuration: %v", e.err)
 }
 
-// todo: check the best way we centralize it
 // CheckProjectVersionSupported returns true if the project is already configured and it is v2
 func CheckProjectVersionSupported() error {
 	cfg, err := Read()

diff --git a/pkg/scaffold/api.go b/pkg/scaffold/api.go
@@ -66,10 +66,13 @@ func NewAPIScaffolder(
 // Scaffold implements Scaffolder
 func (s *apiScaffolder) Scaffold() error {
 	fmt.Println("Writing scaffold for you to edit...")
-	if err := internalconfig.CheckProjectVersionSupported(); err != nil {
-		return err
+
+	switch {
+	case s.config.IsV2(), s.config.IsV3():
+		return s.scaffold()
+	default:
+		return internalconfig.CheckProjectVersionSupported()
 	}
-	return s.scaffold()
 }
 
 func (s *apiScaffolder) newUniverse() *model.Universe {

diff --git a/pkg/scaffold/init.go b/pkg/scaffold/init.go
@@ -73,10 +73,12 @@ func (s *initScaffolder) newUniverse(boilerplate string) *model.Universe {
 // Scaffold implements Scaffolder
 func (s *initScaffolder) Scaffold() error {
 	fmt.Println("Writing scaffold for you to edit...")
-	if err := internalconfig.CheckProjectVersionSupported(); err != nil {
-		return err
+	switch {
+	case s.config.IsV2(), s.config.IsV3():
+		return s.scaffold()
+	default:
+		return internalconfig.CheckProjectVersionSupported()
 	}
-	return s.scaffold()
 }
 
 func (s *initScaffolder) scaffold() error {

diff --git a/pkg/scaffold/webhook.go b/pkg/scaffold/webhook.go
@@ -61,10 +61,12 @@ func NewWebhookScaffolder(
 // Scaffold implements Scaffolder
 func (s *webhookScaffolder) Scaffold() error {
 	fmt.Println("Writing scaffold for you to edit...")
-	if err := internalconfig.CheckProjectVersionSupported(); err != nil {
-		return err
+	switch {
+	case s.config.IsV2(), s.config.IsV3():
+		return s.scaffold()
+	default:
+		return internalconfig.CheckProjectVersionSupported()
 	}
-	return s.scaffold()
 }
 
 func (s *webhookScaffolder) newUniverse() *model.Universe {