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

Merge pull request #4624 from anish/fix_null 

Make null builder actually have the ability to do nothing
This commit is contained in:
Matthew Hooker 2017-06-07 17:15:04 -07:00 committed by GitHub
parent a583b18c54 ff39827733
commit 950861460e
2 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
builder/null/builder.go
View File

@ -27,19 +27,26 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
} }
func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) { func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) {
steps := []multistep.Step{ steps := []multistep.Step{}
&communicator.StepConnect{
Config: &b.config.CommConfig, if b.config.CommConfig.Type != "none" {
Host: CommHost(b.config.CommConfig.Host()), steps = append(steps,
SSHConfig: SSHConfig( &communicator.StepConnect{
b.config.CommConfig.SSHAgentAuth, Config: &b.config.CommConfig,
b.config.CommConfig.SSHUsername, Host: CommHost(b.config.CommConfig.Host()),
b.config.CommConfig.SSHPassword, SSHConfig: SSHConfig(
b.config.CommConfig.SSHPrivateKey), b.config.CommConfig.SSHAgentAuth,
}, b.config.CommConfig.SSHUsername,
&common.StepProvision{}, b.config.CommConfig.SSHPassword,
b.config.CommConfig.SSHPrivateKey),
},
)
} }
steps = append(steps,
new(common.StepProvision),
)
// Setup the state bag and initial state for the steps // Setup the state bag and initial state for the steps
state := new(multistep.BasicStateBag) state := new(multistep.BasicStateBag)
state.Put("config", b.config) state.Put("config", b.config)

38
builder/null/config.go
View File

@ -31,26 +31,30 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
if es := c.CommConfig.Prepare(nil); len(es) > 0 { if es := c.CommConfig.Prepare(nil); len(es) > 0 {
errs = packer.MultiErrorAppend(errs, es...) errs = packer.MultiErrorAppend(errs, es...)
} }
if c.CommConfig.Host() == "" {
errs = packer.MultiErrorAppend(errs,
fmt.Errorf("a Host must be specified, please reference your communicator documentation"))
}
if c.CommConfig.User() == "" { if c.CommConfig.Type != "none" {
errs = packer.MultiErrorAppend(errs, if c.CommConfig.Host() == "" {
fmt.Errorf("a Username must be specified, please reference your communicator documentation")) errs = packer.MultiErrorAppend(errs,
} fmt.Errorf("a Host must be specified, please reference your communicator documentation"))
}
if !c.CommConfig.SSHAgentAuth && c.CommConfig.Password() == "" && c.CommConfig.SSHPrivateKey == "" { if c.CommConfig.User() == "" {
errs = packer.MultiErrorAppend(errs, errs = packer.MultiErrorAppend(errs,
fmt.Errorf("one authentication method must be specified, please reference your communicator documentation")) fmt.Errorf("a Username must be specified, please reference your communicator documentation"))
} }
if (c.CommConfig.SSHAgentAuth && if !c.CommConfig.SSHAgentAuth && c.CommConfig.Password() == "" && c.CommConfig.SSHPrivateKey == "" {
(c.CommConfig.SSHPassword != "" || c.CommConfig.SSHPrivateKey != "")) || errs = packer.MultiErrorAppend(errs,
(c.CommConfig.SSHPassword != "" && c.CommConfig.SSHPrivateKey != "") { fmt.Errorf("one authentication method must be specified, please reference your communicator documentation"))
errs = packer.MultiErrorAppend(errs, }
fmt.Errorf("only one of ssh_agent_auth, ssh_password, and ssh_private_key_file must be specified"))
if (c.CommConfig.SSHAgentAuth &&
(c.CommConfig.SSHPassword != "" || c.CommConfig.SSHPrivateKey != "")) ||
(c.CommConfig.SSHPassword != "" && c.CommConfig.SSHPrivateKey != "") {
errs = packer.MultiErrorAppend(errs,
fmt.Errorf("only one of ssh_agent_auth, ssh_password, and ssh_private_key_file must be specified"))
}
} }
if errs != nil && len(errs.Errors) > 0 { if errs != nil && len(errs.Errors) > 0 {