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

remove racy reuse of single buffer for remotecmd stderr/out.

Browse Source
This commit is contained in:
Matthew Hooker 2017-11-09 15:20:37 -08:00
parent e5c59468df
commit e073d63f30
No known key found for this signature in database
GPG Key ID: 7B5F933D9CE8C6A1
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
provisioner/converge/provisioner.go
View File

@ -144,12 +144,12 @@ func (p *Provisioner) maybeBootstrap(ui packer.Ui, comm packer.Communicator) err
return fmt.Errorf("Could not interpolate bootstrap command: %s", err)
}
var out bytes.Buffer
var out, outErr bytes.Buffer
cmd := &packer.RemoteCmd{
Command: command,
Stdin: nil,
Stdout: &out,
Stderr: &out,
Stderr: &outErr,
}
if err = comm.Start(cmd); err != nil {
@ -159,6 +159,7 @@ func (p *Provisioner) maybeBootstrap(ui packer.Ui, comm packer.Communicator) err
cmd.Wait()
if cmd.ExitStatus != 0 {
ui.Error(out.String())
ui.Error(outErr.String())
return errors.New("Error bootstrapping converge")
}
@ -199,12 +200,12 @@ func (p *Provisioner) applyModules(ui packer.Ui, comm packer.Communicator) error
}
// run Converge in the specified directory
var runOut bytes.Buffer
var runOut, runErr bytes.Buffer
cmd := &packer.RemoteCmd{
Command: command,
Stdin: nil,
Stdout: &runOut,
Stderr: &runOut,
Stderr: &runErr,
}
if err := comm.Start(cmd); err != nil {
return fmt.Errorf("Error applying %q: %s", p.config.Module, err)
@ -221,7 +222,8 @@ func (p *Provisioner) applyModules(ui packer.Ui, comm packer.Communicator) error
} else if cmd.ExitStatus != 0 {
ui.Error(strings.TrimSpace(runOut.String()))
ui.Error(fmt.Sprintf("exited with error code %d", cmd.ExitStatus))
ui.Error(strings.TrimSpace(runErr.String()))
ui.Error(fmt.Sprintf("Exited with error code %d.", cmd.ExitStatus))
return fmt.Errorf("Error applying %q", p.config.Module)
}

2
provisioner/salt-masterless/provisioner.go
View File

@ -312,7 +312,7 @@ func (p *Provisioner) sudo(cmd string) string {
}
func validateDirConfig(path string, name string, required bool) error {
if required == true && path == "" {
if required && path == "" {
return fmt.Errorf("%s cannot be empty", name)
} else if required == false && path == "" {
return nil