Update terraform-plugin-sdk

e-breuninger · Apr 23, 2021 · b335b82 · b335b82
1 parent 023f4eb
commit b335b82
Show file tree

Hide file tree

Showing 11 changed files with 83 additions and 27 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -20,4 +20,5 @@ test:
 
 .PHONY: fmt
 fmt:
+	go fmt
 	go fmt netbox/*.go
diff --git a/docker/start.sh b/docker/start.sh
@@ -27,4 +27,4 @@ until $(curl --connect-timeout 1 --output /dev/null --silent --head --fail ${SER
     sleep 5
 done
 
-docker-compose -f $SCRIPTPATH/docker-compose.yml logs
+docker-compose -f $SCRIPTPATH/docker-compose.yml logs
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/fbreckle/go-netbox v0.0.0-20201127231152-23f80e06cb3d
 	github.com/go-openapi/runtime v0.19.26
 	github.com/goware/urlx v0.3.1
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.1
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.6.0
 	github.com/sirupsen/logrus v1.7.0
 	github.com/stretchr/testify v1.7.0
 )
diff --git a/go.sum b/go.sum
diff --git a/netbox/data_source_netbox_cluster_group_test.go b/netbox/data_source_netbox_cluster_group_test.go
@@ -27,7 +27,6 @@ data "netbox_cluster_group" "test" {
 					resource.TestCheckResourceAttrPair("data.netbox_cluster_group.test", "cluster_group_id", "netbox_cluster_group.test", "id"),
 					resource.TestCheckResourceAttrPair("data.netbox_cluster_group.test", "id", "netbox_cluster_group.test", "id"),
 				),
-				ExpectNonEmptyPlan: true,
 			},
 		},
 	})

diff --git a/netbox/data_source_netbox_cluster_test.go b/netbox/data_source_netbox_cluster_test.go
@@ -30,7 +30,6 @@ data "netbox_cluster" "test" {
 					resource.TestCheckResourceAttrPair("data.netbox_cluster.test", "cluster_id", "netbox_cluster.test", "id"),
 					resource.TestCheckResourceAttrPair("data.netbox_cluster.test", "id", "netbox_cluster.test", "id"),
 				),
-				ExpectNonEmptyPlan: true,
 			},
 		},
 	})

diff --git a/netbox/data_source_netbox_device_role_test.go b/netbox/data_source_netbox_device_role_test.go
@@ -26,7 +26,6 @@ data "netbox_device_role" "test" {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrPair("data.netbox_device_role.test", "id", "netbox_device_role.test", "id"),
 				),
-				ExpectNonEmptyPlan: true,
 			},
 		},
 	})

diff --git a/netbox/data_source_netbox_platform_test.go b/netbox/data_source_netbox_platform_test.go
@@ -25,7 +25,6 @@ data "netbox_platform" "test" {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrPair("data.netbox_platform.test", "id", "netbox_platform.test", "id"),
 				),
-				ExpectNonEmptyPlan: true,
 			},
 		},
 	})

diff --git a/netbox/data_source_netbox_tenant_test.go b/netbox/data_source_netbox_tenant_test.go
@@ -26,7 +26,6 @@ data "netbox_tenant" "test" {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrPair("data.netbox_tenant.test", "id", "netbox_tenant.test", "id"),
 				),
-				ExpectNonEmptyPlan: true,
 			},
 		},
 	})

diff --git a/netbox/data_source_netbox_vrf_test.go b/netbox/data_source_netbox_vrf_test.go
@@ -26,7 +26,6 @@ data "netbox_vrf" "test" {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrPair("data.netbox_vrf.test", "id", "netbox_vrf.test", "id"),
 				),
-				ExpectNonEmptyPlan: true,
 			},
 		},
 	})

diff --git a/netbox/resource_netbox_interface_test.go b/netbox/resource_netbox_interface_test.go
@@ -46,7 +46,6 @@ func TestAccNetboxInterface_basic(t *testing.T) {
 resource "netbox_interface" "test" {
   name = "%s"
   virtual_machine_id = netbox_virtual_machine.test.id
-  type = "thisattributeisdeprecated" # deprecated attribute
 }`, testName),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("netbox_interface.test", "name", testName),
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,4 +20,5 @@ test: @@
     .PHONY: fmt
     fmt:
+    	go fmt
     	go fmt netbox/*.go