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

Fixup for #8883: interpolate in file provisioner 

* `UploadDir` should receive interpolated `Destination`
* Render `Destination` only once
This commit is contained in:
Vladislav Rassokhin 2020-08-02 21:09:47 +03:00
parent a28edbaa0b
commit 2ac9f5a276
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
provisioner/file/provisioner.go
View File

@ -109,15 +109,15 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C
} }
func (p *Provisioner) ProvisionDownload(ui packer.Ui, comm packer.Communicator) error { func (p *Provisioner) ProvisionDownload(ui packer.Ui, comm packer.Communicator) error {
dst, err := interpolate.Render(p.config.Destination, &p.config.ctx)
if err != nil {
return fmt.Errorf("Error interpolating destination: %s", err)
}
for _, src := range p.config.Sources { for _, src := range p.config.Sources {
src, err := interpolate.Render(src, &p.config.ctx) src, err := interpolate.Render(src, &p.config.ctx)
if err != nil { if err != nil {
return fmt.Errorf("Error interpolating source: %s", err) return fmt.Errorf("Error interpolating source: %s", err)
} }
dst, err := interpolate.Render(p.config.Destination, &p.config.ctx)
if err != nil {
return fmt.Errorf("Error interpolating destination: %s", err)
}
ui.Say(fmt.Sprintf("Downloading %s => %s", src, dst)) ui.Say(fmt.Sprintf("Downloading %s => %s", src, dst))
// ensure destination dir exists. p.config.Destination may either be a file or a dir. // ensure destination dir exists. p.config.Destination may either be a file or a dir.
@ -158,17 +158,16 @@ func (p *Provisioner) ProvisionDownload(ui packer.Ui, comm packer.Communicator)
} }
func (p *Provisioner) ProvisionUpload(ui packer.Ui, comm packer.Communicator) error { func (p *Provisioner) ProvisionUpload(ui packer.Ui, comm packer.Communicator) error {
dst, err := interpolate.Render(p.config.Destination, &p.config.ctx)
if err != nil {
return fmt.Errorf("Error interpolating destination: %s", err)
}
for _, src := range p.config.Sources { for _, src := range p.config.Sources {
src, err := interpolate.Render(src, &p.config.ctx) src, err := interpolate.Render(src, &p.config.ctx)
if err != nil { if err != nil {
return fmt.Errorf("Error interpolating source: %s", err) return fmt.Errorf("Error interpolating source: %s", err)
} }
dst, err := interpolate.Render(p.config.Destination, &p.config.ctx)
if err != nil {
return fmt.Errorf("Error interpolating destination: %s", err)
}
ui.Say(fmt.Sprintf("Uploading %s => %s", src, dst)) ui.Say(fmt.Sprintf("Uploading %s => %s", src, dst))
info, err := os.Stat(src) info, err := os.Stat(src)
@ -178,7 +177,7 @@ func (p *Provisioner) ProvisionUpload(ui packer.Ui, comm packer.Communicator) er
// If we're uploading a directory, short circuit and do that // If we're uploading a directory, short circuit and do that
if info.IsDir() { if info.IsDir() {
return comm.UploadDir(p.config.Destination, src, nil) return comm.UploadDir(dst, src, nil)
} }
// We're uploading a file... // We're uploading a file...