From e9618b0d078c6eb4b174c0f614970d13417cb116 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 21 May 2013 22:16:26 -0700 Subject: [PATCH] packer/plugin: Properly supports Artifacts --- packer/plugin/builder.go | 4 ++-- packer/plugin/builder_test.go | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packer/plugin/builder.go b/packer/plugin/builder.go index 783e67d48..d020167e3 100644 --- a/packer/plugin/builder.go +++ b/packer/plugin/builder.go @@ -22,13 +22,13 @@ func (b *cmdBuilder) Prepare(config interface{}) error { return b.builder.Prepare(config) } -func (b *cmdBuilder) Run(ui packer.Ui, hook packer.Hook) { +func (b *cmdBuilder) Run(ui packer.Ui, hook packer.Hook) packer.Artifact { defer func() { r := recover() b.checkExit(r, nil) }() - b.builder.Run(ui, hook) + return b.builder.Run(ui, hook) } func (c *cmdBuilder) checkExit(p interface{}, cb func()) { diff --git a/packer/plugin/builder_test.go b/packer/plugin/builder_test.go index 4fe2ccf52..460bc7e4e 100644 --- a/packer/plugin/builder_test.go +++ b/packer/plugin/builder_test.go @@ -13,7 +13,9 @@ func (helperBuilder) Prepare(interface{}) error { return nil } -func (helperBuilder) Run(packer.Ui, packer.Hook) {} +func (helperBuilder) Run(packer.Ui, packer.Hook) packer.Artifact { + return nil +} func TestBuilder_NoExist(t *testing.T) { assert := asserts.NewTestingAsserts(t, true)