Merge pull request #188 from misha-ssh/add-address-form

Add address form

Author: deniskorbakov

internal/command/create.go

@@ -33,6 +33,7 @@ var createCmd = &cobra.Command{
 		connection := &connect.Connect{
 			Alias:     fields.Alias,
 			Login:     fields.Login,
+			Address:   fields.Address,
 			Password:  fields.Password,
 			CreatedAt: time.Now().Format("2006.01.02 15:04:05"),
 			UpdatedAt: time.Now().Format("2006.01.02 15:04:05"),

internal/command/update.go

@@ -45,6 +45,7 @@ var updateCmd = &cobra.Command{
 		updatedConnection := &connect.Connect{
 			Alias:     fields.Alias,
 			Login:     fields.Login,
+			Address:   fields.Address,
 			Password:  fields.Password,
 			UpdatedAt: time.Now().Format("2006.01.02 15:04:05"),
 			CreatedAt: selectedConn.CreatedAt,

internal/component/create/create.go

@@ -44,6 +44,12 @@ func Run() (*Fields, error) {
 				Validate(huh.ValidateNotEmpty()).
 				Value(&fields.Login),
 
+			huh.NewInput().
+				Title("Address").
+				Description("Address of the remote machine").
+				Validate(huh.ValidateNotEmpty()).
+				Value(&fields.Address),
+
 			huh.NewInput().
 				Title("Port").
 				Description("Port number to connect to a remote machine").
@@ -72,7 +78,8 @@ func Run() (*Fields, error) {
 				Description("select file with private key").
 				CurrentDirectory(homedir).
 				Validate(privateKeyValidate).
-				Value(&fields.PrivateKey),
+				Value(&fields.PrivateKey).
+				Picking(true),
 		).WithHideFunc(func() bool {
 			return authPassConfirm
 		}),

internal/component/create/fields.go

@@ -4,6 +4,7 @@ package create
 type Fields struct {
 	Alias      string
 	Login      string
+	Address    string
 	Password   string
 	Port       int
 	PrivateKey string

internal/component/update/fields.go

@@ -4,6 +4,7 @@ package update
 type Fields struct {
 	Alias      string
 	Login      string
+	Address    string
 	Password   string
 	Port       int
 	PrivateKey string

internal/component/update/update.go

@@ -18,13 +18,19 @@ var (
 // Run get form for update connect.Connect
 func Run(connection *connect.Connect) (*Fields, error) {
 	var authPassConfirm bool
+	var updatedPrivateKey bool
 
 	updatedConn := *connection
 
-	if len(updatedConn.Password) > 0 {
+	hasOriginalPrivateKey := len(connection.SshOptions.PrivateKey) > 0
+	hasOriginalPassword := len(connection.Password) > 0
+
+	if hasOriginalPassword {
 		authPassConfirm = true
-	} else if len(updatedConn.SshOptions.PrivateKey) > 0 {
+	} else if hasOriginalPrivateKey {
 		authPassConfirm = false
+	} else {
+		authPassConfirm = true
 	}
 
 	homedir, err := os.UserHomeDir()
@@ -55,6 +61,12 @@ func Run(connection *connect.Connect) (*Fields, error) {
 				Validate(huh.ValidateNotEmpty()).
 				Value(&updatedConn.Login),
 
+			huh.NewInput().
+				Title("Address").
+				Description("Address of the remote machine").
+				Validate(huh.ValidateNotEmpty()).
+				Value(&updatedConn.Address),
+
 			huh.NewInput().
 				Title("Port").
 				Description("Port number to connect to a remote machine").
@@ -77,15 +89,34 @@ func Run(connection *connect.Connect) (*Fields, error) {
 		).WithHideFunc(func() bool {
 			return !authPassConfirm
 		}),
+		huh.NewGroup(
+			huh.NewConfirm().
+				Title("Update private key?").
+				Description("Do you want to update the private key?").
+				Affirmative("Yes").
+				Negative("No").
+				Value(&updatedPrivateKey),
+		).WithHideFunc(func() bool {
+			return authPassConfirm || !hasOriginalPrivateKey
+		}),
 		huh.NewGroup(
 			huh.NewFilePicker().
 				Title("PrivateKey").
-				Description("select file with private key").
+				Description("Select file with private key").
 				CurrentDirectory(homedir).
 				Validate(privateKeyValidate).
-				Value(&updatedConn.SshOptions.PrivateKey),
+				Value(&updatedConn.SshOptions.PrivateKey).
+				Picking(true),
 		).WithHideFunc(func() bool {
-			return authPassConfirm
+			if authPassConfirm {
+				return true
+			}
+
+			if hasOriginalPrivateKey {
+				return !updatedPrivateKey
+			}
+
+			return false
 		}),
 	).WithShowHelp(true).Run()
 	if err != nil {
@@ -99,15 +130,20 @@ func Run(connection *connect.Connect) (*Fields, error) {
 
 	fields.Alias = updatedConn.Alias
 	fields.Login = updatedConn.Login
+	fields.Address = updatedConn.Address
 	fields.Port = intPort
 	fields.Password = updatedConn.Password
 	fields.PrivateKey = updatedConn.SshOptions.PrivateKey
 
-	if len(connection.Password) > 0 && !authPassConfirm {
+	if hasOriginalPrivateKey && !updatedPrivateKey && !authPassConfirm {
+		fields.PrivateKey = connection.SshOptions.PrivateKey
+	}
+
+	if hasOriginalPassword && !authPassConfirm {
 		fields.Password = ""
 	}
 
-	if len(updatedConn.SshOptions.PrivateKey) > 0 && authPassConfirm {
+	if hasOriginalPrivateKey && authPassConfirm {
 		fields.PrivateKey = ""
 	}