Merge pull request #46 from terraform-providers/migrate-sdk

Migrate sdk and build with go 1.13
hashicorp · Jan 6, 2020 · ab3447b · ab3447b
2 parents de107a7 + c7b0330
commit ab3447b
Show file tree

Hide file tree

Showing 1,019 changed files with 36,212 additions and 38,773 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ services:
 - docker
 language: go
 go:
-  - "1.11.x"
+  - "1.13.x"
 
 install:
 # This script is used by the Travis build to install a cookie for

diff --git a/go.mod b/go.mod
@@ -1,7 +1,7 @@
 module github.com/terraform-providers/terraform-provider-rabbitmq
 
 require (
-	github.com/hashicorp/terraform v0.12.2
+	github.com/hashicorp/terraform-plugin-sdk v1.0.0
 	github.com/michaelklishin/rabbit-hole v1.5.0
 	github.com/streadway/amqp v0.0.0-20190214183023-884228600bc9 // indirect
 )

diff --git a/go.sum b/go.sum
diff --git a/main.go b/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/hashicorp/terraform-plugin-sdk/plugin"
 	"github.com/terraform-providers/terraform-provider-rabbitmq/rabbitmq"
 )
 

diff --git a/rabbitmq/import_binding_test.go b/rabbitmq/import_binding_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/michaelklishin/rabbit-hole"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccBinding_importBasic(t *testing.T) {

diff --git a/rabbitmq/import_exchange_test.go b/rabbitmq/import_exchange_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/michaelklishin/rabbit-hole"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccExchange_importBasic(t *testing.T) {

diff --git a/rabbitmq/import_permissions_test.go b/rabbitmq/import_permissions_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/michaelklishin/rabbit-hole"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccPermissions_importBasic(t *testing.T) {

diff --git a/rabbitmq/import_policy_test.go b/rabbitmq/import_policy_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/michaelklishin/rabbit-hole"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccPolicy_importBasic(t *testing.T) {

diff --git a/rabbitmq/import_queue_test.go b/rabbitmq/import_queue_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/michaelklishin/rabbit-hole"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccQueue_importBasic(t *testing.T) {

diff --git a/rabbitmq/import_user_test.go b/rabbitmq/import_user_test.go
@@ -3,7 +3,7 @@ package rabbitmq
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccUser_importBasic(t *testing.T) {

diff --git a/rabbitmq/import_vhost_test.go b/rabbitmq/import_vhost_test.go
@@ -3,7 +3,7 @@ package rabbitmq
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccVhost_importBasic(t *testing.T) {

diff --git a/rabbitmq/provider.go b/rabbitmq/provider.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/michaelklishin/rabbit-hole"
 
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func Provider() terraform.ResourceProvider {

diff --git a/rabbitmq/provider_test.go b/rabbitmq/provider_test.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 // To run these acceptance tests, you will need access to a RabbitMQ server

diff --git a/rabbitmq/resource_binding.go b/rabbitmq/resource_binding.go
@@ -6,7 +6,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/michaelklishin/rabbit-hole"
 )
 

diff --git a/rabbitmq/resource_binding_test.go b/rabbitmq/resource_binding_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/michaelklishin/rabbit-hole"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccBinding_basic(t *testing.T) {

diff --git a/rabbitmq/resource_exchange.go b/rabbitmq/resource_exchange.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/michaelklishin/rabbit-hole"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceExchange() *schema.Resource {

diff --git a/rabbitmq/resource_exchange_test.go b/rabbitmq/resource_exchange_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/michaelklishin/rabbit-hole"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccExchange(t *testing.T) {

diff --git a/rabbitmq/resource_permissions.go b/rabbitmq/resource_permissions.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/michaelklishin/rabbit-hole"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourcePermissions() *schema.Resource {

diff --git a/rabbitmq/resource_permissions_test.go b/rabbitmq/resource_permissions_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/michaelklishin/rabbit-hole"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccPermissions(t *testing.T) {

diff --git a/rabbitmq/resource_policy.go b/rabbitmq/resource_policy.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/michaelklishin/rabbit-hole"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourcePolicy() *schema.Resource {

diff --git a/rabbitmq/resource_policy_test.go b/rabbitmq/resource_policy_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/michaelklishin/rabbit-hole"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccPolicy(t *testing.T) {

diff --git a/rabbitmq/resource_queue.go b/rabbitmq/resource_queue.go
@@ -6,9 +6,9 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/helper/structure"
-	"github.com/hashicorp/terraform/helper/validation"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/structure"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	rabbithole "github.com/michaelklishin/rabbit-hole"
 )
 

diff --git a/rabbitmq/resource_queue_test.go b/rabbitmq/resource_queue_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 	rabbithole "github.com/michaelklishin/rabbit-hole"
 )
 

diff --git a/rabbitmq/resource_user.go b/rabbitmq/resource_user.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/michaelklishin/rabbit-hole"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceUser() *schema.Resource {

diff --git a/rabbitmq/resource_user_test.go b/rabbitmq/resource_user_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/michaelklishin/rabbit-hole"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccUser_basic(t *testing.T) {

diff --git a/rabbitmq/resource_vhost.go b/rabbitmq/resource_vhost.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/michaelklishin/rabbit-hole"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceVhost() *schema.Resource {

diff --git a/rabbitmq/resource_vhost_test.go b/rabbitmq/resource_vhost_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/michaelklishin/rabbit-hole"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccVhost(t *testing.T) {

diff --git a/rabbitmq/util.go b/rabbitmq/util.go
@@ -3,7 +3,7 @@ package rabbitmq
 import (
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func checkDeleted(d *schema.ResourceData, err error) error {

diff --git a/vendor/cloud.google.com/go/AUTHORS b/vendor/cloud.google.com/go/AUTHORS
diff --git a/vendor/cloud.google.com/go/CONTRIBUTORS b/vendor/cloud.google.com/go/CONTRIBUTORS
diff --git a/vendor/cloud.google.com/go/compute/metadata/metadata.go b/vendor/cloud.google.com/go/compute/metadata/metadata.go