iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5758 from GSA/better-user 

make user retrieval for Ansible provisioner more robust
This commit is contained in:
Rickard von Essen 2018-01-06 11:22:03 +01:00 committed by GitHub
parent e164621bfe b894c925d1
commit 15eccb1aa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
provisioner/ansible/provisioner.go
View File

@ -15,6 +15,7 @@ import (
"net" "net"
"os" "os"
"os/exec" "os/exec"
"os/user"
"path/filepath" "path/filepath"
"regexp" "regexp"
"strconv" "strconv"
@ -141,7 +142,12 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
} }
if p.config.User == "" { if p.config.User == "" {
p.config.User = os.Getenv("USER") usr, err := user.Current()
if err != nil {
errs = packer.MultiErrorAppend(errs, err)
} else {
p.config.User = usr.Username
}
} }
if p.config.User == "" { if p.config.User == "" {
errs = packer.MultiErrorAppend(errs, fmt.Errorf("user: could not determine current user from environment.")) errs = packer.MultiErrorAppend(errs, fmt.Errorf("user: could not determine current user from environment."))

10
provisioner/ansible/provisioner_test.go
View File

@ -76,6 +76,16 @@ func TestProvisionerPrepare_Defaults(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("err: %s", err) t.Fatalf("err: %s", err)
} }
defer os.Remove(playbook_file.Name())
err = os.Unsetenv("USER")
if err != nil {
t.Fatalf("err: %s", err)
}
err = p.Prepare(config)
if err != nil {
t.Fatalf("err: %s", err)
}
} }
func TestProvisionerPrepare_PlaybookFile(t *testing.T) { func TestProvisionerPrepare_PlaybookFile(t *testing.T) {