initial migration to TF 0.12

pooriaghaedi · Jul 8, 2019 · 9362e39 · 9362e39
1 parent 4620a64
commit 9362e39
Show file tree

Hide file tree

Showing 702 changed files with 18 additions and 256,963 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 generated
 terraformer
 .DS_Store
-.terraform
+.terraform
+.vscode
diff --git a/cmd/kubernetes.go b/cmd/kubernetes.go
diff --git a/cmd/root.go b/cmd/root.go
@@ -41,7 +41,6 @@ func providerImporterSubcommands() []func(options ImportOptions) *cobra.Command
 		newCmdGoogleImporter,
 		newCmdAwsImporter,
 		newCmdOpenStackImporter,
-		newCmdKubernetesImporter,
 		newCmdGithubImporter,
 		newCmdDatadogImporter,
 	}
@@ -53,7 +52,6 @@ func providerGenerators() map[string]func() terraform_utils.ProviderGenerator {
 		newGCPProvider,
 		newAWSProvider,
 		newOpenStackProvider,
-		newKubernetesProvider,
 		newGitHubProvider,
 		newDataDogProvider,
 	} {

diff --git a/providers/kubernetes/kind.go b/providers/kubernetes/kind.go
diff --git a/providers/kubernetes/kubernetes_provider.go b/providers/kubernetes/kubernetes_provider.go
diff --git a/providers/kubernetes/kubernetes_service.go b/providers/kubernetes/kubernetes_service.go
diff --git a/providers/kubernetes/utils.go b/providers/kubernetes/utils.go
diff --git a/terraform_utils/provider_wrapper/provider.go b/terraform_utils/provider_wrapper/provider.go
@@ -24,7 +24,7 @@ import (
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-plugin"
 	"github.com/hashicorp/terraform/command"
-	"github.com/hashicorp/terraform/config/configschema"
+	"github.com/hashicorp/terraform/configs/configschema"
 	tfplugin "github.com/hashicorp/terraform/plugin"
 	"github.com/hashicorp/terraform/terraform"
 )
@@ -133,18 +133,21 @@ func (p *ProviderWrapper) initProvider() error {
 			providerFileName = pluginPath + string(os.PathSeparator) + file.Name()
 		}
 	}
+	logger := hclog.New(&hclog.LoggerOptions{
+		Name:   "plugin",
+		Level:  hclog.Trace,
+		Output: os.Stderr,
+	})
+
 	p.client = plugin.NewClient(
 		&plugin.ClientConfig{
 			Cmd:              exec.Command(providerFileName),
 			HandshakeConfig:  tfplugin.Handshake,
+			VersionedPlugins: tfplugin.VersionedPlugins,
 			Managed:          true,
-			Plugins:          tfplugin.PluginMap,
-			AllowedProtocols: []plugin.Protocol{plugin.ProtocolGRPC, plugin.ProtocolNetRPC},
-			Logger: hclog.New(&hclog.LoggerOptions{
-				Name:   "plugin",
-				Level:  hclog.Info,
-				Output: os.Stderr,
-			}),
+			Logger:           logger,
+			AllowedProtocols: []plugin.Protocol{plugin.ProtocolGRPC},
+			AutoMTLS:         true,
 		})
 	p.rpcClient, err = p.client.Client()
 	if err != nil {