working commit

cmd/mbaseadmin/account/util.go

@@ -7,15 +7,21 @@ import (
 	"mbase/app/operator"
 
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+const (
+	defaultHostname = "localhost:1025"
 )
 
 type Util struct {
-        oper    *operator.Logic
-	rootCmd             *cobra.Command
+	oper                *operator.Logic
+	subCmd              *cobra.Command
 	createAccountParams createAccountParams
 	listAccountsParams  listAccountsParams
 	updateAccountParams updateAccountParams
 	deleteAccountParams deleteAccountParams
+	commonParams        CommonParams
 }
 
 func NewUtil(oper *operator.Logic) *Util {
@@ -24,17 +30,33 @@ func NewUtil(oper *operator.Logic) *Util {
 	}
 }
 
+type CommonParams struct {
+	Username string
+	Password string
+}
+
 func (util *Util) GetRooCmd() *cobra.Command {
-	return util.rootCmd
+	return util.subCmd
 }
 
 func (util *Util) BuildCmds() *cobra.Command {
-	rootCmd := &cobra.Command{
+	subCmd := &cobra.Command{
 		Use:          "account",
 		Short:        "\nAccount operations",
 		SilenceUsage: true,
 	}
-	rootCmd.CompletionOptions.DisableDefaultCmd = true
+	subCmd.CompletionOptions.DisableDefaultCmd = true
+
+	subCmd.PersistentFlags().StringVarP(&util.commonParams.Username, "user", "U", util.commonParams.Username, "Username")
+	subCmd.PersistentFlags().StringVarP(&util.commonParams.Password, "pass", "P", util.commonParams.Password, "Password")
+	subCmd.MarkFlagsRequiredTogether("user", "pass")
+
+	vi := viper.New()
+	vi.SetEnvPrefix("mstore")
+	vi.BindEnv("user")
+	vi.BindEnv("pass")
+	util.commonParams.Username = vi.GetString("user")
+	util.commonParams.Password = vi.GetString("pass")
 
 	var createAccountCmd = &cobra.Command{
 		Use:   "create name password ",
@@ -42,14 +64,14 @@ func (util *Util) BuildCmds() *cobra.Command {
 		Args:  cobra.ExactArgs(2),
 		Run:   util.CreateAccount,
 	}
-	rootCmd.AddCommand(createAccountCmd)
+	subCmd.AddCommand(createAccountCmd)
 
 	var listAccountsCmd = &cobra.Command{
 		Use:   "list",
 		Short: "List accounts",
 		Run:   util.ListAccounts,
 	}
-	rootCmd.AddCommand(listAccountsCmd)
+	subCmd.AddCommand(listAccountsCmd)
 
 	var updateAccountsCmd = &cobra.Command{
 		Use:   "update name|id",
@@ -57,7 +79,7 @@ func (util *Util) BuildCmds() *cobra.Command {
 		Args:  cobra.ExactArgs(1),
 		Run:   util.UpdateAccount,
 	}
-	rootCmd.AddCommand(updateAccountsCmd)
+	subCmd.AddCommand(updateAccountsCmd)
 
 	var deleteAccountCmd = &cobra.Command{
 		Use:   "delete name|id",
@@ -65,8 +87,8 @@ func (util *Util) BuildCmds() *cobra.Command {
 		Args:  cobra.ExactArgs(1),
 		Run:   util.DeleteAccount,
 	}
-	rootCmd.AddCommand(deleteAccountCmd)
+	subCmd.AddCommand(deleteAccountCmd)
 
-	util.rootCmd = rootCmd
-	return util.rootCmd
+	util.subCmd = subCmd
+	return util.subCmd
 }