Merge 10588f9 into d3b58ca

cmd/odo/odo.go

@@ -10,12 +10,18 @@ import (
 	"github.com/redhat-developer/odo/pkg/odo/cli/version"
 	"github.com/redhat-developer/odo/pkg/odo/util"
 	"github.com/redhat-developer/odo/pkg/odo/util/completion"
+	"github.com/redhat-developer/odo/pkg/plugin"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"os"
+	"path/filepath"
+	"strings"
 )
 
 func main() {
+	loadPlugins()
+	defer plugin.CleanPlugins()
+
 	// create the complete command
 	root := cli.NewCmdOdo(cli.OdoRecommendedName, cli.OdoRecommendedName)
 	rootCmp := createCompletion(root)
@@ -112,3 +118,20 @@ func createCompletion(root *cobra.Command) complete.Command {
 
 	return rootCmp
 }
+
+func loadPlugins() {
+	configDir, err := config.GetPluginsDir()
+	if err != nil {
+		panic(err)
+	}
+
+	err = filepath.Walk(configDir, func(path string, info os.FileInfo, err error) error {
+		if strings.HasSuffix(path, ".listener.odo") {
+			plugin.InitPluginAt(path)
+		}
+		return nil
+	})
+	if err != nil {
+		panic(err)
+	}
+}

glide.yaml

@@ -49,6 +49,12 @@ import:
   version: v1.1.2
 - package: github.com/gobwas/glob
   version: e7a84e9525fe90abcda167b604e483cc959ad4aa
+- package: github.com/metacosm/odo-event-api
+  version: go-plugin
+- package: google.golang.org/grpc
+  version: ^1.12.0
+- package: golang.org/x/sys
+  version: master
 - package: github.com/openshift/origin
   version: v3.11.0
   subpackages:

pkg/config/config.go

@@ -59,6 +59,35 @@ type ConfigInfo struct {
 	Config
 }
 
+func GetConfigDir() (string, error) {
+	currentUser, err := user.Current()
+	if err != nil {
+		return "", err
+	}
+
+	configDir := filepath.Join(currentUser.HomeDir, ".odo")
+
+	// Check whether directory present or not
+	_, err = os.Stat(filepath.Dir(configDir))
+	if os.IsNotExist(err) {
+		err = os.MkdirAll(filepath.Dir(configDir), 0755)
+		if err != nil {
+			return "", err
+		}
+	}
+
+	return configDir, nil
+}
+
+func GetPluginsDir() (string, error) {
+	configDir, err := GetConfigDir()
+	if err != nil {
+		return "", err
+	}
+
+	return filepath.Join(configDir, "plugins"), nil
+}
+
 func getDefaultConfigFile() string {
 	currentUser, err := user.Current()
 	if err != nil {

pkg/odo/cli/catalog/describe/service.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/olekukonko/tablewriter"
 	"github.com/redhat-developer/odo/pkg/odo/genericclioptions"
-	odoutil "github.com/redhat-developer/odo/pkg/odo/util"
 	svc "github.com/redhat-developer/odo/pkg/service"
 	"github.com/spf13/cobra"
 	ktemplates "k8s.io/kubernetes/pkg/kubectl/cmd/templates"
@@ -136,9 +135,7 @@ func NewCmdCatalogDescribeService(name, fullName string) *cobra.Command {
 		Example: fmt.Sprintf(serviceExample, fullName),
 		Args:    cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
-			odoutil.LogErrorAndExit(o.Complete(name, cmd, args), "")
-			odoutil.LogErrorAndExit(o.Validate(), "")
-			odoutil.LogErrorAndExit(o.Run(), "")
+			genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 

pkg/odo/cli/catalog/list/components.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/redhat-developer/odo/pkg/catalog"
 	"github.com/redhat-developer/odo/pkg/odo/genericclioptions"
-	odoutil "github.com/redhat-developer/odo/pkg/odo/util"
 	"github.com/spf13/cobra"
 	"os"
 	"strings"
@@ -84,9 +83,7 @@ func NewCmdCatalogListComponents(name, fullName string) *cobra.Command {
 		Long:    "List all available component types from OpenShift's Image Builder.",
 		Example: fmt.Sprintf(componentsExample, fullName),
 		Run: func(cmd *cobra.Command, args []string) {
-			odoutil.LogErrorAndExit(o.Complete(name, cmd, args), "")
-			odoutil.LogErrorAndExit(o.Validate(), "")
-			odoutil.LogErrorAndExit(o.Run(), "")
+			genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 

pkg/odo/cli/catalog/list/services.go

@@ -5,7 +5,6 @@ import (
 	"github.com/redhat-developer/odo/pkg/occlient"
 	"github.com/redhat-developer/odo/pkg/odo/cli/catalog/util"
 	"github.com/redhat-developer/odo/pkg/odo/genericclioptions"
-	odoutil "github.com/redhat-developer/odo/pkg/odo/util"
 	svc "github.com/redhat-developer/odo/pkg/service"
 	"github.com/spf13/cobra"
 )
@@ -64,9 +63,7 @@ func NewCmdCatalogListServices(name, fullName string) *cobra.Command {
 		Example: fmt.Sprintf(servicesExample, fullName),
 		Args:    cobra.ExactArgs(0),
 		Run: func(cmd *cobra.Command, args []string) {
-			odoutil.LogErrorAndExit(o.Complete(name, cmd, args), "")
-			odoutil.LogErrorAndExit(o.Validate(), "")
-			odoutil.LogErrorAndExit(o.Run(), "")
+			genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 }

pkg/odo/cli/catalog/search/component.go

@@ -5,7 +5,6 @@ import (
 	"github.com/redhat-developer/odo/pkg/catalog"
 	"github.com/redhat-developer/odo/pkg/log"
 	"github.com/redhat-developer/odo/pkg/odo/genericclioptions"
-	odoutil "github.com/redhat-developer/odo/pkg/odo/util"
 	"github.com/spf13/cobra"
 )
 
@@ -68,9 +67,7 @@ components.
 		Args:    cobra.ExactArgs(1),
 		Example: fmt.Sprintf(componentExample, fullName),
 		Run: func(cmd *cobra.Command, args []string) {
-			odoutil.LogErrorAndExit(o.Complete(name, cmd, args), "")
-			odoutil.LogErrorAndExit(o.Validate(), "")
-			odoutil.LogErrorAndExit(o.Run(), "")
+			genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 }

pkg/odo/cli/catalog/search/service.go

@@ -5,7 +5,6 @@ import (
 	"github.com/redhat-developer/odo/pkg/occlient"
 	"github.com/redhat-developer/odo/pkg/odo/cli/catalog/util"
 	"github.com/redhat-developer/odo/pkg/odo/genericclioptions"
-	odoutil "github.com/redhat-developer/odo/pkg/odo/util"
 	svc "github.com/redhat-developer/odo/pkg/service"
 	"github.com/spf13/cobra"
 )
@@ -71,9 +70,7 @@ services from service catalog.
 		Example: fmt.Sprintf(serviceExample, fullName),
 		Args:    cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
-			odoutil.LogErrorAndExit(o.Complete(name, cmd, args), "")
-			odoutil.LogErrorAndExit(o.Validate(), "")
-			odoutil.LogErrorAndExit(o.Run(), "")
+			genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 

pkg/odo/cli/cli.go

@@ -3,7 +3,6 @@ package cli
 import (
 	"flag"
 	"fmt"
-
 	"github.com/redhat-developer/odo/pkg/odo/cli/application"
 	"github.com/redhat-developer/odo/pkg/odo/cli/catalog"
 	"github.com/redhat-developer/odo/pkg/odo/cli/component"
@@ -78,6 +77,7 @@ func NewCmdOdo(name, fullName string) *cobra.Command {
 		Long:    odoLong,
 		Example: fmt.Sprintf(odoExample, fullName),
 	}
+
 	// Here you will define your flags and configuration settings.
 	// Cobra supports persistent flags, which, if defined here,
 	// will be global for your application.

pkg/odo/cli/component/link.go

@@ -6,6 +6,7 @@ import (
 
 	appCmd "github.com/redhat-developer/odo/pkg/odo/cli/application"
 	projectCmd "github.com/redhat-developer/odo/pkg/odo/cli/project"
+	"github.com/redhat-developer/odo/pkg/odo/genericclioptions"
 	"github.com/redhat-developer/odo/pkg/odo/util/completion"
 
 	"github.com/redhat-developer/odo/pkg/odo/util"
@@ -122,9 +123,7 @@ func NewCmdLink(name, fullName string) *cobra.Command {
 		Example: fmt.Sprintf(linkExample, fullName),
 		Args:    cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
-			util.LogErrorAndExit(o.Complete(name, cmd, args), "")
-			util.LogErrorAndExit(o.Validate(), "")
-			util.LogErrorAndExit(o.Run(), "")
+			genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 

pkg/odo/cli/component/unlink.go

@@ -5,6 +5,7 @@ import (
 
 	appCmd "github.com/redhat-developer/odo/pkg/odo/cli/application"
 	projectCmd "github.com/redhat-developer/odo/pkg/odo/cli/project"
+	"github.com/redhat-developer/odo/pkg/odo/genericclioptions"
 	"github.com/redhat-developer/odo/pkg/odo/util/completion"
 
 	"github.com/redhat-developer/odo/pkg/odo/util"
@@ -76,9 +77,7 @@ func NewCmdUnlink(name, fullName string) *cobra.Command {
 		Example: fmt.Sprintf(unlinkExample, fullName),
 		Args:    cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
-			util.LogErrorAndExit(o.Complete(name, cmd, args), "")
-			util.LogErrorAndExit(o.Validate(), "")
-			util.LogErrorAndExit(o.Run(), "")
+			genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 

pkg/odo/cli/service/create.go

@@ -185,9 +185,7 @@ func NewCmdServiceCreate(name, fullName string) *cobra.Command {
 		Example: fmt.Sprintf(createExample, fullName),
 		Args:    cobra.RangeArgs(0, 2),
 		Run: func(cmd *cobra.Command, args []string) {
-			util.LogErrorAndExit(o.Complete(name, cmd, args), "")
-			util.LogErrorAndExit(o.Validate(), "")
-			util.LogErrorAndExit(o.Run(), "")
+			genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	serviceCreateCmd.Flags().StringVar(&o.plan, "plan", "", "The name of the plan of the service to be created")

pkg/odo/cli/service/delete.go

@@ -7,7 +7,6 @@ import (
 	"github.com/golang/glog"
 	"github.com/redhat-developer/odo/pkg/log"
 	"github.com/redhat-developer/odo/pkg/odo/genericclioptions"
-	"github.com/redhat-developer/odo/pkg/odo/util"
 	"github.com/redhat-developer/odo/pkg/odo/util/completion"
 	svc "github.com/redhat-developer/odo/pkg/service"
 	"github.com/spf13/cobra"
@@ -89,9 +88,7 @@ func NewCmdServiceDelete(name, fullName string) *cobra.Command {
 		Args:    cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
 			glog.V(4).Infof("service delete called\n args: %#v", strings.Join(args, " "))
-			util.LogErrorAndExit(o.Complete(name, cmd, args), "")
-			util.LogErrorAndExit(o.Validate(), "")
-			util.LogErrorAndExit(o.Run(), "")
+			genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	serviceDeleteCmd.Flags().BoolVarP(&o.serviceForceDeleteFlag, "force", "f", false, "Delete service without prompting")