Merge pull request #442 from HewlettPackard/upgrade_pluginv2

Upgrade terraform SDK pluginv2
HewlettPackard · Jan 12, 2022 · 5a8a768 · 5a8a768
2 parents 5e3935a + dad957e
commit 5a8a768
Show file tree

Hide file tree

Showing 1,748 changed files with 159,160 additions and 218,232 deletions.
diff --git a/go.mod b/go.mod
@@ -4,19 +4,13 @@ go 1.15
 
 require (
 	github.com/HewlettPackard/oneview-golang v6.4.1-0.20211207103755-542200727968+incompatible
-	github.com/apparentlymart/go-cidr v1.1.0 // indirect
 	github.com/docker/machine v0.16.2 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-getter v1.4.1 // indirect
 	github.com/hashicorp/go-multierror v1.1.0 // indirect
-	github.com/hashicorp/go-plugin v1.4.0 // indirect
 	github.com/hashicorp/go-uuid v1.0.2 // indirect
-	github.com/hashicorp/go-version v1.2.1 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/hashicorp/terraform-plugin-sdk v1.7.0
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3
 	github.com/mitchellh/copystructure v1.1.1 // indirect
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
 	github.com/stretchr/testify v1.7.0 // indirect
-	github.com/ulikunitz/xz v0.5.8 // indirect
 	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/...form-plugin-sdk/helper/mutexkv/mutexkv.go → internal/mutexkv/mutexkv.go b/...form-plugin-sdk/helper/mutexkv/mutexkv.go → internal/mutexkv/mutexkv.go
diff --git a/main.go b/main.go
@@ -13,7 +13,7 @@ package main
 
 import (
 	"github.com/HewlettPackard/terraform-provider-oneview/oneview"
-	"github.com/hashicorp/terraform-plugin-sdk/plugin"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/plugin"
 )
 
 func main() {

diff --git a/oneview/data_source_appliance_snmp_v1_trap_destinations.go b/oneview/data_source_appliance_snmp_v1_trap_destinations.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceSNMPv1TrapDestination() *schema.Resource {

diff --git a/oneview/data_source_appliance_snmp_v1_trap_destinations_test.go b/oneview/data_source_appliance_snmp_v1_trap_destinations_test.go
@@ -14,7 +14,7 @@ package oneview
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAccApplianceSNMPv1TrapDestinations_2(t *testing.T) {

diff --git a/oneview/data_source_appliance_snmpv3_trap_destinations.go b/oneview/data_source_appliance_snmpv3_trap_destinations.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceSNMPv3TrapDestination() *schema.Resource {

diff --git a/oneview/data_source_appliance_snmpv3_trap_destinations_test.go b/oneview/data_source_appliance_snmpv3_trap_destinations_test.go
@@ -14,7 +14,7 @@ package oneview
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAccSNMPv3TrapDestinations_2(t *testing.T) {

diff --git a/oneview/data_source_appliance_snmpv3_users.go b/oneview/data_source_appliance_snmpv3_users.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceSNMPv3User() *schema.Resource {

diff --git a/oneview/data_source_appliance_snmpv3_users_test.go b/oneview/data_source_appliance_snmpv3_users_test.go
@@ -14,7 +14,7 @@ package oneview
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAccSNMPv3User_2(t *testing.T) {

diff --git a/oneview/data_source_appliance_ssh_access.go b/oneview/data_source_appliance_ssh_access.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceSSHAccess() *schema.Resource {

diff --git a/oneview/data_source_appliance_ssh_access_test.go b/oneview/data_source_appliance_ssh_access_test.go
@@ -14,7 +14,7 @@ package oneview
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAccSSHAccess_2(t *testing.T) {

diff --git a/oneview/data_source_appliance_time_and_locale_configuration.go b/oneview/data_source_appliance_time_and_locale_configuration.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceTimeAndLocale() *schema.Resource {

diff --git a/oneview/data_source_appliance_time_and_locale_configuration_test.go b/oneview/data_source_appliance_time_and_locale_configuration_test.go
@@ -14,7 +14,7 @@ package oneview
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAccTimeandLocaleConfiguration_2(t *testing.T) {

diff --git a/oneview/data_source_connection_templates.go b/oneview/data_source_connection_templates.go
@@ -14,7 +14,7 @@ package oneview
 import (
 	"github.com/HewlettPackard/oneview-golang/ov"
 	"github.com/HewlettPackard/oneview-golang/utils"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceConnectionTemplates() *schema.Resource {

diff --git a/oneview/data_source_connection_templates_test.go b/oneview/data_source_connection_templates_test.go
@@ -14,7 +14,7 @@ package oneview
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAccConnectionTemplates_2(t *testing.T) {

diff --git a/oneview/data_source_deployment_plan.go b/oneview/data_source_deployment_plan.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceDeploymentPlan() *schema.Resource {

diff --git a/oneview/data_source_deployment_plan_test.go b/oneview/data_source_deployment_plan_test.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"testing"
 )
 

diff --git a/oneview/data_source_enclosure.go b/oneview/data_source_enclosure.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceEnclosure() *schema.Resource {

diff --git a/oneview/data_source_enclosure_group.go b/oneview/data_source_enclosure_group.go
@@ -11,7 +11,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"log"
 )
 

diff --git a/oneview/data_source_enclosure_test.go b/oneview/data_source_enclosure_test.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"testing"
 )
 

diff --git a/oneview/data_source_ethernet_network.go b/oneview/data_source_ethernet_network.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"log"
 )
 

diff --git a/oneview/data_source_fc_network.go b/oneview/data_source_fc_network.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"log"
 )
 

diff --git a/oneview/data_source_fc_network_test.go b/oneview/data_source_fc_network_test.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"testing"
 )
 

diff --git a/oneview/data_source_fcoe_network.go b/oneview/data_source_fcoe_network.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"log"
 )
 

diff --git a/oneview/data_source_fcoe_network_test.go b/oneview/data_source_fcoe_network_test.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"testing"
 )
 

diff --git a/oneview/data_source_firmware_drivers.go b/oneview/data_source_firmware_drivers.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceFirmwareDrivers() *schema.Resource {

diff --git a/oneview/data_source_firmware_drivers_test.go b/oneview/data_source_firmware_drivers_test.go
@@ -14,7 +14,7 @@ package oneview
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAccFirmwareDrivers_2(t *testing.T) {

diff --git a/oneview/data_source_hypervisor_cluster_profile.go b/oneview/data_source_hypervisor_cluster_profile.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceHypervisorClusterProfile() *schema.Resource {

diff --git a/oneview/data_source_hypervisor_cluster_profile_test.go b/oneview/data_source_hypervisor_cluster_profile_test.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"testing"
 )
 

diff --git a/oneview/data_source_hypervisor_manager.go b/oneview/data_source_hypervisor_manager.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceHypervisorManager() *schema.Resource {

diff --git a/oneview/data_source_hypervisor_manager_test.go b/oneview/data_source_hypervisor_manager_test.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"testing"
 )
 

diff --git a/oneview/data_source_id_pools_ipv4_range.go b/oneview/data_source_id_pools_ipv4_range.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceIPv4Ranges() *schema.Resource {

diff --git a/oneview/data_source_id_pools_ipv4_range_test.go b/oneview/data_source_id_pools_ipv4_range_test.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"testing"
 )
 

diff --git a/oneview/data_source_id_pools_ipv4_subnets.go b/oneview/data_source_id_pools_ipv4_subnets.go
@@ -13,7 +13,7 @@ package oneview
 
 import (
 	"github.com/HewlettPackard/oneview-golang/ov"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"path"
 )
 

diff --git a/oneview/data_source_id_pools_ipv4_subnets_test.go b/oneview/data_source_id_pools_ipv4_subnets_test.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"testing"
 )
 

diff --git a/oneview/data_source_interconnect_type.go b/oneview/data_source_interconnect_type.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceInterconnectType() *schema.Resource {

diff --git a/oneview/data_source_interconnects.go b/oneview/data_source_interconnects.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceInterconnects() *schema.Resource {

diff --git a/oneview/data_source_labels.go b/oneview/data_source_labels.go
@@ -13,7 +13,7 @@ package oneview
 
 import (
 	"github.com/HewlettPackard/oneview-golang/utils"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceLabel() *schema.Resource {

diff --git a/oneview/data_source_labels_test.go b/oneview/data_source_labels_test.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"testing"
 )
 

diff --git a/oneview/data_source_logical_enclosure.go b/oneview/data_source_logical_enclosure.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"log"
 )
 

diff --git a/oneview/data_source_logical_enclosure_test.go b/oneview/data_source_logical_enclosure_test.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"testing"
 )
 

diff --git a/oneview/data_source_logical_interconnect.go b/oneview/data_source_logical_interconnect.go
@@ -13,7 +13,7 @@ package oneview
 
 import (
 	"github.com/HewlettPackard/oneview-golang/ov"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceLogicalInterconnect() *schema.Resource {

diff --git a/oneview/data_source_logical_interconnect_group.go b/oneview/data_source_logical_interconnect_group.go
@@ -16,7 +16,7 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceLogicalInterconnectGroup() *schema.Resource {

diff --git a/oneview/data_source_logical_interconnect_group_test.go b/oneview/data_source_logical_interconnect_group_test.go
@@ -12,7 +12,7 @@
 package oneview
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"testing"
 )