From f86f7c44640cb1dec05ad39d9165fa6eaa807945 Mon Sep 17 00:00:00 2001 From: James Griffith Date: Tue, 13 Oct 2020 15:26:32 -0400 Subject: [PATCH] Another instance using `Prepare()` needed an update --- builder/vsphere/clone/config.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/builder/vsphere/clone/config.go b/builder/vsphere/clone/config.go index c841b5a56..3cfd16339 100644 --- a/builder/vsphere/clone/config.go +++ b/builder/vsphere/clone/config.go @@ -65,7 +65,9 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) { return nil, err } + warnings := make([]string, 0) errs := new(packer.MultiError) + errs = packer.MultiErrorAppend(errs, c.ConnectConfig.Prepare()...) errs = packer.MultiErrorAppend(errs, c.CloneConfig.Prepare()...) errs = packer.MultiErrorAppend(errs, c.LocationConfig.Prepare()...) @@ -77,7 +79,11 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) { errs = packer.MultiErrorAppend(errs, c.BootConfig.Prepare(&c.ctx)...) errs = packer.MultiErrorAppend(errs, c.WaitIpConfig.Prepare()...) errs = packer.MultiErrorAppend(errs, c.Comm.Prepare(&c.ctx)...) - errs = packer.MultiErrorAppend(errs, c.ShutdownConfig.Prepare()...) + + shutdownWarnings, shutdownErrs := c.ShutdownConfig.Prepare(c.Comm) + warnings = append(warnings, shutdownWarnings...) + errs = packer.MultiErrorAppend(errs, shutdownErrs...) + if c.Export != nil { errs = packer.MultiErrorAppend(errs, c.Export.Prepare(&c.ctx, &c.LocationConfig, &c.PackerConfig)...) }