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

Regenerate plugin list since provisioners were changed in previous commits

This commit is contained in:
Vladislav Rassokhin 2016-11-29 23:03:21 +03:00 committed by Sander van Harmelen
parent f5449a62e0
commit df4342bc3d
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
command/internal_plugin_list.go
View File

@ -75,6 +75,7 @@ import (
vaultprovider "github.com/hashicorp/terraform/builtin/providers/vault" vaultprovider "github.com/hashicorp/terraform/builtin/providers/vault"
vcdprovider "github.com/hashicorp/terraform/builtin/providers/vcd" vcdprovider "github.com/hashicorp/terraform/builtin/providers/vcd"
vsphereprovider "github.com/hashicorp/terraform/builtin/providers/vsphere" vsphereprovider "github.com/hashicorp/terraform/builtin/providers/vsphere"
chefprovisioner "github.com/hashicorp/terraform/builtin/provisioners/chef"
fileprovisioner "github.com/hashicorp/terraform/builtin/provisioners/file" fileprovisioner "github.com/hashicorp/terraform/builtin/provisioners/file"
localexecprovisioner "github.com/hashicorp/terraform/builtin/provisioners/local-exec" localexecprovisioner "github.com/hashicorp/terraform/builtin/provisioners/local-exec"
remoteexecprovisioner "github.com/hashicorp/terraform/builtin/provisioners/remote-exec" remoteexecprovisioner "github.com/hashicorp/terraform/builtin/provisioners/remote-exec"
@ -84,9 +85,6 @@ import (
//New Provider Builds //New Provider Builds
opcprovider "github.com/hashicorp/terraform-provider-opc/opc" opcprovider "github.com/hashicorp/terraform-provider-opc/opc"
// Legacy, will remove once it conforms with new structure
chefprovisioner "github.com/hashicorp/terraform/builtin/provisioners/chef"
) )
var InternalProviders = map[string]plugin.ProviderFunc{ var InternalProviders = map[string]plugin.ProviderFunc{
@ -162,16 +160,13 @@ var InternalProviders = map[string]plugin.ProviderFunc{
} }
var InternalProvisioners = map[string]plugin.ProvisionerFunc{ var InternalProvisioners = map[string]plugin.ProvisionerFunc{
"chef": chefprovisioner.Provisioner,
"file": fileprovisioner.Provisioner, "file": fileprovisioner.Provisioner,
"local-exec": localexecprovisioner.Provisioner, "local-exec": localexecprovisioner.Provisioner,
"remote-exec": remoteexecprovisioner.Provisioner, "remote-exec": remoteexecprovisioner.Provisioner,
} }
func init() { func init() {
// Legacy provisioners that don't match our heuristics for auto-finding
// built-in provisioners.
InternalProvisioners["chef"] = func() terraform.ResourceProvisioner { return new(chefprovisioner.ResourceProvisioner) }
// New Provider Layouts // New Provider Layouts
InternalProviders["opc"] = func() terraform.ResourceProvider { return opcprovider.Provider() } InternalProviders["opc"] = func() terraform.ResourceProvider { return opcprovider.Provider() }
} }

17
scripts/generate-plugins.go
View File

@ -82,12 +82,11 @@ func makeProviderMap(items []plugin) string {
// makeProvisionerMap creates a map of provisioners like this: // makeProvisionerMap creates a map of provisioners like this:
// //
// "file": func() terraform.ResourceProvisioner { return new(file.ResourceProvisioner) }, // "chef": chefprovisioner.Provisioner,
// "local-exec": func() terraform.ResourceProvisioner { return new(localexec.ResourceProvisioner) }, // "file": fileprovisioner.Provisioner,
// "remote-exec": func() terraform.ResourceProvisioner { return new(remoteexec.ResourceProvisioner) }, // "local-exec": localexecprovisioner.Provisioner,
// "remote-exec": remoteexecprovisioner.Provisioner,
// //
// This is more verbose than the Provider case because there is no corresponding
// Provisioner function.
func makeProvisionerMap(items []plugin) string { func makeProvisionerMap(items []plugin) string {
output := "" output := ""
for _, item := range items { for _, item := range items {
@ -273,9 +272,6 @@ IMPORTS
//New Provider Builds //New Provider Builds
opcprovider "github.com/hashicorp/terraform-provider-opc/opc" opcprovider "github.com/hashicorp/terraform-provider-opc/opc"
// Legacy, will remove once it conforms with new structure
chefprovisioner "github.com/hashicorp/terraform/builtin/provisioners/chef"
) )
var InternalProviders = map[string]plugin.ProviderFunc{ var InternalProviders = map[string]plugin.ProviderFunc{
@ -287,12 +283,7 @@ PROVISIONERS
} }
func init() { func init() {
// Legacy provisioners that don't match our heuristics for auto-finding
// built-in provisioners.
InternalProvisioners["chef"] = func() terraform.ResourceProvisioner { return new(chefprovisioner.ResourceProvisioner) }
// New Provider Layouts // New Provider Layouts
InternalProviders["opc"] = func() terraform.ResourceProvider { return opcprovider.Provider() } InternalProviders["opc"] = func() terraform.ResourceProvider { return opcprovider.Provider() }
} }
` `