Merge pull request #859 from terraform-providers/appilon/remove-confi…

…g-pkg

remove use of config pkg

go.mod

@@ -5,7 +5,7 @@ require (
 	github.com/gophercloud/gophercloud v0.3.1-0.20190807175045-25a84d593c97
 	github.com/gophercloud/utils v0.0.0-20190313033024-0bcc8e728cb5
 	github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
-	github.com/hashicorp/terraform v0.12.2
+	github.com/hashicorp/terraform v0.12.8
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 // indirect
 	github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c // indirect

openstack/provider_test.go

@@ -6,7 +6,6 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/config"
 	"github.com/hashicorp/terraform/helper/pathorcontents"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
@@ -226,12 +225,8 @@ func TestAccProvider_caCertFile(t *testing.T) {
 	raw := map[string]interface{}{
 		"cacert_file": caFile,
 	}
-	rawConfig, err := config.NewRawConfig(raw)
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
 
-	err = p.Configure(terraform.NewResourceConfig(rawConfig))
+	err = p.Configure(terraform.NewResourceConfigRaw(raw))
 	if err != nil {
 		t.Fatalf("Unexpected err when specifying OpenStack CA by file: %s", err)
 	}
@@ -254,12 +249,8 @@ func TestAccProvider_caCertString(t *testing.T) {
 	raw := map[string]interface{}{
 		"cacert_file": caContents,
 	}
-	rawConfig, err := config.NewRawConfig(raw)
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
 
-	err = p.Configure(terraform.NewResourceConfig(rawConfig))
+	err = p.Configure(terraform.NewResourceConfigRaw(raw))
 	if err != nil {
 		t.Fatalf("Unexpected err when specifying OpenStack CA by string: %s", err)
 	}
@@ -290,12 +281,8 @@ func TestAccProvider_clientCertFile(t *testing.T) {
 		"cert": certFile,
 		"key":  keyFile,
 	}
-	rawConfig, err := config.NewRawConfig(raw)
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
 
-	err = p.Configure(terraform.NewResourceConfig(rawConfig))
+	err = p.Configure(terraform.NewResourceConfigRaw(raw))
 	if err != nil {
 		t.Fatalf("Unexpected err when specifying OpenStack Client keypair by file: %s", err)
 	}
@@ -324,12 +311,8 @@ func TestAccProvider_clientCertString(t *testing.T) {
 		"cert": certContents,
 		"key":  keyContents,
 	}
-	rawConfig, err := config.NewRawConfig(raw)
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
 
-	err = p.Configure(terraform.NewResourceConfig(rawConfig))
+	err = p.Configure(terraform.NewResourceConfigRaw(raw))
 	if err != nil {
 		t.Fatalf("Unexpected err when specifying OpenStack Client keypair by contents: %s", err)
 	}