From 1303329a911e99676158453183b8acb32ca8b337 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Fri, 19 Sep 2014 15:46:07 -0700 Subject: [PATCH 1/3] Added struct to be passed to the Process function to render the vagrant file path. Resolves Issue #1125. --- post-processor/vagrant/post-processor.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/post-processor/vagrant/post-processor.go b/post-processor/vagrant/post-processor.go index 8fb486edb..78d6f0158 100644 --- a/post-processor/vagrant/post-processor.go +++ b/post-processor/vagrant/post-processor.go @@ -125,9 +125,17 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac // Write our Vagrantfile var customVagrantfile string if config.VagrantfileTemplate != "" { + vagrantfilePath, err := config.tpl.Process(config.VagrantfileTemplate, &vagrantfileTemplate{ + ProviderVagrantfile: vagrantfile, + CustomVagrantfile: "", + }) + if err != nil { + return nil, false, err + } + ui.Message(fmt.Sprintf( - "Using custom Vagrantfile: %s", config.VagrantfileTemplate)) - customBytes, err := ioutil.ReadFile(config.VagrantfileTemplate) + "Using custom Vagrantfile: %s", vagrantfilePath)) + customBytes, err := ioutil.ReadFile(vagrantfilePath) if err != nil { return nil, false, err } From bf5ec1f985ded1a62baaaf3f4960c91a30156b0f Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Fri, 19 Sep 2014 15:55:05 -0700 Subject: [PATCH 2/3] Ran go fmt --- post-processor/vagrant/post-processor.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/post-processor/vagrant/post-processor.go b/post-processor/vagrant/post-processor.go index 78d6f0158..3cbb0fe97 100644 --- a/post-processor/vagrant/post-processor.go +++ b/post-processor/vagrant/post-processor.go @@ -127,7 +127,7 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac if config.VagrantfileTemplate != "" { vagrantfilePath, err := config.tpl.Process(config.VagrantfileTemplate, &vagrantfileTemplate{ ProviderVagrantfile: vagrantfile, - CustomVagrantfile: "", + CustomVagrantfile: "", }) if err != nil { return nil, false, err From dabf34a458912ccee3d5e36f13a74d4f681c8991 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Fri, 3 Oct 2014 12:34:07 -0700 Subject: [PATCH 3/3] Replaced struct call with nil per @jsonberanek. Ran go fmt. --- post-processor/vagrant/post-processor.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/post-processor/vagrant/post-processor.go b/post-processor/vagrant/post-processor.go index 3cbb0fe97..1365a3c3d 100644 --- a/post-processor/vagrant/post-processor.go +++ b/post-processor/vagrant/post-processor.go @@ -125,10 +125,7 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac // Write our Vagrantfile var customVagrantfile string if config.VagrantfileTemplate != "" { - vagrantfilePath, err := config.tpl.Process(config.VagrantfileTemplate, &vagrantfileTemplate{ - ProviderVagrantfile: vagrantfile, - CustomVagrantfile: "", - }) + vagrantfilePath, err := config.tpl.Process(config.VagrantfileTemplate, nil) if err != nil { return nil, false, err }