Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add helpers.shema.Provisoner base type for provisioners like there's one for providers #10422

Closed
wants to merge 9 commits into from
Closed

Add helpers.shema.Provisoner base type for provisioners like there's one for providers #10422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e87df48
Add `schema.Provisioner` helper
VladRassokhin Nov 29, 2016
12e68d0
Use `schema.Provisioner` helper in built-in provisioner: chef
VladRassokhin Nov 29, 2016
ee5ffc8
Use `schema.Provisioner` helper in built-in provisioner: file
VladRassokhin Nov 29, 2016
8feaae7
Use `schema.Provisioner` helper in built-in provisioner: local-exec
VladRassokhin Nov 29, 2016
68c556a
Use `schema.Provisioner` helper in built-in provisioner: remote-exec
VladRassokhin Nov 29, 2016
66a0ebc
Regenerate plugin list since provisioners were changed in previous co…
VladRassokhin Nov 29, 2016
a3ed11c
Migrate provisioners functions to `schema.ResourceData`
VladRassokhin Dec 1, 2016
b4d8728
Migrate `chef` provisioner `schema.Schema`
VladRassokhin Dec 2, 2016
bcd52d9
Rename test in 'remote-exec' provisioner and make it pass
VladRassokhin Dec 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions builtin/bins/provisioner-chef/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ package main
import (
"github.com/hashicorp/terraform/builtin/provisioners/chef"
"github.com/hashicorp/terraform/plugin"
"github.com/hashicorp/terraform/terraform"
)

func main() {
plugin.Serve(&plugin.ServeOpts{
ProvisionerFunc: func() terraform.ResourceProvisioner {
return new(chef.ResourceProvisioner)
},
ProvisionerFunc: chef.ResourceProvisioner,
})
}
5 changes: 1 addition & 4 deletions builtin/bins/provisioner-file/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ package main
import (
"github.com/hashicorp/terraform/builtin/provisioners/file"
"github.com/hashicorp/terraform/plugin"
"github.com/hashicorp/terraform/terraform"
)

func main() {
plugin.Serve(&plugin.ServeOpts{
ProvisionerFunc: func() terraform.ResourceProvisioner {
return new(file.ResourceProvisioner)
},
ProvisionerFunc: file.ResourceProvisioner,
})
}
5 changes: 1 addition & 4 deletions builtin/bins/provisioner-local-exec/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ package main
import (
"github.com/hashicorp/terraform/builtin/provisioners/local-exec"
"github.com/hashicorp/terraform/plugin"
"github.com/hashicorp/terraform/terraform"
)

func main() {
plugin.Serve(&plugin.ServeOpts{
ProvisionerFunc: func() terraform.ResourceProvisioner {
return new(localexec.ResourceProvisioner)
},
ProvisionerFunc: localexec.ResourceProvisioner,
})
}
5 changes: 1 addition & 4 deletions builtin/bins/provisioner-remote-exec/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ package main
import (
"github.com/hashicorp/terraform/builtin/provisioners/remote-exec"
"github.com/hashicorp/terraform/plugin"
"github.com/hashicorp/terraform/terraform"
)

func main() {
plugin.Serve(&plugin.ServeOpts{
ProvisionerFunc: func() terraform.ResourceProvisioner {
return new(remoteexec.ResourceProvisioner)
},
ProvisionerFunc: remoteexec.ResourceProvisioner,
})
}
2 changes: 1 addition & 1 deletion builtin/provisioners/chef/linux_provisioner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func (p *Provisioner) linuxInstallChefClient(
if p.HTTPSProxy != "" {
prefix += fmt.Sprintf("https_proxy='%s' ", p.HTTPSProxy)
}
if p.NOProxy != nil {
if p.NOProxy != nil && len(p.NOProxy) > 0 {
prefix += fmt.Sprintf("no_proxy='%s' ", strings.Join(p.NOProxy, ","))
}

Expand Down
6 changes: 2 additions & 4 deletions builtin/provisioners/chef/linux_provisioner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,13 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) {
},
}

r := new(ResourceProvisioner)
o := new(terraform.MockUIOutput)
c := new(communicator.MockCommunicator)

for k, tc := range cases {
c.Commands = tc.Commands

p, err := r.decodeConfig(tc.Config)
p, err := decodeConfig(getTestResourceData(tc.Config))
if err != nil {
t.Fatalf("Error: %v", err)
}
Expand Down Expand Up @@ -264,15 +263,14 @@ func TestResourceProvider_linuxCreateConfigFiles(t *testing.T) {
},
}

r := new(ResourceProvisioner)
o := new(terraform.MockUIOutput)
c := new(communicator.MockCommunicator)

for k, tc := range cases {
c.Commands = tc.Commands
c.Uploads = tc.Uploads

p, err := r.decodeConfig(tc.Config)
p, err := decodeConfig(getTestResourceData(tc.Config))
if err != nil {
t.Fatalf("Error: %v", err)
}
Expand Down
Loading