feat(config): change config field name

change config field name

Signed-off-by: mritd <[email protected]>

Author: mritd

pkg/mmh/config.go

@@ -59,12 +59,12 @@ func WriteExampleConfig() {
 			Proxy:    "prod12",
 		},
 		{
-			Name:      "prod12",
-			User:      "root",
-			Tags:      []string{"prod"},
-			Address:   "10.10.4.12",
-			Port:      22,
-			PublicKey: "/Users/mritd/.ssh/id_rsa",
+			Name:       "prod12",
+			User:       "root",
+			Tags:       []string{"prod"},
+			Address:    "10.10.4.12",
+			Port:       22,
+			PrivateKey: "/Users/mritd/.ssh/id_rsa",
 		},
 	})
 	viper.Set(keyTags, []string{
@@ -173,7 +173,7 @@ func AddServer() {
 	}
 
 	// Auth method
-	var password, publicKey string
+	var password, privateKey string
 	cfg := &promptx.SelectConfig{
 		ActiveTpl:    "»  {{ . | cyan }}",
 		InactiveTpl:  "  {{ . | white }}",
@@ -187,7 +187,7 @@ func AddServer() {
 
 	s := &promptx.Select{
 		Items: []string{
-			"PublicKey",
+			"PrivateKey",
 			"Password",
 		},
 		Config: cfg,
@@ -199,13 +199,13 @@ func AddServer() {
 			// Allow empty
 			return nil
 
-		}, "PublicKey:")
+		}, "PrivateKey:")
 
-		publicKey = p.Run()
-		if strings.TrimSpace(publicKey) == "" {
+		privateKey = p.Run()
+		if strings.TrimSpace(privateKey) == "" {
 			home, err := homedir.Dir()
 			utils.CheckAndExit(err)
-			publicKey = home + string(filepath.Separator) + ".ssh" + string(filepath.Separator) + "id_rsa"
+			privateKey = home + string(filepath.Separator) + ".ssh" + string(filepath.Separator) + "id_rsa"
 		}
 	} else {
 		p = promptx.NewDefaultPrompt(func(line []rune) error {
@@ -231,14 +231,14 @@ func AddServer() {
 	proxy := p.Run()
 
 	server := Server{
-		Name:      name,
-		Tags:      tags,
-		User:      user,
-		Address:   address,
-		Port:      port,
-		PublicKey: publicKey,
-		Password:  password,
-		Proxy:     proxy,
+		Name:       name,
+		Tags:       tags,
+		User:       user,
+		Address:    address,
+		Port:       port,
+		PrivateKey: privateKey,
+		Password:   password,
+		Proxy:      proxy,
 	}
 
 	// Save

pkg/mmh/ssh.go

@@ -31,14 +31,14 @@ import (
 )
 
 type Server struct {
-	Name      string   `yml:"Name"`
-	Tags      []string `yml:"Tags"`
-	User      string   `yml:"User"`
-	Password  string   `yml:"Password"`
-	PublicKey string   `yml:"PublicKey"`
-	Address   string   `yml:"Address"`
-	Port      int      `yml:"Port"`
-	Proxy     string   `yml:"proxy"`
+	Name       string   `yml:"Name"`
+	Tags       []string `yml:"Tags"`
+	User       string   `yml:"User"`
+	Password   string   `yml:"Password"`
+	PrivateKey string   `yml:"PrivateKey"`
+	Address    string   `yml:"Address"`
+	Port       int      `yml:"Port"`
+	Proxy      string   `yml:"proxy"`
 }
 
 type Servers []*Server
@@ -53,7 +53,7 @@ func (servers Servers) Swap(i, j int) {
 	servers[i], servers[j] = servers[j], servers[i]
 }
 
-func publicKeyFile(file string) (ssh.AuthMethod, error) {
+func privateKeyFile(file string) (ssh.AuthMethod, error) {
 	buffer, err := ioutil.ReadFile(file)
 	if err != nil {
 		return nil, err
@@ -71,8 +71,8 @@ func password(password string) ssh.AuthMethod {
 
 func (s *Server) authMethod() (ssh.AuthMethod, error) {
 	// Priority use of public key
-	if strings.TrimSpace(s.PublicKey) != "" {
-		return publicKeyFile(s.PublicKey)
+	if strings.TrimSpace(s.PrivateKey) != "" {
+		return privateKeyFile(s.PrivateKey)
 	} else {
 		return password(s.Password), nil
 	}