Implemented SSH User option. rics3n#5

main.go

@@ -35,6 +35,11 @@ func main() {
 			Value:  defaultPlaybook,
 			EnvVar: "PLUGIN_PLAYBOOK",
 		},
+		cli.StringFlag{
+			Name:   "ssh-user",
+			Usage:  "ssh user to access remote hosts",
+			EnvVar: "SSH_USER,PLUGIN_SSH_USER",
+		},
 		cli.StringFlag{
 			Name:   "ssh-key",
 			Usage:  "ssh key to access remote hosts",
@@ -74,6 +79,7 @@ func run(c *cli.Context) error {
 			Inventories:   c.StringSlice("inventories"),
 			Playbook:      c.String("playbook"),
 			SSHKey:        c.String("ssh-key"),
+			SSHUser:       c.String("ssh-user"),
 		},
 	}
 

plugin.go

@@ -30,6 +30,7 @@ type (
 		Inventories   []string
 		Playbook      string
 		SSHKey        string
+		SSHUser       string
 	}
 
 	// Plugin defines the Ansible plugin parameters.
@@ -73,13 +74,13 @@ func (p Plugin) Exec() error {
 }
 
 func command(build Build, config Config, inventory string) *exec.Cmd {
-
-	args := []string{
-		commandEnvVars(build),
-		"-i",
-		filepath.Join(build.Path, config.InventoryPath, inventory),
-		filepath.Join(build.Path, config.Playbook),
+	var args []string
+	args = append(args, commandEnvVars(build))
+	if config.SSHUser != "" {
+		args = append(args, "-u", config.SSHUser)
 	}
+	args = append(args, "-i", filepath.Join(build.Path, config.InventoryPath, inventory))
+	args = append(args, filepath.Join(build.Path, config.Playbook))
 	return exec.Command(ansibleBin, args...)
 }
 

plugin_test.go

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestCommand(t *testing.T) {
+	// without user
+	if command := strings.Join(command(Build{
+		Path: "path/to/playbookdir",
+		SHA:  "123456789ABCDEF",
+		Tag:  "TAGNAME",
+	}, Config{
+		InventoryPath: "inventory-path",
+		Inventories:   []string{"inventory1", "inventory2"},
+		Playbook:      "playbook.yml",
+		SSHKey:        "",
+	}, "inventory").Args, " "); command != "/usr/bin/ansible-playbook -e ansible_ssh_private_key_file=/root/.ssh/id_rsa -e commit_sha=123456789ABCDEF -e commit_tag=TAGNAME -i path/to/playbookdir/inventory-path/inventory path/to/playbookdir/playbook.yml" {
+		t.Error("unexpected command: ", command)
+	}
+
+	// with user
+	if command := strings.Join(command(Build{
+		Path: "path/to/playbookdir",
+		SHA:  "123456789ABCDEF",
+		Tag:  "TAGNAME",
+	}, Config{
+		InventoryPath: "inventory-path",
+		Inventories:   []string{"inventory1", "inventory2"},
+		Playbook:      "playbook.yml",
+		RemoteUser:    "user1",
+		SSHKey:        "",
+	}, "inventory").Args, " "); command != "/usr/bin/ansible-playbook -e ansible_ssh_private_key_file=/root/.ssh/id_rsa -e commit_sha=123456789ABCDEF -e commit_tag=TAGNAME -u user1 -i path/to/playbookdir/inventory-path/inventory path/to/playbookdir/playbook.yml" {
+		t.Error("unexpected command: ", command)
+	}
+}