Skip to content
This repository has been archived by the owner on Nov 14, 2020. It is now read-only.

Migrate sdk and build with go 1.13 #46

Merged
merged 2 commits into from
Jan 6, 2020
Merged

Migrate sdk and build with go 1.13 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5e6b44
Build with go 1.13
cyrilgdn Jan 6, 2020
c7b0330
Migrating to the Terraform Plugin SDK
cyrilgdn Jan 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
)
Expand Down
385 changes: 138 additions & 247 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion rabbitmq/import_binding_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion rabbitmq/import_exchange_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion rabbitmq/import_permissions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion rabbitmq/import_policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion rabbitmq/import_queue_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion rabbitmq/import_user_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion rabbitmq/import_vhost_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions rabbitmq/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions rabbitmq/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rabbitmq/resource_binding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions rabbitmq/resource_binding_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion rabbitmq/resource_exchange.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions rabbitmq/resource_exchange_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion rabbitmq/resource_permissions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions rabbitmq/resource_permissions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion rabbitmq/resource_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions rabbitmq/resource_policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions rabbitmq/resource_queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions rabbitmq/resource_queue_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion rabbitmq/resource_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions rabbitmq/resource_user_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion rabbitmq/resource_vhost.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions rabbitmq/resource_vhost_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion rabbitmq/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
15 changes: 0 additions & 15 deletions vendor/cloud.google.com/go/AUTHORS
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions vendor/cloud.google.com/go/CONTRIBUTORS
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions vendor/cloud.google.com/go/compute/metadata/metadata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading