From e5868ebdd9628a72886aa2d3c20c21e7d316553c Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sat, 4 Oct 2014 16:29:33 -0700 Subject: [PATCH] provisioners/*: new interface --- builtin/provisioners/file/resource_provisioner.go | 4 +++- builtin/provisioners/local-exec/resource_provisioner.go | 1 + builtin/provisioners/local-exec/resource_provisioner_test.go | 3 ++- builtin/provisioners/remote-exec/resource_provisioner.go | 4 +++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/builtin/provisioners/file/resource_provisioner.go b/builtin/provisioners/file/resource_provisioner.go index 91970b215..bb95c0860 100644 --- a/builtin/provisioners/file/resource_provisioner.go +++ b/builtin/provisioners/file/resource_provisioner.go @@ -13,7 +13,9 @@ import ( type ResourceProvisioner struct{} -func (p *ResourceProvisioner) Apply(s *terraform.InstanceState, +func (p *ResourceProvisioner) Apply( + o terraform.UIOutput, + s *terraform.InstanceState, c *terraform.ResourceConfig) error { // Ensure the connection type is SSH if err := helper.VerifySSH(s); err != nil { diff --git a/builtin/provisioners/local-exec/resource_provisioner.go b/builtin/provisioners/local-exec/resource_provisioner.go index 234b8ee3e..544dabe86 100644 --- a/builtin/provisioners/local-exec/resource_provisioner.go +++ b/builtin/provisioners/local-exec/resource_provisioner.go @@ -20,6 +20,7 @@ const ( type ResourceProvisioner struct{} func (p *ResourceProvisioner) Apply( + o terraform.UIOutput, s *terraform.InstanceState, c *terraform.ResourceConfig) error { diff --git a/builtin/provisioners/local-exec/resource_provisioner_test.go b/builtin/provisioners/local-exec/resource_provisioner_test.go index e31641561..9158c333e 100644 --- a/builtin/provisioners/local-exec/resource_provisioner_test.go +++ b/builtin/provisioners/local-exec/resource_provisioner_test.go @@ -20,8 +20,9 @@ func TestResourceProvider_Apply(t *testing.T) { "command": "echo foo > test_out", }) + output := new(terraform.MockUIOutput) p := new(ResourceProvisioner) - if err := p.Apply(nil, c); err != nil { + if err := p.Apply(output, nil, c); err != nil { t.Fatalf("err: %v", err) } diff --git a/builtin/provisioners/remote-exec/resource_provisioner.go b/builtin/provisioners/remote-exec/resource_provisioner.go index fc694d8aa..7868f32ac 100644 --- a/builtin/provisioners/remote-exec/resource_provisioner.go +++ b/builtin/provisioners/remote-exec/resource_provisioner.go @@ -22,7 +22,9 @@ const ( type ResourceProvisioner struct{} -func (p *ResourceProvisioner) Apply(s *terraform.InstanceState, +func (p *ResourceProvisioner) Apply( + o terraform.UIOutput, + s *terraform.InstanceState, c *terraform.ResourceConfig) error { // Ensure the connection type is SSH if err := helper.VerifySSH(s); err != nil {