update cluster and service logic

lastbackend · Oct 22, 2018 · 540348f · 540348f
1 parent 6b2bf68
commit 540348f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/pkg/cli/cmd/cluster_add.go b/pkg/cli/cmd/cluster_add.go
@@ -40,7 +40,7 @@ var ClusterAddCmd = &cobra.Command{
 	Short:   "Add cluster",
 	Example: clusterAddExample,
 	Args:    cobra.ExactArgs(2),
-	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+	PreRunE: func(cmd *cobra.Command, args []string) error {
 		local, _ := cmd.Flags().GetBool("local")
 		if !local {
 			return errors.New("method allowed with local flag")

diff --git a/pkg/cli/cmd/cluster_del.go b/pkg/cli/cmd/cluster_del.go
@@ -39,7 +39,7 @@ var ClusterDelCmd = &cobra.Command{
 	Short:   "Remove cluster",
 	Example: clusterDelExample,
 	Args:    cobra.ExactArgs(1),
-	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+	PreRunE: func(cmd *cobra.Command, args []string) error {
 		local, _ := cmd.Flags().GetBool("local")
 		if !local {
 			return errors.New("method allowed with local flag")

diff --git a/pkg/cli/cmd/cluster_select.go b/pkg/cli/cmd/cluster_select.go
@@ -39,13 +39,14 @@ var ClusterSelectCmd = &cobra.Command{
 	Use:     "select [NAME]",
 	Short:   "Select cluster",
 	Example: clusterSelectExample,
-	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+	PreRunE: func(cmd *cobra.Command, args []string) error {
 		if len(args) < 1 {
 			return cmd.Help()
 		}
 		return nil
 	},
 	Run: func(cmd *cobra.Command, args []string) {
+
 		name := args[0]
 
 		// Select local cluster

diff --git a/pkg/cli/cmd/commands.go b/pkg/cli/cmd/commands.go
@@ -66,6 +66,7 @@ var RootCmd = &cobra.Command{
 		var err error
 
 		cfg.Cluster = cmd.Flag("cluster").Value.String()
+
 		cfg.Debug, err = cmd.Flags().GetBool("debug")
 		if err != nil {
 			panic("Invalid debug flag")
@@ -83,6 +84,7 @@ var RootCmd = &cobra.Command{
 		if err != nil {
 			panic("Invalid tls flag")
 		}
+
 		if tls {
 			config.TLS.Insecure = false
 			config.TLS.CAFile = cmd.Flag("tlscacert").Value.String()

diff --git a/pkg/cli/storage/storage.go b/pkg/cli/storage/storage.go
@@ -159,5 +159,5 @@ func GetCluster() (*Cluster, error) {
 		return nil, err
 	}
 
-	return nil, nil
+	return res, nil
 }