ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

provisioners/*: new interface

This commit is contained in:
Mitchell Hashimoto 2014-10-04 16:29:33 -07:00
parent 063e727491
commit e5868ebdd9
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/provisioners/file/resource_provisioner.go
View File

@ -13,7 +13,9 @@ import (
type ResourceProvisioner struct{} type ResourceProvisioner struct{}
func (p *ResourceProvisioner) Apply(s *terraform.InstanceState, func (p *ResourceProvisioner) Apply(
o terraform.UIOutput,
s *terraform.InstanceState,
c *terraform.ResourceConfig) error { c *terraform.ResourceConfig) error {
// Ensure the connection type is SSH // Ensure the connection type is SSH
if err := helper.VerifySSH(s); err != nil { if err := helper.VerifySSH(s); err != nil {

1
builtin/provisioners/local-exec/resource_provisioner.go
View File

@ -20,6 +20,7 @@ const (
type ResourceProvisioner struct{} type ResourceProvisioner struct{}
func (p *ResourceProvisioner) Apply( func (p *ResourceProvisioner) Apply(
o terraform.UIOutput,
s *terraform.InstanceState, s *terraform.InstanceState,
c *terraform.ResourceConfig) error { c *terraform.ResourceConfig) error {

3
builtin/provisioners/local-exec/resource_provisioner_test.go
View File

@ -20,8 +20,9 @@ func TestResourceProvider_Apply(t *testing.T) {
"command": "echo foo > test_out", "command": "echo foo > test_out",
}) })
output := new(terraform.MockUIOutput)
p := new(ResourceProvisioner) 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) t.Fatalf("err: %v", err)
} }

4
builtin/provisioners/remote-exec/resource_provisioner.go
View File

@ -22,7 +22,9 @@ const (
type ResourceProvisioner struct{} type ResourceProvisioner struct{}
func (p *ResourceProvisioner) Apply(s *terraform.InstanceState, func (p *ResourceProvisioner) Apply(
o terraform.UIOutput,
s *terraform.InstanceState,
c *terraform.ResourceConfig) error { c *terraform.ResourceConfig) error {
// Ensure the connection type is SSH // Ensure the connection type is SSH
if err := helper.VerifySSH(s); err != nil { if err := helper.VerifySSH(s); err != nil {