012sdkupgrade

go.mod

@@ -1,9 +1,12 @@
 module github.com/terraform-providers/terraform-provider-ovh
 
 require (
+	github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.0
-	github.com/hashicorp/terraform v0.0.0-20190227065421-fc531f54a878
-	github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747
+	github.com/hashicorp/terraform v0.12.0-rc1
+	github.com/mitchellh/go-homedir v1.0.0
 	github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014
+	github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 // indirect
+	github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c // indirect
 	gopkg.in/ini.v1 v1.42.0
 )

ovh/resource_ovh_publiccloud_private_network_subnet_test.go

@@ -10,28 +10,28 @@ import (
 )
 
 var testAccPublicCloudPrivateNetworkSubnetConfig = fmt.Sprintf(`
-resource "ovh_vrack_publiccloud_attachment" "attach" {
+resource "ovh_vrack_cloudproject" "attach" {
   vrack_id   = "%s"
   project_id = "%s"
 }
 
-data "ovh_publiccloud_regions" "regions" {
-  project_id = "${ovh_vrack_publiccloud_attachment.attach.project_id}"
+data "ovh_cloud_regions" "regions" {
+  project_id = ovh_vrack_cloudproject.attach.project_id
 }
 
-resource "ovh_publiccloud_private_network" "network" {
-  project_id  = "${ovh_vrack_publiccloud_attachment.attach.project_id}"
-  vlan_id     = 0
-  name        = "terraform_testacc_private_net"
-  regions     = ["${data.ovh_publiccloud_regions.regions.names}"]
+resource "ovh_cloud_network_private" "network" {
+  project_id = ovh_vrack_cloudproject.attach.project_id
+  vlan_id    = 0
+  name       = "terraform_testacc_private_net"
+  regions    = tolist(data.ovh_cloud_regions.regions.names)
 }
 
-resource "ovh_publiccloud_private_network_subnet" "subnet" {
-  project_id = "${ovh_publiccloud_private_network.network.project_id}"
-  network_id = "${ovh_publiccloud_private_network.network.id}"
+resource "ovh_cloud_network_private_subnet" "subnet" {
+  project_id = ovh_cloud_network_private.network.project_id
+  network_id = ovh_cloud_network_private.network.id
 
   # whatever region, for test purpose
-  region     = "${element(sort(data.ovh_publiccloud_regions.regions.names), 0)}"
+  region     = element(tolist(sort(data.ovh_cloud_regions.regions.names)), 0)
   start      = "192.168.168.100"
   end        = "192.168.168.200"
   network    = "192.168.168.0/24"
@@ -49,9 +49,9 @@ func TestAccPublicCloudPrivateNetworkSubnet_basic(t *testing.T) {
 			{
 				Config: testAccPublicCloudPrivateNetworkSubnetConfig,
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckVRackPublicCloudAttachmentExists("ovh_vrack_publiccloud_attachment.attach", t),
-					testAccCheckPublicCloudPrivateNetworkExists("ovh_publiccloud_private_network.network", t),
-					testAccCheckPublicCloudPrivateNetworkSubnetExists("ovh_publiccloud_private_network_subnet.subnet", t),
+					testAccCheckVRackPublicCloudAttachmentExists("ovh_vrack_cloudproject.attach", t),
+					testAccCheckPublicCloudPrivateNetworkExists("ovh_cloud_network_private.network", t),
+					testAccCheckPublicCloudPrivateNetworkSubnetExists("ovh_cloud_network_private_subnet.subnet", t),
 				),
 			},
 		},
@@ -96,7 +96,7 @@ func testAccCheckPublicCloudPrivateNetworkSubnetExists(n string, t *testing.T) r
 func testAccCheckPublicCloudPrivateNetworkSubnetDestroy(s *terraform.State) error {
 	config := testAccProvider.Meta().(*Config)
 	for _, rs := range s.RootModule().Resources {
-		if rs.Type != "ovh_publiccloud_private_network_subnet" {
+		if rs.Type != "ovh_cloud_network_private_subnet" {
 			continue
 		}
 

ovh/resource_ovh_publiccloud_private_network_test.go

@@ -13,21 +13,22 @@ import (
 )
 
 var testAccPublicCloudPrivateNetworkConfig = fmt.Sprintf(`
-resource "ovh_vrack_publiccloud_attachment" "attach" {
-  vrack_id = "%s"
+resource "ovh_vrack_cloudproject" "attach" {
+  vrack_id   = "%s"
   project_id = "%s"
 }
 
-data "ovh_publiccloud_regions" "regions" {
-  project_id = "${ovh_vrack_publiccloud_attachment.attach.project_id}"
+data "ovh_cloud_regions" "regions" {
+  project_id = ovh_vrack_cloudproject.attach.project_id
 }
 
-resource "ovh_publiccloud_private_network" "network" {
-  project_id  = "${ovh_vrack_publiccloud_attachment.attach.project_id}"
-  vlan_id = 0
-  name = "terraform_testacc_private_net"
-  regions     = ["${data.ovh_publiccloud_regions.regions.names}"]
+resource "ovh_cloud_network_private" "network" {
+  project_id = ovh_vrack_cloudproject.attach.project_id
+  vlan_id    = 0
+  name       = "terraform_testacc_private_net"
+  regions    = tolist(data.ovh_cloud_regions.regions.names)
 }
+
 `, os.Getenv("OVH_VRACK"), os.Getenv("OVH_PUBLIC_CLOUD"))
 
 func init() {
@@ -111,8 +112,8 @@ func TestAccPublicCloudPrivateNetwork_basic(t *testing.T) {
 			{
 				Config: testAccPublicCloudPrivateNetworkConfig,
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckVRackPublicCloudAttachmentExists("ovh_vrack_publiccloud_attachment.attach", t),
-					testAccCheckPublicCloudPrivateNetworkExists("ovh_publiccloud_private_network.network", t),
+					testAccCheckVRackPublicCloudAttachmentExists("ovh_vrack_cloudproject.attach", t),
+					testAccCheckPublicCloudPrivateNetworkExists("ovh_cloud_network_private.network", t),
 				),
 			},
 		},
@@ -148,7 +149,7 @@ func testAccCheckPublicCloudPrivateNetworkExists(n string, t *testing.T) resourc
 func testAccCheckPublicCloudPrivateNetworkDestroy(s *terraform.State) error {
 	config := testAccProvider.Meta().(*Config)
 	for _, rs := range s.RootModule().Resources {
-		if rs.Type != "ovh_publiccloud_private_network" {
+		if rs.Type != "ovh_cloud_network_private" {
 			continue
 		}