Skip to content

Commit

Permalink
Merge pull request #1290 from estroz/feature/plugins
Browse files Browse the repository at this point in the history
feature: implement plugin proposal in #1250
  • Loading branch information
k8s-ci-robot committed Feb 20, 2020
2 parents 6df16f3 + 358a9f6 commit e322071
Show file tree
Hide file tree
Showing 32 changed files with 1,939 additions and 948 deletions.
238 changes: 0 additions & 238 deletions cmd/api.go

This file was deleted.

22 changes: 8 additions & 14 deletions cmd/edit.go
Expand Up @@ -17,13 +17,12 @@ limitations under the License.
package main

import (
"errors"
"fmt"
"log"
"os"

"github.com/spf13/cobra"

"sigs.k8s.io/kubebuilder/internal/cmdutil"
"sigs.k8s.io/kubebuilder/internal/config"
"sigs.k8s.io/kubebuilder/pkg/scaffold"
)
Expand All @@ -49,7 +48,7 @@ func newEditCmd() *cobra.Command {
# Disable the multigroup layout
kubebuilder edit --multigroup=false`,
Run: func(_ *cobra.Command, _ []string) {
if err := run(options); err != nil {
if err := cmdutil.Run(options); err != nil {
log.Fatal(editError{err})
}
},
Expand All @@ -60,7 +59,7 @@ func newEditCmd() *cobra.Command {
return cmd
}

var _ commandOptions = &editOptions{}
var _ cmdutil.RunOptions = &editOptions{}

type editOptions struct {
multigroup bool
Expand All @@ -70,16 +69,11 @@ func (o *editOptions) bindFlags(cmd *cobra.Command) {
cmd.Flags().BoolVar(&o.multigroup, "multigroup", false, "enable or disable multigroup layout")
}

func (o *editOptions) loadConfig() (*config.Config, error) {
projectConfig, err := config.Load()
if os.IsNotExist(err) {
return nil, errors.New("unable to find configuration file, project must be initialized")
}

return projectConfig, err
func (o *editOptions) LoadConfig() (*config.Config, error) {
return config.LoadInitialized()
}

func (o *editOptions) validate(c *config.Config) error {
func (o *editOptions) Validate(c *config.Config) error {
if !c.IsV2() {
if c.MultiGroup {
return fmt.Errorf("multiple group support can't be enabled for version %s", c.Version)
Expand All @@ -89,10 +83,10 @@ func (o *editOptions) validate(c *config.Config) error {
return nil
}

func (o *editOptions) scaffolder(c *config.Config) (scaffold.Scaffolder, error) { // nolint:unparam
func (o *editOptions) GetScaffolder(c *config.Config) (scaffold.Scaffolder, error) { // nolint:unparam
return scaffold.NewEditScaffolder(c, o.multigroup), nil
}

func (o *editOptions) postScaffold(_ *config.Config) error {
func (o *editOptions) PostScaffold(_ *config.Config) error {
return nil
}

0 comments on commit e322071

Please sign in to comment.