summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2021-03-30 13:06:58 -0500
committerbaude <bbaude@redhat.com>2021-03-31 12:51:33 -0500
commitf6438d36f3e52eb721f4223e767fd67b4c274d08 (patch)
tree50ecb0b5c4d1bbbb9742657742cec4f0b835ef01 /cmd
parent2e72b13823f1be199e483f34899723819d1dc474 (diff)
downloadpodman-f6438d36f3e52eb721f4223e767fd67b4c274d08.tar.gz
podman-f6438d36f3e52eb721f4223e767fd67b4c274d08.tar.bz2
podman-f6438d36f3e52eb721f4223e767fd67b4c274d08.zip
Remove --execute from podman machine ssh
The --execute flag ended up serving no purpose. It was removed and documentation was updated. Fixed a panic when no VM name was provided. [NO TESTS NEEDED] Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/machine/ssh.go53
1 files changed, 32 insertions, 21 deletions
diff --git a/cmd/podman/machine/ssh.go b/cmd/podman/machine/ssh.go
index aec68d2a4..fc7c71992 100644
--- a/cmd/podman/machine/ssh.go
+++ b/cmd/podman/machine/ssh.go
@@ -13,14 +13,12 @@ import (
var (
sshCmd = &cobra.Command{
- Use: "ssh [options] [MACHINE] [COMMAND [ARG ...]]",
+ Use: "ssh [NAME] [COMMAND [ARG ...]]",
Short: "SSH into a virtual machine",
Long: "SSH into a virtual machine ",
RunE: ssh,
- Args: cobra.MaximumNArgs(1),
Example: `podman machine ssh myvm
podman machine ssh -e myvm echo hello`,
-
ValidArgsFunction: autocompleteMachineSSH,
}
)
@@ -30,36 +28,49 @@ var (
)
func init() {
+ sshCmd.Flags().SetInterspersed(false)
registry.Commands = append(registry.Commands, registry.CliCommand{
Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
Command: sshCmd,
Parent: machineCmd,
})
-
- flags := sshCmd.Flags()
- executeFlagName := "execute"
- flags.BoolVarP(&sshOpts.Execute, executeFlagName, "e", false, "Execute command from args")
}
func ssh(cmd *cobra.Command, args []string) error {
var (
- err error
- vm machine.VM
- vmType string
+ err error
+ validVM bool
+ vm machine.VM
+ vmType string
)
- vmName := defaultMachineName
- if len(args) > 0 && len(args[0]) > 1 {
- vmName = args[0]
- }
- sshOpts.Args = args[1:]
- // Error if no execute but args given
- if !sshOpts.Execute && len(sshOpts.Args) > 0 {
- return errors.New("too many args: to execute commands via ssh, use -e flag")
+ // Set the VM to default
+ vmName := defaultMachineName
+ // 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].
+ if len(args) > 0 {
+ switch vmType {
+ default:
+ validVM, err = qemu.IsValidVMName(args[0])
+ if err != nil {
+ return err
+ }
+ if validVM {
+ vmName = args[0]
+ } else {
+ sshOpts.Args = append(sshOpts.Args, args[0])
+ }
+ }
}
- // Error if execute but no args given
- if sshOpts.Execute && len(sshOpts.Args) < 1 {
- return errors.New("must proivde at least one command to execute")
+ // If len is greater than 1, it means we might have been
+ // given a vmname and args or just args
+ if len(args) > 1 {
+ if validVM {
+ sshOpts.Args = args[1:]
+ } else {
+ sshOpts.Args = args
+ }
}
switch vmType {