From 83cc54bfbeb8df5befb8dcceab06911196f796d8 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 26 Jan 2017 15:11:47 -0800 Subject: [PATCH] updated generate output --- command/internal_plugin_list.go | 23 +++++++++++++++-------- terraform/graphtype_string.go | 4 ++-- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/command/internal_plugin_list.go b/command/internal_plugin_list.go index 06ad2fa80..dab3e3cbc 100644 --- a/command/internal_plugin_list.go +++ b/command/internal_plugin_list.go @@ -65,13 +65,15 @@ import ( vaultprovider "github.com/hashicorp/terraform/builtin/providers/vault" vcdprovider "github.com/hashicorp/terraform/builtin/providers/vcd" vsphereprovider "github.com/hashicorp/terraform/builtin/providers/vsphere" - chefresourceprovisioner "github.com/hashicorp/terraform/builtin/provisioners/chef" - fileresourceprovisioner "github.com/hashicorp/terraform/builtin/provisioners/file" - localexecresourceprovisioner "github.com/hashicorp/terraform/builtin/provisioners/local-exec" - remoteexecresourceprovisioner "github.com/hashicorp/terraform/builtin/provisioners/remote-exec" + fileprovisioner "github.com/hashicorp/terraform/builtin/provisioners/file" + localexecprovisioner "github.com/hashicorp/terraform/builtin/provisioners/local-exec" + remoteexecprovisioner "github.com/hashicorp/terraform/builtin/provisioners/remote-exec" "github.com/hashicorp/terraform/plugin" "github.com/hashicorp/terraform/terraform" + + // Legacy, will remove once it conforms with new structure + chefprovisioner "github.com/hashicorp/terraform/builtin/provisioners/chef" ) var InternalProviders = map[string]plugin.ProviderFunc{ @@ -137,8 +139,13 @@ var InternalProviders = map[string]plugin.ProviderFunc{ } var InternalProvisioners = map[string]plugin.ProvisionerFunc{ - "chef": func() terraform.ResourceProvisioner { return new(chefresourceprovisioner.ResourceProvisioner) }, - "file": func() terraform.ResourceProvisioner { return new(fileresourceprovisioner.ResourceProvisioner) }, - "local-exec": func() terraform.ResourceProvisioner { return new(localexecresourceprovisioner.ResourceProvisioner) }, - "remote-exec": func() terraform.ResourceProvisioner { return new(remoteexecresourceprovisioner.ResourceProvisioner) }, + "file": fileprovisioner.Provisioner, + "local-exec": localexecprovisioner.Provisioner, + "remote-exec": remoteexecprovisioner.Provisioner, +} + +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) } } diff --git a/terraform/graphtype_string.go b/terraform/graphtype_string.go index ccf9da711..88ecad4f6 100644 --- a/terraform/graphtype_string.go +++ b/terraform/graphtype_string.go @@ -4,9 +4,9 @@ package terraform import "fmt" -const _GraphType_name = "GraphTypeInvalidGraphTypeLegacyGraphTypeRefreshGraphTypePlanGraphTypePlanDestroyGraphTypeApply" +const _GraphType_name = "GraphTypeInvalidGraphTypeLegacyGraphTypeRefreshGraphTypePlanGraphTypePlanDestroyGraphTypeApplyGraphTypeInputGraphTypeValidate" -var _GraphType_index = [...]uint8{0, 16, 31, 47, 60, 80, 94} +var _GraphType_index = [...]uint8{0, 16, 31, 47, 60, 80, 94, 108, 125} func (i GraphType) String() string { if i >= GraphType(len(_GraphType_index)-1) {