vmware: refactoring the embedded sdk to include the api version

internal/services/vmware/client/client.go

@@ -2,9 +2,9 @@ package client
 
 import (
 	"github.com/hashicorp/terraform-provider-azurerm/internal/common"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/authorizations"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/clusters"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/privateclouds"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/2020-03-20/authorizations"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/2020-03-20/clusters"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/2020-03-20/privateclouds"
 )
 
 type Client struct {

internal/services/vmware/validate/cluster_id.go

@@ -3,7 +3,7 @@ package validate
 import (
 	"fmt"
 
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/clusters"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/2020-03-20/clusters"
 )
 
 func ClusterID(input interface{}, key string) (warnings []string, errors []error) {

internal/services/vmware/validate/express_route_authorization_id.go

@@ -3,7 +3,7 @@ package validate
 import (
 	"fmt"
 
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/authorizations"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/2020-03-20/authorizations"
 )
 
 func ExpressRouteAuthorizationID(input interface{}, key string) (warnings []string, errors []error) {

internal/services/vmware/validate/private_cloud_id.go

@@ -3,7 +3,7 @@ package validate
 import (
 	"fmt"
 
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/privateclouds"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/2020-03-20/privateclouds"
 )
 
 func PrivateCloudID(input interface{}, key string) (warnings []string, errors []error) {

internal/services/vmware/vmware_cluster_resource.go

@@ -5,12 +5,12 @@ import (
 	"log"
 	"time"
 
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/privateclouds"
+	clusters2 "github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/2020-03-20/clusters"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/2020-03-20/privateclouds"
 
 	"github.com/hashicorp/go-azure-helpers/response"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/clusters"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/validate"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
@@ -33,7 +33,7 @@ func resourceVmwareCluster() *pluginsdk.Resource {
 		},
 
 		Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error {
-			_, err := clusters.ParseClusterID(id)
+			_, err := clusters2.ParseClusterID(id)
 			return err
 		}),
 
@@ -97,7 +97,7 @@ func resourceVmwareClusterCreate(d *pluginsdk.ResourceData, meta interface{}) er
 		return err
 	}
 
-	id := clusters.NewClusterID(subscriptionId, privateCloudId.ResourceGroup, privateCloudId.Name, name)
+	id := clusters2.NewClusterID(subscriptionId, privateCloudId.ResourceGroup, privateCloudId.Name, name)
 	existing, err := client.Get(ctx, id)
 	if err != nil {
 		if !response.WasNotFound(existing.HttpResponse) {
@@ -108,11 +108,11 @@ func resourceVmwareClusterCreate(d *pluginsdk.ResourceData, meta interface{}) er
 		return tf.ImportAsExistsError("azurerm_vmware_cluster", id.ID())
 	}
 
-	cluster := clusters.Cluster{
-		Sku: clusters.Sku{
+	cluster := clusters2.Cluster{
+		Sku: clusters2.Sku{
 			Name: d.Get("sku_name").(string),
 		},
-		Properties: clusters.ClusterProperties{
+		Properties: clusters2.ClusterProperties{
 			ClusterSize: int64(d.Get("cluster_node_count").(int)),
 		},
 	}
@@ -130,7 +130,7 @@ func resourceVmwareClusterRead(d *pluginsdk.ResourceData, meta interface{}) erro
 	ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id, err := clusters.ParseClusterID(d.Id())
+	id, err := clusters2.ParseClusterID(d.Id())
 	if err != nil {
 		return err
 	}
@@ -163,13 +163,13 @@ func resourceVmwareClusterUpdate(d *pluginsdk.ResourceData, meta interface{}) er
 	ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id, err := clusters.ParseClusterID(d.Id())
+	id, err := clusters2.ParseClusterID(d.Id())
 	if err != nil {
 		return err
 	}
 
-	clusterUpdate := clusters.ClusterUpdate{
-		Properties: &clusters.ClusterUpdateProperties{},
+	clusterUpdate := clusters2.ClusterUpdate{
+		Properties: &clusters2.ClusterUpdateProperties{},
 	}
 	if d.HasChange("cluster_node_count") {
 		clusterUpdate.Properties.ClusterSize = utils.Int64(int64(d.Get("cluster_node_count").(int)))
@@ -186,7 +186,7 @@ func resourceVmwareClusterDelete(d *pluginsdk.ResourceData, meta interface{}) er
 	ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id, err := clusters.ParseClusterID(d.Id())
+	id, err := clusters2.ParseClusterID(d.Id())
 	if err != nil {
 		return err
 	}

internal/services/vmware/vmware_cluster_resource_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/clusters"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/2020-03-20/clusters"
 
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"

internal/services/vmware/vmware_express_route_authorization_resource.go

@@ -5,11 +5,12 @@ import (
 	"log"
 	"time"
 
+	authorizations2 "github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/2020-03-20/authorizations"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/2020-03-20/privateclouds"
+
 	"github.com/hashicorp/go-azure-helpers/response"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/authorizations"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/privateclouds"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/validate"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
@@ -29,7 +30,7 @@ func resourceVmwareExpressRouteAuthorization() *pluginsdk.Resource {
 		},
 
 		Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error {
-			_, err := authorizations.ParseAuthorizationID(id)
+			_, err := authorizations2.ParseAuthorizationID(id)
 			return err
 		}),
 
@@ -74,7 +75,7 @@ func resourceVmwareExpressRouteAuthorizationCreate(d *pluginsdk.ResourceData, me
 		return err
 	}
 
-	id := authorizations.NewAuthorizationID(subscriptionId, privateCloudId.ResourceGroup, privateCloudId.Name, name)
+	id := authorizations2.NewAuthorizationID(subscriptionId, privateCloudId.ResourceGroup, privateCloudId.Name, name)
 	existing, err := client.Get(ctx, id)
 	if err != nil {
 		if !response.WasNotFound(existing.HttpResponse) {
@@ -85,7 +86,7 @@ func resourceVmwareExpressRouteAuthorizationCreate(d *pluginsdk.ResourceData, me
 		return tf.ImportAsExistsError("azurerm_vmware_express_route_authorization", id.ID())
 	}
 
-	props := authorizations.ExpressRouteAuthorization{}
+	props := authorizations2.ExpressRouteAuthorization{}
 
 	if err := client.CreateOrUpdateThenPoll(ctx, id, props); err != nil {
 		return fmt.Errorf("creating %q: %+v", id, err)
@@ -101,7 +102,7 @@ func resourceVmwareExpressRouteAuthorizationRead(d *pluginsdk.ResourceData, meta
 	ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id, err := authorizations.ParseAuthorizationID(d.Id())
+	id, err := authorizations2.ParseAuthorizationID(d.Id())
 	if err != nil {
 		return err
 	}
@@ -135,7 +136,7 @@ func resourceVmwareExpressRouteAuthorizationDelete(d *pluginsdk.ResourceData, me
 	ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id, err := authorizations.ParseAuthorizationID(d.Id())
+	id, err := authorizations2.ParseAuthorizationID(d.Id())
 	if err != nil {
 		return err
 	}

internal/services/vmware/vmware_express_route_authorization_resource_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/authorizations"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/2020-03-20/authorizations"
 
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"

internal/services/vmware/vmware_private_cloud.go

@@ -1,11 +1,11 @@
 package vmware
 
 import (
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/privateclouds"
+	privateclouds2 "github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/2020-03-20/privateclouds"
 	"github.com/hashicorp/terraform-provider-azurerm/utils"
 )
 
-func flattenPrivateCloudManagementCluster(input privateclouds.ManagementCluster) []interface{} {
+func flattenPrivateCloudManagementCluster(input privateclouds2.ManagementCluster) []interface{} {
 	return []interface{}{
 		map[string]interface{}{
 			"size":  input.ClusterSize,
@@ -15,7 +15,7 @@ func flattenPrivateCloudManagementCluster(input privateclouds.ManagementCluster)
 	}
 }
 
-func flattenPrivateCloudCircuit(input *privateclouds.Circuit) []interface{} {
+func flattenPrivateCloudCircuit(input *privateclouds2.Circuit) []interface{} {
 	if input == nil {
 		return make([]interface{}, 0)
 	}

internal/services/vmware/vmware_private_cloud_data_source.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/go-azure-helpers/response"
+	privateclouds2 "github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/2020-03-20/privateclouds"
 
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/privateclouds"
+	"github.com/hashicorp/go-azure-helpers/response"
 
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
@@ -157,7 +157,7 @@ func dataSourceVmwarePrivateCloudRead(d *pluginsdk.ResourceData, meta interface{
 	name := d.Get("name").(string)
 	resourceGroup := d.Get("resource_group_name").(string)
 
-	id := privateclouds.NewPrivateCloudID(subscriptionId, resourceGroup, name)
+	id := privateclouds2.NewPrivateCloudID(subscriptionId, resourceGroup, name)
 	resp, err := client.Get(ctx, id)
 	if err != nil {
 		if response.WasNotFound(resp.HttpResponse) {
@@ -184,7 +184,7 @@ func dataSourceVmwarePrivateCloudRead(d *pluginsdk.ResourceData, meta interface{
 
 		internetConnectionEnabled := false
 		if props.Internet != nil {
-			internetConnectionEnabled = *props.Internet == privateclouds.InternetEnumEnabled
+			internetConnectionEnabled = *props.Internet == privateclouds2.InternetEnumEnabled
 		}
 
 		d.Set("internet_connection_enabled", internetConnectionEnabled)

internal/services/vmware/vmware_private_cloud_resource.go

@@ -5,12 +5,13 @@ import (
 	"log"
 	"time"
 
+	privateclouds2 "github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/2020-03-20/privateclouds"
+
 	"github.com/hashicorp/go-azure-helpers/response"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/location"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/privateclouds"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tags"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
@@ -33,7 +34,7 @@ func resourceVmwarePrivateCloud() *pluginsdk.Resource {
 		},
 
 		Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error {
-			_, err := privateclouds.ParsePrivateCloudID(id)
+			_, err := privateclouds2.ParsePrivateCloudID(id)
 			return err
 		}),
 
@@ -196,7 +197,7 @@ func resourceVmwarePrivateCloudCreate(d *pluginsdk.ResourceData, meta interface{
 	ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id := privateclouds.NewPrivateCloudID(subscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string))
+	id := privateclouds2.NewPrivateCloudID(subscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string))
 	existing, err := client.Get(ctx, id)
 	if err != nil {
 		if !response.WasNotFound(existing.HttpResponse) {
@@ -207,18 +208,18 @@ func resourceVmwarePrivateCloudCreate(d *pluginsdk.ResourceData, meta interface{
 		return tf.ImportAsExistsError("azurerm_vmware_private_cloud", id.ID())
 	}
 
-	internet := privateclouds.InternetEnumDisabled
+	internet := privateclouds2.InternetEnumDisabled
 	if d.Get("internet_connection_enabled").(bool) {
-		internet = privateclouds.InternetEnumEnabled
+		internet = privateclouds2.InternetEnumEnabled
 	}
 
-	privateCloud := privateclouds.PrivateCloud{
+	privateCloud := privateclouds2.PrivateCloud{
 		Location: location.Normalize(d.Get("location").(string)),
-		Sku: privateclouds.Sku{
+		Sku: privateclouds2.Sku{
 			Name: d.Get("sku_name").(string),
 		},
-		Properties: privateclouds.PrivateCloudProperties{
-			ManagementCluster: privateclouds.ManagementCluster{
+		Properties: privateclouds2.PrivateCloudProperties{
+			ManagementCluster: privateclouds2.ManagementCluster{
 				ClusterSize: int64(d.Get("management_cluster.0.size").(int)),
 			},
 			NetworkBlock:    d.Get("network_subnet_cidr").(string),
@@ -242,7 +243,7 @@ func resourceVmwarePrivateCloudRead(d *pluginsdk.ResourceData, meta interface{})
 	ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id, err := privateclouds.ParsePrivateCloudID(d.Id())
+	id, err := privateclouds2.ParsePrivateCloudID(d.Id())
 	if err != nil {
 		return err
 	}
@@ -274,7 +275,7 @@ func resourceVmwarePrivateCloudRead(d *pluginsdk.ResourceData, meta interface{})
 
 		internetConnectionEnabled := false
 		if props.Internet != nil {
-			internetConnectionEnabled = *props.Internet == privateclouds.InternetEnumEnabled
+			internetConnectionEnabled = *props.Internet == privateclouds2.InternetEnumEnabled
 		}
 		d.Set("internet_connection_enabled", internetConnectionEnabled)
 
@@ -302,29 +303,29 @@ func resourceVmwarePrivateCloudUpdate(d *pluginsdk.ResourceData, meta interface{
 	ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id, err := privateclouds.ParsePrivateCloudID(d.Id())
+	id, err := privateclouds2.ParsePrivateCloudID(d.Id())
 	if err != nil {
 		return err
 	}
 
-	privateCloudUpdate := privateclouds.PrivateCloudUpdate{
-		Properties: &privateclouds.PrivateCloudUpdateProperties{},
+	privateCloudUpdate := privateclouds2.PrivateCloudUpdate{
+		Properties: &privateclouds2.PrivateCloudUpdateProperties{},
 	}
 
 	if d.HasChange("management_cluster") && d.HasChange("internet_connection_enabled") {
 		return fmt.Errorf("`management_cluster.0.size` and `internet_connection_enabled` could not be changed together")
 	}
 
 	if d.HasChange("management_cluster") {
-		privateCloudUpdate.Properties.ManagementCluster = &privateclouds.ManagementCluster{
+		privateCloudUpdate.Properties.ManagementCluster = &privateclouds2.ManagementCluster{
 			ClusterSize: int64(d.Get("management_cluster.0.size").(int)),
 		}
 	}
 
 	if d.HasChange("internet_connection_enabled") {
-		internet := privateclouds.InternetEnumDisabled
+		internet := privateclouds2.InternetEnumDisabled
 		if d.Get("internet_connection_enabled").(bool) {
-			internet = privateclouds.InternetEnumEnabled
+			internet = privateclouds2.InternetEnumEnabled
 		}
 		privateCloudUpdate.Properties.Internet = &internet
 	}
@@ -345,7 +346,7 @@ func resourceVmwarePrivateCloudDelete(d *pluginsdk.ResourceData, meta interface{
 	ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id, err := privateclouds.ParsePrivateCloudID(d.Id())
+	id, err := privateclouds2.ParsePrivateCloudID(d.Id())
 	if err != nil {
 		return err
 	}

internal/services/vmware/vmware_private_cloud_resource_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/privateclouds"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/2020-03-20/privateclouds"
 
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"