Merge pull request #11 from zendesk/add-missing-extra-args-support

Add missing ssh/scp extra args support
zendesk · Mar 14, 2019 · 46e2786 · 46e2786
2 parents b4b56db + edd7436
commit 46e2786
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/cmd/scp.go b/cmd/scp.go
@@ -68,6 +68,8 @@ func scpCmdFunc(cmd *cobra.Command, args []string) {
 		cmd.Annotations["local_path"],
 	}
 	baseCommand := []string{config.GlobalConfig.ScpBinary}
+	baseCommand = append(baseCommand, config.GlobalConfig.ScpExtraParams...)
+
 	if checkIfRemotePath(cmd.Annotations["copy_from"]) {
 		baseCommand = append(baseCommand, command.CopyFromRemoteCmd()...)
 	} else {

diff --git a/cmd/ssh.go b/cmd/ssh.go
@@ -49,14 +49,17 @@ func sshCmdFunc(cmd *cobra.Command, args []string) {
 		os.Exit(1)
 	}
 
-	sshCommandWithArgs := []string{
-		config.GlobalConfig.SSHBinary,
+	baseCommand := []string{config.GlobalConfig.SSHBinary}
+	baseCommand = append(baseCommand, config.GlobalConfig.SSHExtraParams...)
+
+	sshCommandWithArgs := append(baseCommand, []string{
 		fmt.Sprintf(
 			"%s@%s",
 			config.GlobalConfig.LoginUsername,
 			resource.ConnectIdentifier(config.GlobalConfig.UsePrivateNetwork, config.GlobalConfig.UseDNS),
 		),
-	}
+	}...)
+
 	color.PrintGreen(fmt.Sprintf("Logging into %s (%s)\n",
 		resource.Name(), resource.GetTag("environment")))
 

diff --git a/cmd/tunnel.go b/cmd/tunnel.go
@@ -56,8 +56,10 @@ func tunnelCmdFunc(cmd *cobra.Command, args []string) {
 		os.Exit(1)
 	}
 
-	tunnelCommand := []string{
-		config.GlobalConfig.SSHBinary,
+	baseCommand := []string{config.GlobalConfig.SSHBinary}
+	baseCommand = append(baseCommand, config.GlobalConfig.SSHExtraParams...)
+
+	tunnelCommand := append(baseCommand, []string{
 		fmt.Sprintf(
 			"%s@%s",
 			config.GlobalConfig.LoginUsername,
@@ -70,7 +72,8 @@ func tunnelCmdFunc(cmd *cobra.Command, args []string) {
 			cmd.Annotations["local_bind_address"],
 			cmd.Annotations["remote_bind_address"],
 		),
-	}
+	}...)
+
 	color.PrintGreen(fmt.Sprintf("Creating ssh tunnel to %s (%s)\n",
 		resource.Name(), resource.GetTag("environment")))