Merge pull request #11617 from ashley-cui/ssh

[NO TESTS NEEDED] Add username flag for machine ssh

1 files changed, 13 insertions, 16 deletions

diff --git a/cmd/podman/machine/ssh.go b/cmd/podman/machine/ssh.go
index 84e9e88ab..da0a09338 100644
--- a/cmd/podman/machine/ssh.go
+++ b/cmd/podman/machine/ssh.go
@@ -5,6 +5,7 @@ package machine
 import (
 	"net/url"
 
+	"github.com/containers/common/pkg/completion"
 	"github.com/containers/common/pkg/config"
 	"github.com/containers/podman/v3/cmd/podman/registry"
 	"github.com/containers/podman/v3/pkg/machine"
@@ -15,7 +16,7 @@ import (
 
 var (
 	sshCmd = &cobra.Command{
-		Use:   "ssh [NAME] [COMMAND [ARG ...]]",
+		Use:   "ssh [options] [NAME] [COMMAND [ARG ...]]",
 		Short: "SSH into an existing machine",
 		Long:  "SSH into a managed virtual machine ",
 		RunE:  ssh,
@@ -35,6 +36,10 @@ func init() {
 		Command: sshCmd,
 		Parent:  machineCmd,
 	})
+	flags := sshCmd.Flags()
+	usernameFlagName := "username"
+	flags.StringVar(&sshOpts.Username, usernameFlagName, "", "Username to use when ssh-ing into the VM.")
+	_ = sshCmd.RegisterFlagCompletionFunc(usernameFlagName, completion.AutocompleteNone)
 }
 
 func ssh(cmd *cobra.Command, args []string) error {
@@ -48,13 +53,6 @@ func ssh(cmd *cobra.Command, args []string) error {
 	// Set the VM to default
 	vmName := defaultMachineName
 
-	// If we're not given a VM name, use the remote username from the connection config
-	if len(args) == 0 {
-		sshOpts.Username, err = remoteConnectionUsername()
-		if err != nil {
-			return err
-		}
-	}
 	// If len is greater than 0, it means we may have been
 	// provided the VM name.  If so, we check.  The VM name,
 	// if provided, must be in args[0].
@@ -68,10 +66,6 @@ func ssh(cmd *cobra.Command, args []string) error {
 			if validVM {
 				vmName = args[0]
 			} else {
-				sshOpts.Username, err = remoteConnectionUsername()
-				if err != nil {
-					return err
-				}
 				sshOpts.Args = append(sshOpts.Args, args[0])
 			}
 		}
@@ -83,14 +77,17 @@ func ssh(cmd *cobra.Command, args []string) error {
 		if validVM {
 			sshOpts.Args = args[1:]
 		} else {
-			sshOpts.Username, err = remoteConnectionUsername()
-			if err != nil {
-				return err
-			}
 			sshOpts.Args = args
 		}
 	}
 
+	if !validVM && sshOpts.Username == "" {
+		sshOpts.Username, err = remoteConnectionUsername()
+		if err != nil {
+			return err
+		}
+	}
+
 	switch vmType {
 	default:
 		vm, err = qemu.LoadVMByName(vmName)