diff --git a/internal/services/analysisservices/analysis_services_server_resource.go b/internal/services/analysisservices/analysis_services_server_resource.go index 1cc4e4c8e996..f00560ea5980 100644 --- a/internal/services/analysisservices/analysis_services_server_resource.go +++ b/internal/services/analysisservices/analysis_services_server_resource.go @@ -13,7 +13,7 @@ import ( azValidate "github.com/hashicorp/terraform-provider-azurerm/helpers/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" "github.com/hashicorp/terraform-provider-azurerm/internal/location" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/analysisservices/sdk/servers" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/analysisservices/sdk/2017-08-01/servers" "github.com/hashicorp/terraform-provider-azurerm/internal/services/analysisservices/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tags" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" diff --git a/internal/services/analysisservices/analysis_services_server_resource_test.go b/internal/services/analysisservices/analysis_services_server_resource_test.go index 1d8ea65cfcd1..c3ff2d89f62c 100644 --- a/internal/services/analysisservices/analysis_services_server_resource_test.go +++ b/internal/services/analysisservices/analysis_services_server_resource_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/analysisservices/sdk/servers" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/analysisservices/sdk/2017-08-01/servers" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/utils" ) diff --git a/internal/services/analysisservices/client/client.go b/internal/services/analysisservices/client/client.go index 3997ff2c8071..657531ad59dd 100644 --- a/internal/services/analysisservices/client/client.go +++ b/internal/services/analysisservices/client/client.go @@ -2,7 +2,7 @@ package client import ( "github.com/hashicorp/terraform-provider-azurerm/internal/common" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/analysisservices/sdk/servers" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/analysisservices/sdk/2017-08-01/servers" ) type Client struct { diff --git a/internal/services/analysisservices/sdk/servers/client.go b/internal/services/analysisservices/sdk/2017-08-01/servers/client.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/client.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/client.go diff --git a/internal/services/analysisservices/sdk/servers/constants.go b/internal/services/analysisservices/sdk/2017-08-01/servers/constants.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/constants.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/constants.go diff --git a/internal/services/analysisservices/sdk/servers/id_location.go b/internal/services/analysisservices/sdk/2017-08-01/servers/id_location.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/id_location.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/id_location.go diff --git a/internal/services/analysisservices/sdk/servers/id_location_test.go b/internal/services/analysisservices/sdk/2017-08-01/servers/id_location_test.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/id_location_test.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/id_location_test.go diff --git a/internal/services/analysisservices/sdk/servers/id_operationstatuse.go b/internal/services/analysisservices/sdk/2017-08-01/servers/id_operationstatuse.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/id_operationstatuse.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/id_operationstatuse.go diff --git a/internal/services/analysisservices/sdk/servers/id_operationstatuse_test.go b/internal/services/analysisservices/sdk/2017-08-01/servers/id_operationstatuse_test.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/id_operationstatuse_test.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/id_operationstatuse_test.go diff --git a/internal/services/analysisservices/sdk/servers/id_resourcegroup.go b/internal/services/analysisservices/sdk/2017-08-01/servers/id_resourcegroup.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/id_resourcegroup.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/id_resourcegroup.go diff --git a/internal/services/analysisservices/sdk/servers/id_resourcegroup_test.go b/internal/services/analysisservices/sdk/2017-08-01/servers/id_resourcegroup_test.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/id_resourcegroup_test.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/id_resourcegroup_test.go diff --git a/internal/services/analysisservices/sdk/servers/id_server.go b/internal/services/analysisservices/sdk/2017-08-01/servers/id_server.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/id_server.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/id_server.go diff --git a/internal/services/analysisservices/sdk/servers/id_server_test.go b/internal/services/analysisservices/sdk/2017-08-01/servers/id_server_test.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/id_server_test.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/id_server_test.go diff --git a/internal/services/analysisservices/sdk/servers/id_subscription.go b/internal/services/analysisservices/sdk/2017-08-01/servers/id_subscription.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/id_subscription.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/id_subscription.go diff --git a/internal/services/analysisservices/sdk/servers/id_subscription_test.go b/internal/services/analysisservices/sdk/2017-08-01/servers/id_subscription_test.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/id_subscription_test.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/id_subscription_test.go diff --git a/internal/services/analysisservices/sdk/servers/method_checknameavailability_autorest.go b/internal/services/analysisservices/sdk/2017-08-01/servers/method_checknameavailability_autorest.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/method_checknameavailability_autorest.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/method_checknameavailability_autorest.go diff --git a/internal/services/analysisservices/sdk/servers/method_create_autorest.go b/internal/services/analysisservices/sdk/2017-08-01/servers/method_create_autorest.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/method_create_autorest.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/method_create_autorest.go diff --git a/internal/services/analysisservices/sdk/servers/method_delete_autorest.go b/internal/services/analysisservices/sdk/2017-08-01/servers/method_delete_autorest.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/method_delete_autorest.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/method_delete_autorest.go diff --git a/internal/services/analysisservices/sdk/servers/method_dissociategateway_autorest.go b/internal/services/analysisservices/sdk/2017-08-01/servers/method_dissociategateway_autorest.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/method_dissociategateway_autorest.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/method_dissociategateway_autorest.go diff --git a/internal/services/analysisservices/sdk/servers/method_getdetails_autorest.go b/internal/services/analysisservices/sdk/2017-08-01/servers/method_getdetails_autorest.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/method_getdetails_autorest.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/method_getdetails_autorest.go diff --git a/internal/services/analysisservices/sdk/servers/method_list_autorest.go b/internal/services/analysisservices/sdk/2017-08-01/servers/method_list_autorest.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/method_list_autorest.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/method_list_autorest.go diff --git a/internal/services/analysisservices/sdk/servers/method_listbyresourcegroup_autorest.go b/internal/services/analysisservices/sdk/2017-08-01/servers/method_listbyresourcegroup_autorest.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/method_listbyresourcegroup_autorest.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/method_listbyresourcegroup_autorest.go diff --git a/internal/services/analysisservices/sdk/servers/method_listgatewaystatus_autorest.go b/internal/services/analysisservices/sdk/2017-08-01/servers/method_listgatewaystatus_autorest.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/method_listgatewaystatus_autorest.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/method_listgatewaystatus_autorest.go diff --git a/internal/services/analysisservices/sdk/servers/method_listoperationstatuses_autorest.go b/internal/services/analysisservices/sdk/2017-08-01/servers/method_listoperationstatuses_autorest.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/method_listoperationstatuses_autorest.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/method_listoperationstatuses_autorest.go diff --git a/internal/services/analysisservices/sdk/servers/method_listskusforexisting_autorest.go b/internal/services/analysisservices/sdk/2017-08-01/servers/method_listskusforexisting_autorest.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/method_listskusforexisting_autorest.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/method_listskusforexisting_autorest.go diff --git a/internal/services/analysisservices/sdk/servers/method_resume_autorest.go b/internal/services/analysisservices/sdk/2017-08-01/servers/method_resume_autorest.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/method_resume_autorest.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/method_resume_autorest.go diff --git a/internal/services/analysisservices/sdk/servers/method_suspend_autorest.go b/internal/services/analysisservices/sdk/2017-08-01/servers/method_suspend_autorest.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/method_suspend_autorest.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/method_suspend_autorest.go diff --git a/internal/services/analysisservices/sdk/servers/method_update_autorest.go b/internal/services/analysisservices/sdk/2017-08-01/servers/method_update_autorest.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/method_update_autorest.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/method_update_autorest.go diff --git a/internal/services/analysisservices/sdk/servers/model_analysisservicesserver.go b/internal/services/analysisservices/sdk/2017-08-01/servers/model_analysisservicesserver.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/model_analysisservicesserver.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/model_analysisservicesserver.go diff --git a/internal/services/analysisservices/sdk/servers/model_analysisservicesservermutableproperties.go b/internal/services/analysisservices/sdk/2017-08-01/servers/model_analysisservicesservermutableproperties.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/model_analysisservicesservermutableproperties.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/model_analysisservicesservermutableproperties.go diff --git a/internal/services/analysisservices/sdk/servers/model_analysisservicesserverproperties.go b/internal/services/analysisservices/sdk/2017-08-01/servers/model_analysisservicesserverproperties.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/model_analysisservicesserverproperties.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/model_analysisservicesserverproperties.go diff --git a/internal/services/analysisservices/sdk/servers/model_analysisservicesservers.go b/internal/services/analysisservices/sdk/2017-08-01/servers/model_analysisservicesservers.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/model_analysisservicesservers.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/model_analysisservicesservers.go diff --git a/internal/services/analysisservices/sdk/servers/model_analysisservicesserverupdateparameters.go b/internal/services/analysisservices/sdk/2017-08-01/servers/model_analysisservicesserverupdateparameters.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/model_analysisservicesserverupdateparameters.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/model_analysisservicesserverupdateparameters.go diff --git a/internal/services/analysisservices/sdk/servers/model_checkservernameavailabilityparameters.go b/internal/services/analysisservices/sdk/2017-08-01/servers/model_checkservernameavailabilityparameters.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/model_checkservernameavailabilityparameters.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/model_checkservernameavailabilityparameters.go diff --git a/internal/services/analysisservices/sdk/servers/model_checkservernameavailabilityresult.go b/internal/services/analysisservices/sdk/2017-08-01/servers/model_checkservernameavailabilityresult.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/model_checkservernameavailabilityresult.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/model_checkservernameavailabilityresult.go diff --git a/internal/services/analysisservices/sdk/servers/model_erroradditionalinfo.go b/internal/services/analysisservices/sdk/2017-08-01/servers/model_erroradditionalinfo.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/model_erroradditionalinfo.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/model_erroradditionalinfo.go diff --git a/internal/services/analysisservices/sdk/servers/model_errordetail.go b/internal/services/analysisservices/sdk/2017-08-01/servers/model_errordetail.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/model_errordetail.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/model_errordetail.go diff --git a/internal/services/analysisservices/sdk/servers/model_gatewaydetails.go b/internal/services/analysisservices/sdk/2017-08-01/servers/model_gatewaydetails.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/model_gatewaydetails.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/model_gatewaydetails.go diff --git a/internal/services/analysisservices/sdk/servers/model_gatewayliststatuslive.go b/internal/services/analysisservices/sdk/2017-08-01/servers/model_gatewayliststatuslive.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/model_gatewayliststatuslive.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/model_gatewayliststatuslive.go diff --git a/internal/services/analysisservices/sdk/servers/model_ipv4firewallrule.go b/internal/services/analysisservices/sdk/2017-08-01/servers/model_ipv4firewallrule.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/model_ipv4firewallrule.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/model_ipv4firewallrule.go diff --git a/internal/services/analysisservices/sdk/servers/model_ipv4firewallsettings.go b/internal/services/analysisservices/sdk/2017-08-01/servers/model_ipv4firewallsettings.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/model_ipv4firewallsettings.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/model_ipv4firewallsettings.go diff --git a/internal/services/analysisservices/sdk/servers/model_operationstatus.go b/internal/services/analysisservices/sdk/2017-08-01/servers/model_operationstatus.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/model_operationstatus.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/model_operationstatus.go diff --git a/internal/services/analysisservices/sdk/servers/model_resourcesku.go b/internal/services/analysisservices/sdk/2017-08-01/servers/model_resourcesku.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/model_resourcesku.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/model_resourcesku.go diff --git a/internal/services/analysisservices/sdk/servers/model_serveradministrators.go b/internal/services/analysisservices/sdk/2017-08-01/servers/model_serveradministrators.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/model_serveradministrators.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/model_serveradministrators.go diff --git a/internal/services/analysisservices/sdk/servers/model_skudetailsforexistingresource.go b/internal/services/analysisservices/sdk/2017-08-01/servers/model_skudetailsforexistingresource.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/model_skudetailsforexistingresource.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/model_skudetailsforexistingresource.go diff --git a/internal/services/analysisservices/sdk/servers/model_skuenumerationforexistingresourceresult.go b/internal/services/analysisservices/sdk/2017-08-01/servers/model_skuenumerationforexistingresourceresult.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/model_skuenumerationforexistingresourceresult.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/model_skuenumerationforexistingresourceresult.go diff --git a/internal/services/analysisservices/sdk/servers/version.go b/internal/services/analysisservices/sdk/2017-08-01/servers/version.go similarity index 100% rename from internal/services/analysisservices/sdk/servers/version.go rename to internal/services/analysisservices/sdk/2017-08-01/servers/version.go diff --git a/internal/services/analysisservices/validate/querypool_connection_mode.go b/internal/services/analysisservices/validate/querypool_connection_mode.go index b9c2d7776163..0cfb15fa691d 100644 --- a/internal/services/analysisservices/validate/querypool_connection_mode.go +++ b/internal/services/analysisservices/validate/querypool_connection_mode.go @@ -1,7 +1,7 @@ package validate import ( - "github.com/hashicorp/terraform-provider-azurerm/internal/services/analysisservices/sdk/servers" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/analysisservices/sdk/2017-08-01/servers" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation" ) diff --git a/internal/services/analysisservices/validate/server_id.go b/internal/services/analysisservices/validate/server_id.go index 830c02b5e22c..313b91d11c42 100644 --- a/internal/services/analysisservices/validate/server_id.go +++ b/internal/services/analysisservices/validate/server_id.go @@ -3,7 +3,7 @@ package validate import ( "fmt" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/analysisservices/sdk/servers" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/analysisservices/sdk/2017-08-01/servers" ) func ServerID(input interface{}, key string) (warnings []string, errors []error) { diff --git a/internal/services/appconfiguration/app_configuration_data_source.go b/internal/services/appconfiguration/app_configuration_data_source.go index d1f751674e47..1e47abb153ed 100644 --- a/internal/services/appconfiguration/app_configuration_data_source.go +++ b/internal/services/appconfiguration/app_configuration_data_source.go @@ -4,11 +4,12 @@ import ( "fmt" "time" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/appconfiguration/sdk/2020-06-01/configurationstores" + "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-provider-azurerm/helpers/azure" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" "github.com/hashicorp/terraform-provider-azurerm/internal/location" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/appconfiguration/sdk/configurationstores" "github.com/hashicorp/terraform-provider-azurerm/internal/services/appconfiguration/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tags" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" diff --git a/internal/services/appconfiguration/app_configuration_resource.go b/internal/services/appconfiguration/app_configuration_resource.go index 88ceb13b8323..8fb08662ed19 100644 --- a/internal/services/appconfiguration/app_configuration_resource.go +++ b/internal/services/appconfiguration/app_configuration_resource.go @@ -12,7 +12,7 @@ import ( "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/appconfiguration/sdk/configurationstores" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/appconfiguration/sdk/2020-06-01/configurationstores" "github.com/hashicorp/terraform-provider-azurerm/internal/services/appconfiguration/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tags" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" diff --git a/internal/services/appconfiguration/app_configuration_resource_test.go b/internal/services/appconfiguration/app_configuration_resource_test.go index 1a710f2c8ed1..67bf3ebb2c27 100644 --- a/internal/services/appconfiguration/app_configuration_resource_test.go +++ b/internal/services/appconfiguration/app_configuration_resource_test.go @@ -5,10 +5,11 @@ import ( "fmt" "testing" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/appconfiguration/sdk/2020-06-01/configurationstores" + "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/appconfiguration/sdk/configurationstores" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/utils" ) diff --git a/internal/services/appconfiguration/client/client.go b/internal/services/appconfiguration/client/client.go index 98e312a96728..0e2bb6b190f1 100644 --- a/internal/services/appconfiguration/client/client.go +++ b/internal/services/appconfiguration/client/client.go @@ -2,7 +2,7 @@ package client import ( "github.com/hashicorp/terraform-provider-azurerm/internal/common" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/appconfiguration/sdk/configurationstores" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/appconfiguration/sdk/2020-06-01/configurationstores" ) type Client struct { diff --git a/internal/services/appconfiguration/sdk/appconfiguration/client.go b/internal/services/appconfiguration/sdk/1.0/appconfiguration/client.go similarity index 100% rename from internal/services/appconfiguration/sdk/appconfiguration/client.go rename to internal/services/appconfiguration/sdk/1.0/appconfiguration/client.go diff --git a/internal/services/appconfiguration/sdk/appconfiguration/models.go b/internal/services/appconfiguration/sdk/1.0/appconfiguration/models.go similarity index 100% rename from internal/services/appconfiguration/sdk/appconfiguration/models.go rename to internal/services/appconfiguration/sdk/1.0/appconfiguration/models.go diff --git a/internal/services/appconfiguration/sdk/appconfiguration/version.go b/internal/services/appconfiguration/sdk/1.0/appconfiguration/version.go similarity index 100% rename from internal/services/appconfiguration/sdk/appconfiguration/version.go rename to internal/services/appconfiguration/sdk/1.0/appconfiguration/version.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/client.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/client.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/client.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/client.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/constants.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/constants.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/constants.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/constants.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/id_configurationstore.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/id_configurationstore.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/id_configurationstore.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/id_configurationstore.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/id_configurationstore_test.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/id_configurationstore_test.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/id_configurationstore_test.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/id_configurationstore_test.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/method_create_autorest.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/method_create_autorest.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/method_create_autorest.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/method_create_autorest.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/method_delete_autorest.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/method_delete_autorest.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/method_delete_autorest.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/method_delete_autorest.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/method_get_autorest.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/method_get_autorest.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/method_get_autorest.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/method_get_autorest.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/method_listkeys_autorest.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/method_listkeys_autorest.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/method_listkeys_autorest.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/method_listkeys_autorest.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/method_update_autorest.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/method_update_autorest.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/method_update_autorest.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/method_update_autorest.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/model_accesskey.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_accesskey.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/model_accesskey.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_accesskey.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/model_configurationstore.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_configurationstore.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/model_configurationstore.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_configurationstore.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/model_configurationstoreproperties.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_configurationstoreproperties.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/model_configurationstoreproperties.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_configurationstoreproperties.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/model_configurationstorepropertiesupdateparameters.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_configurationstorepropertiesupdateparameters.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/model_configurationstorepropertiesupdateparameters.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_configurationstorepropertiesupdateparameters.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/model_configurationstoreupdateparameters.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_configurationstoreupdateparameters.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/model_configurationstoreupdateparameters.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_configurationstoreupdateparameters.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/model_encryptionproperties.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_encryptionproperties.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/model_encryptionproperties.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_encryptionproperties.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/model_keyvaultproperties.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_keyvaultproperties.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/model_keyvaultproperties.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_keyvaultproperties.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/model_privateendpoint.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_privateendpoint.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/model_privateendpoint.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_privateendpoint.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/model_privateendpointconnection.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_privateendpointconnection.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/model_privateendpointconnection.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_privateendpointconnection.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/model_privateendpointconnectionproperties.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_privateendpointconnectionproperties.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/model_privateendpointconnectionproperties.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_privateendpointconnectionproperties.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/model_privatelinkserviceconnectionstate.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_privatelinkserviceconnectionstate.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/model_privatelinkserviceconnectionstate.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_privatelinkserviceconnectionstate.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/model_resourceidentity.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_resourceidentity.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/model_resourceidentity.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_resourceidentity.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/model_sku.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_sku.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/model_sku.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/model_sku.go diff --git a/internal/services/appconfiguration/sdk/configurationstores/version.go b/internal/services/appconfiguration/sdk/2020-06-01/configurationstores/version.go similarity index 100% rename from internal/services/appconfiguration/sdk/configurationstores/version.go rename to internal/services/appconfiguration/sdk/2020-06-01/configurationstores/version.go diff --git a/internal/services/eventhub/client/client.go b/internal/services/eventhub/client/client.go index 8708848c77d9..5c16fc8980bc 100644 --- a/internal/services/eventhub/client/client.go +++ b/internal/services/eventhub/client/client.go @@ -2,15 +2,15 @@ package client import ( "github.com/hashicorp/terraform-provider-azurerm/internal/common" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/authorizationruleseventhubs" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/authorizationrulesnamespaces" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/checknameavailabilitydisasterrecoveryconfigs" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/consumergroups" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/disasterrecoveryconfigs" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/eventhubs" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/eventhubsclusters" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/namespaces" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/networkrulesets" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/checknameavailabilitydisasterrecoveryconfigs" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/consumergroups" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/eventhubs" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2021-01-01-preview/namespaces" ) type Client struct { diff --git a/internal/services/eventhub/eventhub_authorization_rule_data_source.go b/internal/services/eventhub/eventhub_authorization_rule_data_source.go index 0eea47db8be9..fd93d9f97a43 100644 --- a/internal/services/eventhub/eventhub_authorization_rule_data_source.go +++ b/internal/services/eventhub/eventhub_authorization_rule_data_source.go @@ -4,11 +4,12 @@ import ( "fmt" "time" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/eventhubs" + "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-provider-azurerm/helpers/azure" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/authorizationruleseventhubs" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/eventhubs" "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/internal/timeouts" diff --git a/internal/services/eventhub/eventhub_authorization_rule_resource.go b/internal/services/eventhub/eventhub_authorization_rule_resource.go index c417e1b935e1..9410a0c81e22 100644 --- a/internal/services/eventhub/eventhub_authorization_rule_resource.go +++ b/internal/services/eventhub/eventhub_authorization_rule_resource.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-azurerm/helpers/tf" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" "github.com/hashicorp/terraform-provider-azurerm/internal/locks" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/authorizationruleseventhubs" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/eventhubs" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/eventhubs" "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/internal/timeouts" diff --git a/internal/services/eventhub/eventhub_authorization_rule_resource_test.go b/internal/services/eventhub/eventhub_authorization_rule_resource_test.go index fad1ebb5a738..3be5f7ee0423 100644 --- a/internal/services/eventhub/eventhub_authorization_rule_resource_test.go +++ b/internal/services/eventhub/eventhub_authorization_rule_resource_test.go @@ -6,10 +6,11 @@ import ( "strconv" "testing" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/eventhubs" + "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/eventhubs" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/utils" ) diff --git a/internal/services/eventhub/eventhub_cluster_data_source.go b/internal/services/eventhub/eventhub_cluster_data_source.go index 4559afb1f217..4ee4feb526dd 100644 --- a/internal/services/eventhub/eventhub_cluster_data_source.go +++ b/internal/services/eventhub/eventhub_cluster_data_source.go @@ -4,11 +4,12 @@ import ( "fmt" "time" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters" + "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-provider-azurerm/helpers/azure" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" "github.com/hashicorp/terraform-provider-azurerm/internal/location" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/eventhubsclusters" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/internal/timeouts" ) diff --git a/internal/services/eventhub/eventhub_cluster_resource.go b/internal/services/eventhub/eventhub_cluster_resource.go index 9c7c74e28e3f..a7095704cc43 100644 --- a/internal/services/eventhub/eventhub_cluster_resource.go +++ b/internal/services/eventhub/eventhub_cluster_resource.go @@ -12,7 +12,7 @@ import ( "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/eventhub/sdk/eventhubsclusters" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters" "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tags" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" diff --git a/internal/services/eventhub/eventhub_cluster_resource_test.go b/internal/services/eventhub/eventhub_cluster_resource_test.go index 4c7626bff0d2..fb494aad9deb 100644 --- a/internal/services/eventhub/eventhub_cluster_resource_test.go +++ b/internal/services/eventhub/eventhub_cluster_resource_test.go @@ -5,10 +5,11 @@ import ( "fmt" "testing" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters" + "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/eventhubsclusters" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/utils" ) diff --git a/internal/services/eventhub/eventhub_consumer_group_data_source.go b/internal/services/eventhub/eventhub_consumer_group_data_source.go index 196379b97d85..e04a007df597 100644 --- a/internal/services/eventhub/eventhub_consumer_group_data_source.go +++ b/internal/services/eventhub/eventhub_consumer_group_data_source.go @@ -4,10 +4,11 @@ import ( "fmt" "time" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/consumergroups" + "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-provider-azurerm/helpers/azure" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/consumergroups" "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation" diff --git a/internal/services/eventhub/eventhub_consumer_group_resource.go b/internal/services/eventhub/eventhub_consumer_group_resource.go index 3d7987d6a22a..5f69783c6902 100644 --- a/internal/services/eventhub/eventhub_consumer_group_resource.go +++ b/internal/services/eventhub/eventhub_consumer_group_resource.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-provider-azurerm/helpers/azure" "github.com/hashicorp/terraform-provider-azurerm/internal/sdk" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/consumergroups" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/consumergroups" "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation" diff --git a/internal/services/eventhub/eventhub_consumer_group_resource_test.go b/internal/services/eventhub/eventhub_consumer_group_resource_test.go index ca6711c85829..60c994d9c6c2 100644 --- a/internal/services/eventhub/eventhub_consumer_group_resource_test.go +++ b/internal/services/eventhub/eventhub_consumer_group_resource_test.go @@ -5,10 +5,11 @@ import ( "fmt" "testing" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/consumergroups" + "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/consumergroups" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/utils" ) diff --git a/internal/services/eventhub/eventhub_data_source.go b/internal/services/eventhub/eventhub_data_source.go index 1bed78aa44ff..3dbe3c672e61 100644 --- a/internal/services/eventhub/eventhub_data_source.go +++ b/internal/services/eventhub/eventhub_data_source.go @@ -4,10 +4,11 @@ import ( "fmt" "time" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/eventhubs" + "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-provider-azurerm/helpers/azure" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/eventhubs" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/internal/timeouts" ) diff --git a/internal/services/eventhub/eventhub_namespace_authorization_rule_data_source.go b/internal/services/eventhub/eventhub_namespace_authorization_rule_data_source.go index 6ecf9e66f513..81f5adcc003a 100644 --- a/internal/services/eventhub/eventhub_namespace_authorization_rule_data_source.go +++ b/internal/services/eventhub/eventhub_namespace_authorization_rule_data_source.go @@ -4,10 +4,11 @@ import ( "fmt" "time" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces" + "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-provider-azurerm/helpers/azure" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/authorizationrulesnamespaces" "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/internal/timeouts" diff --git a/internal/services/eventhub/eventhub_namespace_authorization_rule_resource.go b/internal/services/eventhub/eventhub_namespace_authorization_rule_resource.go index 21be53aa1c5f..3f9172849552 100644 --- a/internal/services/eventhub/eventhub_namespace_authorization_rule_resource.go +++ b/internal/services/eventhub/eventhub_namespace_authorization_rule_resource.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-provider-azurerm/internal/clients" "github.com/hashicorp/terraform-provider-azurerm/internal/locks" "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/migration" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/authorizationrulesnamespaces" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces" "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/internal/timeouts" diff --git a/internal/services/eventhub/eventhub_namespace_authorization_rule_resource_test.go b/internal/services/eventhub/eventhub_namespace_authorization_rule_resource_test.go index a35259ad56da..e3909d282b3e 100644 --- a/internal/services/eventhub/eventhub_namespace_authorization_rule_resource_test.go +++ b/internal/services/eventhub/eventhub_namespace_authorization_rule_resource_test.go @@ -6,10 +6,11 @@ import ( "strconv" "testing" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces" + "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/authorizationrulesnamespaces" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/utils" ) diff --git a/internal/services/eventhub/eventhub_namespace_customer_managed_key_resource.go b/internal/services/eventhub/eventhub_namespace_customer_managed_key_resource.go index 853199b87a94..69bca600a8c8 100644 --- a/internal/services/eventhub/eventhub_namespace_customer_managed_key_resource.go +++ b/internal/services/eventhub/eventhub_namespace_customer_managed_key_resource.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-azurerm/helpers/tf" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" "github.com/hashicorp/terraform-provider-azurerm/internal/locks" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/namespaces" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2021-01-01-preview/namespaces" "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/validate" keyVaultParse "github.com/hashicorp/terraform-provider-azurerm/internal/services/keyvault/parse" keyVaultValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/keyvault/validate" diff --git a/internal/services/eventhub/eventhub_namespace_customer_managed_key_resource_test.go b/internal/services/eventhub/eventhub_namespace_customer_managed_key_resource_test.go index 60b27f9529fc..83cf7450782d 100644 --- a/internal/services/eventhub/eventhub_namespace_customer_managed_key_resource_test.go +++ b/internal/services/eventhub/eventhub_namespace_customer_managed_key_resource_test.go @@ -5,10 +5,11 @@ import ( "fmt" "testing" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2021-01-01-preview/namespaces" + "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/namespaces" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/utils" ) diff --git a/internal/services/eventhub/eventhub_namespace_data_source.go b/internal/services/eventhub/eventhub_namespace_data_source.go index 08c36e639ca6..7e167442bce3 100644 --- a/internal/services/eventhub/eventhub_namespace_data_source.go +++ b/internal/services/eventhub/eventhub_namespace_data_source.go @@ -5,12 +5,14 @@ import ( "log" "time" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2021-01-01-preview/namespaces" + + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces" + "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-provider-azurerm/helpers/azure" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" "github.com/hashicorp/terraform-provider-azurerm/internal/location" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/authorizationrulesnamespaces" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/namespaces" "github.com/hashicorp/terraform-provider-azurerm/internal/tags" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/internal/timeouts" diff --git a/internal/services/eventhub/eventhub_namespace_disaster_recovery_config_resource.go b/internal/services/eventhub/eventhub_namespace_disaster_recovery_config_resource.go index a4005a6e361a..788442f91230 100644 --- a/internal/services/eventhub/eventhub_namespace_disaster_recovery_config_resource.go +++ b/internal/services/eventhub/eventhub_namespace_disaster_recovery_config_resource.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-azurerm/helpers/tf" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" "github.com/hashicorp/terraform-provider-azurerm/internal/locks" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/checknameavailabilitydisasterrecoveryconfigs" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/disasterrecoveryconfigs" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/checknameavailabilitydisasterrecoveryconfigs" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs" "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/internal/timeouts" diff --git a/internal/services/eventhub/eventhub_namespace_disaster_recovery_config_resource_test.go b/internal/services/eventhub/eventhub_namespace_disaster_recovery_config_resource_test.go index 9845b5927372..f07d5c105a15 100644 --- a/internal/services/eventhub/eventhub_namespace_disaster_recovery_config_resource_test.go +++ b/internal/services/eventhub/eventhub_namespace_disaster_recovery_config_resource_test.go @@ -5,10 +5,11 @@ import ( "fmt" "testing" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs" + "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/disasterrecoveryconfigs" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/utils" ) diff --git a/internal/services/eventhub/eventhub_namespace_resource.go b/internal/services/eventhub/eventhub_namespace_resource.go index 5d20edc79145..0134f9f385fc 100644 --- a/internal/services/eventhub/eventhub_namespace_resource.go +++ b/internal/services/eventhub/eventhub_namespace_resource.go @@ -14,9 +14,9 @@ import ( "github.com/hashicorp/terraform-provider-azurerm/internal/clients" "github.com/hashicorp/terraform-provider-azurerm/internal/location" "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/parse" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/authorizationrulesnamespaces" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/namespaces" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/networkrulesets" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2021-01-01-preview/namespaces" "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tags" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" diff --git a/internal/services/eventhub/eventhub_namespace_resource_test.go b/internal/services/eventhub/eventhub_namespace_resource_test.go index 45bed9ba96a4..6581d471cddf 100644 --- a/internal/services/eventhub/eventhub_namespace_resource_test.go +++ b/internal/services/eventhub/eventhub_namespace_resource_test.go @@ -6,10 +6,11 @@ import ( "regexp" "testing" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2021-01-01-preview/namespaces" + "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/namespaces" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/utils" ) diff --git a/internal/services/eventhub/eventhub_resource.go b/internal/services/eventhub/eventhub_resource.go index 8291fc103d02..49d92c8e38ed 100644 --- a/internal/services/eventhub/eventhub_resource.go +++ b/internal/services/eventhub/eventhub_resource.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-provider-azurerm/helpers/tf" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/parse" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/eventhubs" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/eventhubs" "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/suppress" diff --git a/internal/services/eventhub/eventhub_resource_test.go b/internal/services/eventhub/eventhub_resource_test.go index 605739215885..afefb56009cc 100644 --- a/internal/services/eventhub/eventhub_resource_test.go +++ b/internal/services/eventhub/eventhub_resource_test.go @@ -6,10 +6,11 @@ import ( "strconv" "testing" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/2017-04-01/eventhubs" + "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/sdk/eventhubs" "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/utils" diff --git a/internal/services/eventhub/sdk/authorizationruleseventhubs/client.go b/internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/client.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationruleseventhubs/client.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/client.go diff --git a/internal/services/eventhub/sdk/authorizationruleseventhubs/constants.go b/internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/constants.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationruleseventhubs/constants.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/constants.go diff --git a/internal/services/eventhub/sdk/authorizationruleseventhubs/id_authorizationrule.go b/internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/id_authorizationrule.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationruleseventhubs/id_authorizationrule.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/id_authorizationrule.go diff --git a/internal/services/eventhub/sdk/authorizationruleseventhubs/id_authorizationrule_test.go b/internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/id_authorizationrule_test.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationruleseventhubs/id_authorizationrule_test.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/id_authorizationrule_test.go diff --git a/internal/services/eventhub/sdk/authorizationruleseventhubs/id_eventhub.go b/internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/id_eventhub.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationruleseventhubs/id_eventhub.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/id_eventhub.go diff --git a/internal/services/eventhub/sdk/authorizationruleseventhubs/id_eventhub_test.go b/internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/id_eventhub_test.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationruleseventhubs/id_eventhub_test.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/id_eventhub_test.go diff --git a/internal/services/eventhub/sdk/authorizationruleseventhubs/method_eventhubscreateorupdateauthorizationrule_autorest.go b/internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/method_eventhubscreateorupdateauthorizationrule_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationruleseventhubs/method_eventhubscreateorupdateauthorizationrule_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/method_eventhubscreateorupdateauthorizationrule_autorest.go diff --git a/internal/services/eventhub/sdk/authorizationruleseventhubs/method_eventhubslistauthorizationrules_autorest.go b/internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/method_eventhubslistauthorizationrules_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationruleseventhubs/method_eventhubslistauthorizationrules_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/method_eventhubslistauthorizationrules_autorest.go diff --git a/internal/services/eventhub/sdk/authorizationruleseventhubs/method_eventhubslistkeys_autorest.go b/internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/method_eventhubslistkeys_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationruleseventhubs/method_eventhubslistkeys_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/method_eventhubslistkeys_autorest.go diff --git a/internal/services/eventhub/sdk/authorizationruleseventhubs/method_eventhubsregeneratekeys_autorest.go b/internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/method_eventhubsregeneratekeys_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationruleseventhubs/method_eventhubsregeneratekeys_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/method_eventhubsregeneratekeys_autorest.go diff --git a/internal/services/eventhub/sdk/authorizationruleseventhubs/model_accesskeys.go b/internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/model_accesskeys.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationruleseventhubs/model_accesskeys.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/model_accesskeys.go diff --git a/internal/services/eventhub/sdk/authorizationruleseventhubs/model_authorizationrule.go b/internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/model_authorizationrule.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationruleseventhubs/model_authorizationrule.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/model_authorizationrule.go diff --git a/internal/services/eventhub/sdk/authorizationruleseventhubs/model_authorizationruleproperties.go b/internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/model_authorizationruleproperties.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationruleseventhubs/model_authorizationruleproperties.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/model_authorizationruleproperties.go diff --git a/internal/services/eventhub/sdk/authorizationruleseventhubs/model_regenerateaccesskeyparameters.go b/internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/model_regenerateaccesskeyparameters.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationruleseventhubs/model_regenerateaccesskeyparameters.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/model_regenerateaccesskeyparameters.go diff --git a/internal/services/eventhub/sdk/authorizationruleseventhubs/version.go b/internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/version.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationruleseventhubs/version.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationruleseventhubs/version.go diff --git a/internal/services/eventhub/sdk/authorizationrulesnamespaces/client.go b/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/client.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationrulesnamespaces/client.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/client.go diff --git a/internal/services/eventhub/sdk/authorizationrulesnamespaces/constants.go b/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/constants.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationrulesnamespaces/constants.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/constants.go diff --git a/internal/services/eventhub/sdk/authorizationrulesnamespaces/id_authorizationrule.go b/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/id_authorizationrule.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationrulesnamespaces/id_authorizationrule.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/id_authorizationrule.go diff --git a/internal/services/eventhub/sdk/authorizationrulesnamespaces/id_authorizationrule_test.go b/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/id_authorizationrule_test.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationrulesnamespaces/id_authorizationrule_test.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/id_authorizationrule_test.go diff --git a/internal/services/eventhub/sdk/authorizationrulesnamespaces/id_namespace.go b/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/id_namespace.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationrulesnamespaces/id_namespace.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/id_namespace.go diff --git a/internal/services/eventhub/sdk/authorizationrulesnamespaces/id_namespace_test.go b/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/id_namespace_test.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationrulesnamespaces/id_namespace_test.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/id_namespace_test.go diff --git a/internal/services/eventhub/sdk/authorizationrulesnamespaces/method_namespacescreateorupdateauthorizationrule_autorest.go b/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/method_namespacescreateorupdateauthorizationrule_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationrulesnamespaces/method_namespacescreateorupdateauthorizationrule_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/method_namespacescreateorupdateauthorizationrule_autorest.go diff --git a/internal/services/eventhub/sdk/authorizationrulesnamespaces/method_namespacesdeleteauthorizationrule_autorest.go b/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/method_namespacesdeleteauthorizationrule_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationrulesnamespaces/method_namespacesdeleteauthorizationrule_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/method_namespacesdeleteauthorizationrule_autorest.go diff --git a/internal/services/eventhub/sdk/authorizationrulesnamespaces/method_namespacesgetauthorizationrule_autorest.go b/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/method_namespacesgetauthorizationrule_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationrulesnamespaces/method_namespacesgetauthorizationrule_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/method_namespacesgetauthorizationrule_autorest.go diff --git a/internal/services/eventhub/sdk/authorizationrulesnamespaces/method_namespaceslistauthorizationrules_autorest.go b/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/method_namespaceslistauthorizationrules_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationrulesnamespaces/method_namespaceslistauthorizationrules_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/method_namespaceslistauthorizationrules_autorest.go diff --git a/internal/services/eventhub/sdk/authorizationrulesnamespaces/method_namespaceslistkeys_autorest.go b/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/method_namespaceslistkeys_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationrulesnamespaces/method_namespaceslistkeys_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/method_namespaceslistkeys_autorest.go diff --git a/internal/services/eventhub/sdk/authorizationrulesnamespaces/method_namespacesregeneratekeys_autorest.go b/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/method_namespacesregeneratekeys_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationrulesnamespaces/method_namespacesregeneratekeys_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/method_namespacesregeneratekeys_autorest.go diff --git a/internal/services/eventhub/sdk/authorizationrulesnamespaces/model_accesskeys.go b/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/model_accesskeys.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationrulesnamespaces/model_accesskeys.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/model_accesskeys.go diff --git a/internal/services/eventhub/sdk/authorizationrulesnamespaces/model_authorizationrule.go b/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/model_authorizationrule.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationrulesnamespaces/model_authorizationrule.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/model_authorizationrule.go diff --git a/internal/services/eventhub/sdk/authorizationrulesnamespaces/model_authorizationruleproperties.go b/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/model_authorizationruleproperties.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationrulesnamespaces/model_authorizationruleproperties.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/model_authorizationruleproperties.go diff --git a/internal/services/eventhub/sdk/authorizationrulesnamespaces/model_regenerateaccesskeyparameters.go b/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/model_regenerateaccesskeyparameters.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationrulesnamespaces/model_regenerateaccesskeyparameters.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/model_regenerateaccesskeyparameters.go diff --git a/internal/services/eventhub/sdk/authorizationrulesnamespaces/version.go b/internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/version.go similarity index 100% rename from internal/services/eventhub/sdk/authorizationrulesnamespaces/version.go rename to internal/services/eventhub/sdk/2017-04-01/authorizationrulesnamespaces/version.go diff --git a/internal/services/eventhub/sdk/checknameavailabilitydisasterrecoveryconfigs/client.go b/internal/services/eventhub/sdk/2017-04-01/checknameavailabilitydisasterrecoveryconfigs/client.go similarity index 100% rename from internal/services/eventhub/sdk/checknameavailabilitydisasterrecoveryconfigs/client.go rename to internal/services/eventhub/sdk/2017-04-01/checknameavailabilitydisasterrecoveryconfigs/client.go diff --git a/internal/services/eventhub/sdk/checknameavailabilitydisasterrecoveryconfigs/constants.go b/internal/services/eventhub/sdk/2017-04-01/checknameavailabilitydisasterrecoveryconfigs/constants.go similarity index 100% rename from internal/services/eventhub/sdk/checknameavailabilitydisasterrecoveryconfigs/constants.go rename to internal/services/eventhub/sdk/2017-04-01/checknameavailabilitydisasterrecoveryconfigs/constants.go diff --git a/internal/services/eventhub/sdk/checknameavailabilitydisasterrecoveryconfigs/id_namespace.go b/internal/services/eventhub/sdk/2017-04-01/checknameavailabilitydisasterrecoveryconfigs/id_namespace.go similarity index 100% rename from internal/services/eventhub/sdk/checknameavailabilitydisasterrecoveryconfigs/id_namespace.go rename to internal/services/eventhub/sdk/2017-04-01/checknameavailabilitydisasterrecoveryconfigs/id_namespace.go diff --git a/internal/services/eventhub/sdk/checknameavailabilitydisasterrecoveryconfigs/id_namespace_test.go b/internal/services/eventhub/sdk/2017-04-01/checknameavailabilitydisasterrecoveryconfigs/id_namespace_test.go similarity index 100% rename from internal/services/eventhub/sdk/checknameavailabilitydisasterrecoveryconfigs/id_namespace_test.go rename to internal/services/eventhub/sdk/2017-04-01/checknameavailabilitydisasterrecoveryconfigs/id_namespace_test.go diff --git a/internal/services/eventhub/sdk/checknameavailabilitydisasterrecoveryconfigs/method_disasterrecoveryconfigschecknameavailability_autorest.go b/internal/services/eventhub/sdk/2017-04-01/checknameavailabilitydisasterrecoveryconfigs/method_disasterrecoveryconfigschecknameavailability_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/checknameavailabilitydisasterrecoveryconfigs/method_disasterrecoveryconfigschecknameavailability_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/checknameavailabilitydisasterrecoveryconfigs/method_disasterrecoveryconfigschecknameavailability_autorest.go diff --git a/internal/services/eventhub/sdk/checknameavailabilitydisasterrecoveryconfigs/model_checknameavailabilityparameter.go b/internal/services/eventhub/sdk/2017-04-01/checknameavailabilitydisasterrecoveryconfigs/model_checknameavailabilityparameter.go similarity index 100% rename from internal/services/eventhub/sdk/checknameavailabilitydisasterrecoveryconfigs/model_checknameavailabilityparameter.go rename to internal/services/eventhub/sdk/2017-04-01/checknameavailabilitydisasterrecoveryconfigs/model_checknameavailabilityparameter.go diff --git a/internal/services/eventhub/sdk/checknameavailabilitydisasterrecoveryconfigs/model_checknameavailabilityresult.go b/internal/services/eventhub/sdk/2017-04-01/checknameavailabilitydisasterrecoveryconfigs/model_checknameavailabilityresult.go similarity index 100% rename from internal/services/eventhub/sdk/checknameavailabilitydisasterrecoveryconfigs/model_checknameavailabilityresult.go rename to internal/services/eventhub/sdk/2017-04-01/checknameavailabilitydisasterrecoveryconfigs/model_checknameavailabilityresult.go diff --git a/internal/services/eventhub/sdk/checknameavailabilitydisasterrecoveryconfigs/version.go b/internal/services/eventhub/sdk/2017-04-01/checknameavailabilitydisasterrecoveryconfigs/version.go similarity index 100% rename from internal/services/eventhub/sdk/checknameavailabilitydisasterrecoveryconfigs/version.go rename to internal/services/eventhub/sdk/2017-04-01/checknameavailabilitydisasterrecoveryconfigs/version.go diff --git a/internal/services/eventhub/sdk/consumergroups/client.go b/internal/services/eventhub/sdk/2017-04-01/consumergroups/client.go similarity index 100% rename from internal/services/eventhub/sdk/consumergroups/client.go rename to internal/services/eventhub/sdk/2017-04-01/consumergroups/client.go diff --git a/internal/services/eventhub/sdk/consumergroups/id_consumergroup.go b/internal/services/eventhub/sdk/2017-04-01/consumergroups/id_consumergroup.go similarity index 100% rename from internal/services/eventhub/sdk/consumergroups/id_consumergroup.go rename to internal/services/eventhub/sdk/2017-04-01/consumergroups/id_consumergroup.go diff --git a/internal/services/eventhub/sdk/consumergroups/id_consumergroup_test.go b/internal/services/eventhub/sdk/2017-04-01/consumergroups/id_consumergroup_test.go similarity index 100% rename from internal/services/eventhub/sdk/consumergroups/id_consumergroup_test.go rename to internal/services/eventhub/sdk/2017-04-01/consumergroups/id_consumergroup_test.go diff --git a/internal/services/eventhub/sdk/consumergroups/id_eventhub.go b/internal/services/eventhub/sdk/2017-04-01/consumergroups/id_eventhub.go similarity index 100% rename from internal/services/eventhub/sdk/consumergroups/id_eventhub.go rename to internal/services/eventhub/sdk/2017-04-01/consumergroups/id_eventhub.go diff --git a/internal/services/eventhub/sdk/consumergroups/id_eventhub_test.go b/internal/services/eventhub/sdk/2017-04-01/consumergroups/id_eventhub_test.go similarity index 100% rename from internal/services/eventhub/sdk/consumergroups/id_eventhub_test.go rename to internal/services/eventhub/sdk/2017-04-01/consumergroups/id_eventhub_test.go diff --git a/internal/services/eventhub/sdk/consumergroups/method_createorupdate_autorest.go b/internal/services/eventhub/sdk/2017-04-01/consumergroups/method_createorupdate_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/consumergroups/method_createorupdate_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/consumergroups/method_createorupdate_autorest.go diff --git a/internal/services/eventhub/sdk/consumergroups/method_delete_autorest.go b/internal/services/eventhub/sdk/2017-04-01/consumergroups/method_delete_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/consumergroups/method_delete_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/consumergroups/method_delete_autorest.go diff --git a/internal/services/eventhub/sdk/consumergroups/method_get_autorest.go b/internal/services/eventhub/sdk/2017-04-01/consumergroups/method_get_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/consumergroups/method_get_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/consumergroups/method_get_autorest.go diff --git a/internal/services/eventhub/sdk/consumergroups/method_listbyeventhub_autorest.go b/internal/services/eventhub/sdk/2017-04-01/consumergroups/method_listbyeventhub_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/consumergroups/method_listbyeventhub_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/consumergroups/method_listbyeventhub_autorest.go diff --git a/internal/services/eventhub/sdk/consumergroups/model_consumergroup.go b/internal/services/eventhub/sdk/2017-04-01/consumergroups/model_consumergroup.go similarity index 100% rename from internal/services/eventhub/sdk/consumergroups/model_consumergroup.go rename to internal/services/eventhub/sdk/2017-04-01/consumergroups/model_consumergroup.go diff --git a/internal/services/eventhub/sdk/consumergroups/model_consumergroupproperties.go b/internal/services/eventhub/sdk/2017-04-01/consumergroups/model_consumergroupproperties.go similarity index 100% rename from internal/services/eventhub/sdk/consumergroups/model_consumergroupproperties.go rename to internal/services/eventhub/sdk/2017-04-01/consumergroups/model_consumergroupproperties.go diff --git a/internal/services/eventhub/sdk/consumergroups/version.go b/internal/services/eventhub/sdk/2017-04-01/consumergroups/version.go similarity index 100% rename from internal/services/eventhub/sdk/consumergroups/version.go rename to internal/services/eventhub/sdk/2017-04-01/consumergroups/version.go diff --git a/internal/services/eventhub/sdk/disasterrecoveryconfigs/client.go b/internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/client.go similarity index 100% rename from internal/services/eventhub/sdk/disasterrecoveryconfigs/client.go rename to internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/client.go diff --git a/internal/services/eventhub/sdk/disasterrecoveryconfigs/constants.go b/internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/constants.go similarity index 100% rename from internal/services/eventhub/sdk/disasterrecoveryconfigs/constants.go rename to internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/constants.go diff --git a/internal/services/eventhub/sdk/disasterrecoveryconfigs/id_disasterrecoveryconfig.go b/internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/id_disasterrecoveryconfig.go similarity index 100% rename from internal/services/eventhub/sdk/disasterrecoveryconfigs/id_disasterrecoveryconfig.go rename to internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/id_disasterrecoveryconfig.go diff --git a/internal/services/eventhub/sdk/disasterrecoveryconfigs/id_disasterrecoveryconfig_test.go b/internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/id_disasterrecoveryconfig_test.go similarity index 100% rename from internal/services/eventhub/sdk/disasterrecoveryconfigs/id_disasterrecoveryconfig_test.go rename to internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/id_disasterrecoveryconfig_test.go diff --git a/internal/services/eventhub/sdk/disasterrecoveryconfigs/id_namespace.go b/internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/id_namespace.go similarity index 100% rename from internal/services/eventhub/sdk/disasterrecoveryconfigs/id_namespace.go rename to internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/id_namespace.go diff --git a/internal/services/eventhub/sdk/disasterrecoveryconfigs/id_namespace_test.go b/internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/id_namespace_test.go similarity index 100% rename from internal/services/eventhub/sdk/disasterrecoveryconfigs/id_namespace_test.go rename to internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/id_namespace_test.go diff --git a/internal/services/eventhub/sdk/disasterrecoveryconfigs/method_breakpairing_autorest.go b/internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/method_breakpairing_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/disasterrecoveryconfigs/method_breakpairing_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/method_breakpairing_autorest.go diff --git a/internal/services/eventhub/sdk/disasterrecoveryconfigs/method_createorupdate_autorest.go b/internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/method_createorupdate_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/disasterrecoveryconfigs/method_createorupdate_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/method_createorupdate_autorest.go diff --git a/internal/services/eventhub/sdk/disasterrecoveryconfigs/method_delete_autorest.go b/internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/method_delete_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/disasterrecoveryconfigs/method_delete_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/method_delete_autorest.go diff --git a/internal/services/eventhub/sdk/disasterrecoveryconfigs/method_failover_autorest.go b/internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/method_failover_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/disasterrecoveryconfigs/method_failover_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/method_failover_autorest.go diff --git a/internal/services/eventhub/sdk/disasterrecoveryconfigs/method_get_autorest.go b/internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/method_get_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/disasterrecoveryconfigs/method_get_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/method_get_autorest.go diff --git a/internal/services/eventhub/sdk/disasterrecoveryconfigs/method_list_autorest.go b/internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/method_list_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/disasterrecoveryconfigs/method_list_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/method_list_autorest.go diff --git a/internal/services/eventhub/sdk/disasterrecoveryconfigs/model_armdisasterrecovery.go b/internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/model_armdisasterrecovery.go similarity index 100% rename from internal/services/eventhub/sdk/disasterrecoveryconfigs/model_armdisasterrecovery.go rename to internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/model_armdisasterrecovery.go diff --git a/internal/services/eventhub/sdk/disasterrecoveryconfigs/model_armdisasterrecoveryproperties.go b/internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/model_armdisasterrecoveryproperties.go similarity index 100% rename from internal/services/eventhub/sdk/disasterrecoveryconfigs/model_armdisasterrecoveryproperties.go rename to internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/model_armdisasterrecoveryproperties.go diff --git a/internal/services/eventhub/sdk/disasterrecoveryconfigs/version.go b/internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/version.go similarity index 100% rename from internal/services/eventhub/sdk/disasterrecoveryconfigs/version.go rename to internal/services/eventhub/sdk/2017-04-01/disasterrecoveryconfigs/version.go diff --git a/internal/services/eventhub/sdk/eventhubs/client.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/client.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/client.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/client.go diff --git a/internal/services/eventhub/sdk/eventhubs/constants.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/constants.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/constants.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/constants.go diff --git a/internal/services/eventhub/sdk/eventhubs/id_authorizationrule.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/id_authorizationrule.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/id_authorizationrule.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/id_authorizationrule.go diff --git a/internal/services/eventhub/sdk/eventhubs/id_authorizationrule_test.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/id_authorizationrule_test.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/id_authorizationrule_test.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/id_authorizationrule_test.go diff --git a/internal/services/eventhub/sdk/eventhubs/id_eventhub.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/id_eventhub.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/id_eventhub.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/id_eventhub.go diff --git a/internal/services/eventhub/sdk/eventhubs/id_eventhub_test.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/id_eventhub_test.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/id_eventhub_test.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/id_eventhub_test.go diff --git a/internal/services/eventhub/sdk/eventhubs/id_namespace.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/id_namespace.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/id_namespace.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/id_namespace.go diff --git a/internal/services/eventhub/sdk/eventhubs/id_namespace_test.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/id_namespace_test.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/id_namespace_test.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/id_namespace_test.go diff --git a/internal/services/eventhub/sdk/eventhubs/method_createorupdate_autorest.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/method_createorupdate_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/method_createorupdate_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/method_createorupdate_autorest.go diff --git a/internal/services/eventhub/sdk/eventhubs/method_delete_autorest.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/method_delete_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/method_delete_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/method_delete_autorest.go diff --git a/internal/services/eventhub/sdk/eventhubs/method_deleteauthorizationrule_autorest.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/method_deleteauthorizationrule_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/method_deleteauthorizationrule_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/method_deleteauthorizationrule_autorest.go diff --git a/internal/services/eventhub/sdk/eventhubs/method_get_autorest.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/method_get_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/method_get_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/method_get_autorest.go diff --git a/internal/services/eventhub/sdk/eventhubs/method_getauthorizationrule_autorest.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/method_getauthorizationrule_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/method_getauthorizationrule_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/method_getauthorizationrule_autorest.go diff --git a/internal/services/eventhub/sdk/eventhubs/method_listbynamespace_autorest.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/method_listbynamespace_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/method_listbynamespace_autorest.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/method_listbynamespace_autorest.go diff --git a/internal/services/eventhub/sdk/eventhubs/model_authorizationrule.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/model_authorizationrule.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/model_authorizationrule.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/model_authorizationrule.go diff --git a/internal/services/eventhub/sdk/eventhubs/model_authorizationruleproperties.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/model_authorizationruleproperties.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/model_authorizationruleproperties.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/model_authorizationruleproperties.go diff --git a/internal/services/eventhub/sdk/eventhubs/model_capturedescription.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/model_capturedescription.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/model_capturedescription.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/model_capturedescription.go diff --git a/internal/services/eventhub/sdk/eventhubs/model_destination.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/model_destination.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/model_destination.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/model_destination.go diff --git a/internal/services/eventhub/sdk/eventhubs/model_destinationproperties.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/model_destinationproperties.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/model_destinationproperties.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/model_destinationproperties.go diff --git a/internal/services/eventhub/sdk/eventhubs/model_eventhub.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/model_eventhub.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/model_eventhub.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/model_eventhub.go diff --git a/internal/services/eventhub/sdk/eventhubs/model_eventhubproperties.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/model_eventhubproperties.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/model_eventhubproperties.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/model_eventhubproperties.go diff --git a/internal/services/eventhub/sdk/eventhubs/version.go b/internal/services/eventhub/sdk/2017-04-01/eventhubs/version.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubs/version.go rename to internal/services/eventhub/sdk/2017-04-01/eventhubs/version.go diff --git a/internal/services/eventhub/sdk/eventhubsclusters/client.go b/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/client.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubsclusters/client.go rename to internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/client.go diff --git a/internal/services/eventhub/sdk/eventhubsclusters/constants.go b/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/constants.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubsclusters/constants.go rename to internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/constants.go diff --git a/internal/services/eventhub/sdk/eventhubsclusters/id_cluster.go b/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/id_cluster.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubsclusters/id_cluster.go rename to internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/id_cluster.go diff --git a/internal/services/eventhub/sdk/eventhubsclusters/id_cluster_test.go b/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/id_cluster_test.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubsclusters/id_cluster_test.go rename to internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/id_cluster_test.go diff --git a/internal/services/eventhub/sdk/eventhubsclusters/id_resourcegroup.go b/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/id_resourcegroup.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubsclusters/id_resourcegroup.go rename to internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/id_resourcegroup.go diff --git a/internal/services/eventhub/sdk/eventhubsclusters/id_resourcegroup_test.go b/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/id_resourcegroup_test.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubsclusters/id_resourcegroup_test.go rename to internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/id_resourcegroup_test.go diff --git a/internal/services/eventhub/sdk/eventhubsclusters/method_clusterscreateorupdate_autorest.go b/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/method_clusterscreateorupdate_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubsclusters/method_clusterscreateorupdate_autorest.go rename to internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/method_clusterscreateorupdate_autorest.go diff --git a/internal/services/eventhub/sdk/eventhubsclusters/method_clustersdelete_autorest.go b/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/method_clustersdelete_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubsclusters/method_clustersdelete_autorest.go rename to internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/method_clustersdelete_autorest.go diff --git a/internal/services/eventhub/sdk/eventhubsclusters/method_clustersget_autorest.go b/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/method_clustersget_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubsclusters/method_clustersget_autorest.go rename to internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/method_clustersget_autorest.go diff --git a/internal/services/eventhub/sdk/eventhubsclusters/method_clusterslistbyresourcegroup_autorest.go b/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/method_clusterslistbyresourcegroup_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubsclusters/method_clusterslistbyresourcegroup_autorest.go rename to internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/method_clusterslistbyresourcegroup_autorest.go diff --git a/internal/services/eventhub/sdk/eventhubsclusters/method_clustersupdate_autorest.go b/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/method_clustersupdate_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubsclusters/method_clustersupdate_autorest.go rename to internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/method_clustersupdate_autorest.go diff --git a/internal/services/eventhub/sdk/eventhubsclusters/model_cluster.go b/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/model_cluster.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubsclusters/model_cluster.go rename to internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/model_cluster.go diff --git a/internal/services/eventhub/sdk/eventhubsclusters/model_clusterproperties.go b/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/model_clusterproperties.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubsclusters/model_clusterproperties.go rename to internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/model_clusterproperties.go diff --git a/internal/services/eventhub/sdk/eventhubsclusters/model_clustersku.go b/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/model_clustersku.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubsclusters/model_clustersku.go rename to internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/model_clustersku.go diff --git a/internal/services/eventhub/sdk/eventhubsclusters/version.go b/internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/version.go similarity index 100% rename from internal/services/eventhub/sdk/eventhubsclusters/version.go rename to internal/services/eventhub/sdk/2018-01-01-preview/eventhubsclusters/version.go diff --git a/internal/services/eventhub/sdk/networkrulesets/client.go b/internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/client.go similarity index 100% rename from internal/services/eventhub/sdk/networkrulesets/client.go rename to internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/client.go diff --git a/internal/services/eventhub/sdk/networkrulesets/constants.go b/internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/constants.go similarity index 100% rename from internal/services/eventhub/sdk/networkrulesets/constants.go rename to internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/constants.go diff --git a/internal/services/eventhub/sdk/networkrulesets/id_namespace.go b/internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/id_namespace.go similarity index 100% rename from internal/services/eventhub/sdk/networkrulesets/id_namespace.go rename to internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/id_namespace.go diff --git a/internal/services/eventhub/sdk/networkrulesets/id_namespace_test.go b/internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/id_namespace_test.go similarity index 100% rename from internal/services/eventhub/sdk/networkrulesets/id_namespace_test.go rename to internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/id_namespace_test.go diff --git a/internal/services/eventhub/sdk/networkrulesets/method_namespacescreateorupdatenetworkruleset_autorest.go b/internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/method_namespacescreateorupdatenetworkruleset_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/networkrulesets/method_namespacescreateorupdatenetworkruleset_autorest.go rename to internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/method_namespacescreateorupdatenetworkruleset_autorest.go diff --git a/internal/services/eventhub/sdk/networkrulesets/method_namespacesgetnetworkruleset_autorest.go b/internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/method_namespacesgetnetworkruleset_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/networkrulesets/method_namespacesgetnetworkruleset_autorest.go rename to internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/method_namespacesgetnetworkruleset_autorest.go diff --git a/internal/services/eventhub/sdk/networkrulesets/model_networkruleset.go b/internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/model_networkruleset.go similarity index 100% rename from internal/services/eventhub/sdk/networkrulesets/model_networkruleset.go rename to internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/model_networkruleset.go diff --git a/internal/services/eventhub/sdk/networkrulesets/model_networkrulesetproperties.go b/internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/model_networkrulesetproperties.go similarity index 100% rename from internal/services/eventhub/sdk/networkrulesets/model_networkrulesetproperties.go rename to internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/model_networkrulesetproperties.go diff --git a/internal/services/eventhub/sdk/networkrulesets/model_nwrulesetiprules.go b/internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/model_nwrulesetiprules.go similarity index 100% rename from internal/services/eventhub/sdk/networkrulesets/model_nwrulesetiprules.go rename to internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/model_nwrulesetiprules.go diff --git a/internal/services/eventhub/sdk/networkrulesets/model_nwrulesetvirtualnetworkrules.go b/internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/model_nwrulesetvirtualnetworkrules.go similarity index 100% rename from internal/services/eventhub/sdk/networkrulesets/model_nwrulesetvirtualnetworkrules.go rename to internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/model_nwrulesetvirtualnetworkrules.go diff --git a/internal/services/eventhub/sdk/networkrulesets/model_subnet.go b/internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/model_subnet.go similarity index 100% rename from internal/services/eventhub/sdk/networkrulesets/model_subnet.go rename to internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/model_subnet.go diff --git a/internal/services/eventhub/sdk/networkrulesets/version.go b/internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/version.go similarity index 100% rename from internal/services/eventhub/sdk/networkrulesets/version.go rename to internal/services/eventhub/sdk/2018-01-01-preview/networkrulesets/version.go diff --git a/internal/services/eventhub/sdk/namespaces/client.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/client.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/client.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/client.go diff --git a/internal/services/eventhub/sdk/namespaces/constants.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/constants.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/constants.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/constants.go diff --git a/internal/services/eventhub/sdk/namespaces/id_namespace.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/id_namespace.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/id_namespace.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/id_namespace.go diff --git a/internal/services/eventhub/sdk/namespaces/id_namespace_test.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/id_namespace_test.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/id_namespace_test.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/id_namespace_test.go diff --git a/internal/services/eventhub/sdk/namespaces/id_resourcegroup.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/id_resourcegroup.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/id_resourcegroup.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/id_resourcegroup.go diff --git a/internal/services/eventhub/sdk/namespaces/id_resourcegroup_test.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/id_resourcegroup_test.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/id_resourcegroup_test.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/id_resourcegroup_test.go diff --git a/internal/services/eventhub/sdk/namespaces/method_createorupdate_autorest.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/method_createorupdate_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/method_createorupdate_autorest.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/method_createorupdate_autorest.go diff --git a/internal/services/eventhub/sdk/namespaces/method_delete_autorest.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/method_delete_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/method_delete_autorest.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/method_delete_autorest.go diff --git a/internal/services/eventhub/sdk/namespaces/method_get_autorest.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/method_get_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/method_get_autorest.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/method_get_autorest.go diff --git a/internal/services/eventhub/sdk/namespaces/method_listbyresourcegroup_autorest.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/method_listbyresourcegroup_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/method_listbyresourcegroup_autorest.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/method_listbyresourcegroup_autorest.go diff --git a/internal/services/eventhub/sdk/namespaces/method_update_autorest.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/method_update_autorest.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/method_update_autorest.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/method_update_autorest.go diff --git a/internal/services/eventhub/sdk/namespaces/model_connectionstate.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_connectionstate.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/model_connectionstate.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_connectionstate.go diff --git a/internal/services/eventhub/sdk/namespaces/model_ehnamespace.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_ehnamespace.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/model_ehnamespace.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_ehnamespace.go diff --git a/internal/services/eventhub/sdk/namespaces/model_ehnamespaceproperties.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_ehnamespaceproperties.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/model_ehnamespaceproperties.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_ehnamespaceproperties.go diff --git a/internal/services/eventhub/sdk/namespaces/model_encryption.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_encryption.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/model_encryption.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_encryption.go diff --git a/internal/services/eventhub/sdk/namespaces/model_identity.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_identity.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/model_identity.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_identity.go diff --git a/internal/services/eventhub/sdk/namespaces/model_keyvaultproperties.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_keyvaultproperties.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/model_keyvaultproperties.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_keyvaultproperties.go diff --git a/internal/services/eventhub/sdk/namespaces/model_privateendpoint.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_privateendpoint.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/model_privateendpoint.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_privateendpoint.go diff --git a/internal/services/eventhub/sdk/namespaces/model_privateendpointconnection.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_privateendpointconnection.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/model_privateendpointconnection.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_privateendpointconnection.go diff --git a/internal/services/eventhub/sdk/namespaces/model_privateendpointconnectionproperties.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_privateendpointconnectionproperties.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/model_privateendpointconnectionproperties.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_privateendpointconnectionproperties.go diff --git a/internal/services/eventhub/sdk/namespaces/model_sku.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_sku.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/model_sku.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_sku.go diff --git a/internal/services/eventhub/sdk/namespaces/model_systemdata.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_systemdata.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/model_systemdata.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_systemdata.go diff --git a/internal/services/eventhub/sdk/namespaces/model_userassignedidentityproperties.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_userassignedidentityproperties.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/model_userassignedidentityproperties.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/model_userassignedidentityproperties.go diff --git a/internal/services/eventhub/sdk/namespaces/version.go b/internal/services/eventhub/sdk/2021-01-01-preview/namespaces/version.go similarity index 100% rename from internal/services/eventhub/sdk/namespaces/version.go rename to internal/services/eventhub/sdk/2021-01-01-preview/namespaces/version.go diff --git a/internal/services/maps/client/client.go b/internal/services/maps/client/client.go index da61239af32e..16130c89ddf8 100644 --- a/internal/services/maps/client/client.go +++ b/internal/services/maps/client/client.go @@ -2,7 +2,7 @@ package client import ( "github.com/hashicorp/terraform-provider-azurerm/internal/common" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/maps/sdk/accounts" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/maps/sdk/2021-02-01/accounts" ) type Client struct { diff --git a/internal/services/maps/maps_account_data_source.go b/internal/services/maps/maps_account_data_source.go index 738a69d9b93f..1eeb75e05f7d 100644 --- a/internal/services/maps/maps_account_data_source.go +++ b/internal/services/maps/maps_account_data_source.go @@ -4,10 +4,11 @@ import ( "fmt" "time" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/maps/sdk/2021-02-01/accounts" + "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-provider-azurerm/helpers/azure" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/maps/sdk/accounts" "github.com/hashicorp/terraform-provider-azurerm/internal/services/maps/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tags" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" diff --git a/internal/services/maps/maps_account_resource.go b/internal/services/maps/maps_account_resource.go index 8005ac0cda60..1f9726ec3458 100644 --- a/internal/services/maps/maps_account_resource.go +++ b/internal/services/maps/maps_account_resource.go @@ -5,13 +5,12 @@ import ( "log" "time" - "github.com/hashicorp/go-azure-helpers/response" - "github.com/Azure/azure-sdk-for-go/services/maps/mgmt/2021-02-01/maps" + "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/services/maps/sdk/accounts" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/maps/sdk/2021-02-01/accounts" "github.com/hashicorp/terraform-provider-azurerm/internal/services/maps/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tags" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" diff --git a/internal/services/maps/maps_account_resource_test.go b/internal/services/maps/maps_account_resource_test.go index fef79ab218f6..6c8908fa5971 100644 --- a/internal/services/maps/maps_account_resource_test.go +++ b/internal/services/maps/maps_account_resource_test.go @@ -5,10 +5,11 @@ import ( "fmt" "testing" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/maps/sdk/2021-02-01/accounts" + "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/maps/sdk/accounts" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/utils" ) diff --git a/internal/services/maps/sdk/accounts/client.go b/internal/services/maps/sdk/2021-02-01/accounts/client.go similarity index 100% rename from internal/services/maps/sdk/accounts/client.go rename to internal/services/maps/sdk/2021-02-01/accounts/client.go diff --git a/internal/services/maps/sdk/accounts/constants.go b/internal/services/maps/sdk/2021-02-01/accounts/constants.go similarity index 100% rename from internal/services/maps/sdk/accounts/constants.go rename to internal/services/maps/sdk/2021-02-01/accounts/constants.go diff --git a/internal/services/maps/sdk/accounts/id_account.go b/internal/services/maps/sdk/2021-02-01/accounts/id_account.go similarity index 100% rename from internal/services/maps/sdk/accounts/id_account.go rename to internal/services/maps/sdk/2021-02-01/accounts/id_account.go diff --git a/internal/services/maps/sdk/accounts/id_account_test.go b/internal/services/maps/sdk/2021-02-01/accounts/id_account_test.go similarity index 100% rename from internal/services/maps/sdk/accounts/id_account_test.go rename to internal/services/maps/sdk/2021-02-01/accounts/id_account_test.go diff --git a/internal/services/maps/sdk/accounts/id_resourcegroup.go b/internal/services/maps/sdk/2021-02-01/accounts/id_resourcegroup.go similarity index 100% rename from internal/services/maps/sdk/accounts/id_resourcegroup.go rename to internal/services/maps/sdk/2021-02-01/accounts/id_resourcegroup.go diff --git a/internal/services/maps/sdk/accounts/id_resourcegroup_test.go b/internal/services/maps/sdk/2021-02-01/accounts/id_resourcegroup_test.go similarity index 100% rename from internal/services/maps/sdk/accounts/id_resourcegroup_test.go rename to internal/services/maps/sdk/2021-02-01/accounts/id_resourcegroup_test.go diff --git a/internal/services/maps/sdk/accounts/method_createorupdate_autorest.go b/internal/services/maps/sdk/2021-02-01/accounts/method_createorupdate_autorest.go similarity index 100% rename from internal/services/maps/sdk/accounts/method_createorupdate_autorest.go rename to internal/services/maps/sdk/2021-02-01/accounts/method_createorupdate_autorest.go diff --git a/internal/services/maps/sdk/accounts/method_delete_autorest.go b/internal/services/maps/sdk/2021-02-01/accounts/method_delete_autorest.go similarity index 100% rename from internal/services/maps/sdk/accounts/method_delete_autorest.go rename to internal/services/maps/sdk/2021-02-01/accounts/method_delete_autorest.go diff --git a/internal/services/maps/sdk/accounts/method_get_autorest.go b/internal/services/maps/sdk/2021-02-01/accounts/method_get_autorest.go similarity index 100% rename from internal/services/maps/sdk/accounts/method_get_autorest.go rename to internal/services/maps/sdk/2021-02-01/accounts/method_get_autorest.go diff --git a/internal/services/maps/sdk/accounts/method_listbyresourcegroup_autorest.go b/internal/services/maps/sdk/2021-02-01/accounts/method_listbyresourcegroup_autorest.go similarity index 100% rename from internal/services/maps/sdk/accounts/method_listbyresourcegroup_autorest.go rename to internal/services/maps/sdk/2021-02-01/accounts/method_listbyresourcegroup_autorest.go diff --git a/internal/services/maps/sdk/accounts/method_listkeys_autorest.go b/internal/services/maps/sdk/2021-02-01/accounts/method_listkeys_autorest.go similarity index 100% rename from internal/services/maps/sdk/accounts/method_listkeys_autorest.go rename to internal/services/maps/sdk/2021-02-01/accounts/method_listkeys_autorest.go diff --git a/internal/services/maps/sdk/accounts/method_regeneratekeys_autorest.go b/internal/services/maps/sdk/2021-02-01/accounts/method_regeneratekeys_autorest.go similarity index 100% rename from internal/services/maps/sdk/accounts/method_regeneratekeys_autorest.go rename to internal/services/maps/sdk/2021-02-01/accounts/method_regeneratekeys_autorest.go diff --git a/internal/services/maps/sdk/accounts/method_update_autorest.go b/internal/services/maps/sdk/2021-02-01/accounts/method_update_autorest.go similarity index 100% rename from internal/services/maps/sdk/accounts/method_update_autorest.go rename to internal/services/maps/sdk/2021-02-01/accounts/method_update_autorest.go diff --git a/internal/services/maps/sdk/accounts/model_mapsaccount.go b/internal/services/maps/sdk/2021-02-01/accounts/model_mapsaccount.go similarity index 100% rename from internal/services/maps/sdk/accounts/model_mapsaccount.go rename to internal/services/maps/sdk/2021-02-01/accounts/model_mapsaccount.go diff --git a/internal/services/maps/sdk/accounts/model_mapsaccountkeys.go b/internal/services/maps/sdk/2021-02-01/accounts/model_mapsaccountkeys.go similarity index 100% rename from internal/services/maps/sdk/accounts/model_mapsaccountkeys.go rename to internal/services/maps/sdk/2021-02-01/accounts/model_mapsaccountkeys.go diff --git a/internal/services/maps/sdk/accounts/model_mapsaccountproperties.go b/internal/services/maps/sdk/2021-02-01/accounts/model_mapsaccountproperties.go similarity index 100% rename from internal/services/maps/sdk/accounts/model_mapsaccountproperties.go rename to internal/services/maps/sdk/2021-02-01/accounts/model_mapsaccountproperties.go diff --git a/internal/services/maps/sdk/accounts/model_mapsaccountupdateparameters.go b/internal/services/maps/sdk/2021-02-01/accounts/model_mapsaccountupdateparameters.go similarity index 100% rename from internal/services/maps/sdk/accounts/model_mapsaccountupdateparameters.go rename to internal/services/maps/sdk/2021-02-01/accounts/model_mapsaccountupdateparameters.go diff --git a/internal/services/maps/sdk/accounts/model_mapskeyspecification.go b/internal/services/maps/sdk/2021-02-01/accounts/model_mapskeyspecification.go similarity index 100% rename from internal/services/maps/sdk/accounts/model_mapskeyspecification.go rename to internal/services/maps/sdk/2021-02-01/accounts/model_mapskeyspecification.go diff --git a/internal/services/maps/sdk/accounts/model_sku.go b/internal/services/maps/sdk/2021-02-01/accounts/model_sku.go similarity index 100% rename from internal/services/maps/sdk/accounts/model_sku.go rename to internal/services/maps/sdk/2021-02-01/accounts/model_sku.go diff --git a/internal/services/maps/sdk/accounts/model_systemdata.go b/internal/services/maps/sdk/2021-02-01/accounts/model_systemdata.go similarity index 100% rename from internal/services/maps/sdk/accounts/model_systemdata.go rename to internal/services/maps/sdk/2021-02-01/accounts/model_systemdata.go diff --git a/internal/services/maps/sdk/accounts/version.go b/internal/services/maps/sdk/2021-02-01/accounts/version.go similarity index 100% rename from internal/services/maps/sdk/accounts/version.go rename to internal/services/maps/sdk/2021-02-01/accounts/version.go diff --git a/internal/services/maps/validate/account_id.go b/internal/services/maps/validate/account_id.go index f30f01ea5483..31f007f620b5 100644 --- a/internal/services/maps/validate/account_id.go +++ b/internal/services/maps/validate/account_id.go @@ -3,7 +3,7 @@ package validate import ( "fmt" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/maps/sdk/accounts" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/maps/sdk/2021-02-01/accounts" ) func AccountID(input interface{}, key string) (warnings []string, errors []error) { diff --git a/internal/services/msi/client/client.go b/internal/services/msi/client/client.go index cfa206f4411d..17d72e8a21ab 100644 --- a/internal/services/msi/client/client.go +++ b/internal/services/msi/client/client.go @@ -2,7 +2,7 @@ package client import ( "github.com/hashicorp/terraform-provider-azurerm/internal/common" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/msi/sdk/managedidentity" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/msi/sdk/2018-11-30/managedidentity" ) type Client struct { diff --git a/internal/services/msi/parse/user_assigned_identity_id.go b/internal/services/msi/parse/user_assigned_identity_id.go index 1e9a1ed4256a..ca3220cd6a04 100644 --- a/internal/services/msi/parse/user_assigned_identity_id.go +++ b/internal/services/msi/parse/user_assigned_identity_id.go @@ -1,6 +1,8 @@ package parse -import "github.com/hashicorp/terraform-provider-azurerm/internal/services/msi/sdk/managedidentity" +import ( + "github.com/hashicorp/terraform-provider-azurerm/internal/services/msi/sdk/2018-11-30/managedidentity" +) // these are here primarily to enable migration over diff --git a/internal/services/msi/sdk/managedidentity/client.go b/internal/services/msi/sdk/2018-11-30/managedidentity/client.go similarity index 100% rename from internal/services/msi/sdk/managedidentity/client.go rename to internal/services/msi/sdk/2018-11-30/managedidentity/client.go diff --git a/internal/services/msi/sdk/managedidentity/id_resourcegroup.go b/internal/services/msi/sdk/2018-11-30/managedidentity/id_resourcegroup.go similarity index 100% rename from internal/services/msi/sdk/managedidentity/id_resourcegroup.go rename to internal/services/msi/sdk/2018-11-30/managedidentity/id_resourcegroup.go diff --git a/internal/services/msi/sdk/managedidentity/id_resourcegroup_test.go b/internal/services/msi/sdk/2018-11-30/managedidentity/id_resourcegroup_test.go similarity index 100% rename from internal/services/msi/sdk/managedidentity/id_resourcegroup_test.go rename to internal/services/msi/sdk/2018-11-30/managedidentity/id_resourcegroup_test.go diff --git a/internal/services/msi/sdk/managedidentity/id_userassignedidentities.go b/internal/services/msi/sdk/2018-11-30/managedidentity/id_userassignedidentities.go similarity index 100% rename from internal/services/msi/sdk/managedidentity/id_userassignedidentities.go rename to internal/services/msi/sdk/2018-11-30/managedidentity/id_userassignedidentities.go diff --git a/internal/services/msi/sdk/managedidentity/id_userassignedidentities_test.go b/internal/services/msi/sdk/2018-11-30/managedidentity/id_userassignedidentities_test.go similarity index 100% rename from internal/services/msi/sdk/managedidentity/id_userassignedidentities_test.go rename to internal/services/msi/sdk/2018-11-30/managedidentity/id_userassignedidentities_test.go diff --git a/internal/services/msi/sdk/managedidentity/method_systemassignedidentitiesgetbyscope_autorest.go b/internal/services/msi/sdk/2018-11-30/managedidentity/method_systemassignedidentitiesgetbyscope_autorest.go similarity index 100% rename from internal/services/msi/sdk/managedidentity/method_systemassignedidentitiesgetbyscope_autorest.go rename to internal/services/msi/sdk/2018-11-30/managedidentity/method_systemassignedidentitiesgetbyscope_autorest.go diff --git a/internal/services/msi/sdk/managedidentity/method_userassignedidentitiescreateorupdate_autorest.go b/internal/services/msi/sdk/2018-11-30/managedidentity/method_userassignedidentitiescreateorupdate_autorest.go similarity index 100% rename from internal/services/msi/sdk/managedidentity/method_userassignedidentitiescreateorupdate_autorest.go rename to internal/services/msi/sdk/2018-11-30/managedidentity/method_userassignedidentitiescreateorupdate_autorest.go diff --git a/internal/services/msi/sdk/managedidentity/method_userassignedidentitiesdelete_autorest.go b/internal/services/msi/sdk/2018-11-30/managedidentity/method_userassignedidentitiesdelete_autorest.go similarity index 100% rename from internal/services/msi/sdk/managedidentity/method_userassignedidentitiesdelete_autorest.go rename to internal/services/msi/sdk/2018-11-30/managedidentity/method_userassignedidentitiesdelete_autorest.go diff --git a/internal/services/msi/sdk/managedidentity/method_userassignedidentitiesget_autorest.go b/internal/services/msi/sdk/2018-11-30/managedidentity/method_userassignedidentitiesget_autorest.go similarity index 100% rename from internal/services/msi/sdk/managedidentity/method_userassignedidentitiesget_autorest.go rename to internal/services/msi/sdk/2018-11-30/managedidentity/method_userassignedidentitiesget_autorest.go diff --git a/internal/services/msi/sdk/managedidentity/method_userassignedidentitieslistbyresourcegroup_autorest.go b/internal/services/msi/sdk/2018-11-30/managedidentity/method_userassignedidentitieslistbyresourcegroup_autorest.go similarity index 100% rename from internal/services/msi/sdk/managedidentity/method_userassignedidentitieslistbyresourcegroup_autorest.go rename to internal/services/msi/sdk/2018-11-30/managedidentity/method_userassignedidentitieslistbyresourcegroup_autorest.go diff --git a/internal/services/msi/sdk/managedidentity/method_userassignedidentitiesupdate_autorest.go b/internal/services/msi/sdk/2018-11-30/managedidentity/method_userassignedidentitiesupdate_autorest.go similarity index 100% rename from internal/services/msi/sdk/managedidentity/method_userassignedidentitiesupdate_autorest.go rename to internal/services/msi/sdk/2018-11-30/managedidentity/method_userassignedidentitiesupdate_autorest.go diff --git a/internal/services/msi/sdk/managedidentity/model_identity.go b/internal/services/msi/sdk/2018-11-30/managedidentity/model_identity.go similarity index 100% rename from internal/services/msi/sdk/managedidentity/model_identity.go rename to internal/services/msi/sdk/2018-11-30/managedidentity/model_identity.go diff --git a/internal/services/msi/sdk/managedidentity/model_identityupdate.go b/internal/services/msi/sdk/2018-11-30/managedidentity/model_identityupdate.go similarity index 100% rename from internal/services/msi/sdk/managedidentity/model_identityupdate.go rename to internal/services/msi/sdk/2018-11-30/managedidentity/model_identityupdate.go diff --git a/internal/services/msi/sdk/managedidentity/model_systemassignedidentity.go b/internal/services/msi/sdk/2018-11-30/managedidentity/model_systemassignedidentity.go similarity index 100% rename from internal/services/msi/sdk/managedidentity/model_systemassignedidentity.go rename to internal/services/msi/sdk/2018-11-30/managedidentity/model_systemassignedidentity.go diff --git a/internal/services/msi/sdk/managedidentity/model_systemassignedidentityproperties.go b/internal/services/msi/sdk/2018-11-30/managedidentity/model_systemassignedidentityproperties.go similarity index 100% rename from internal/services/msi/sdk/managedidentity/model_systemassignedidentityproperties.go rename to internal/services/msi/sdk/2018-11-30/managedidentity/model_systemassignedidentityproperties.go diff --git a/internal/services/msi/sdk/managedidentity/model_userassignedidentityproperties.go b/internal/services/msi/sdk/2018-11-30/managedidentity/model_userassignedidentityproperties.go similarity index 100% rename from internal/services/msi/sdk/managedidentity/model_userassignedidentityproperties.go rename to internal/services/msi/sdk/2018-11-30/managedidentity/model_userassignedidentityproperties.go diff --git a/internal/services/msi/sdk/managedidentity/version.go b/internal/services/msi/sdk/2018-11-30/managedidentity/version.go similarity index 100% rename from internal/services/msi/sdk/managedidentity/version.go rename to internal/services/msi/sdk/2018-11-30/managedidentity/version.go diff --git a/internal/services/msi/user_assigned_identity_data_source.go b/internal/services/msi/user_assigned_identity_data_source.go index 830fcfa820a5..67b462253870 100644 --- a/internal/services/msi/user_assigned_identity_data_source.go +++ b/internal/services/msi/user_assigned_identity_data_source.go @@ -4,11 +4,12 @@ import ( "fmt" "time" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/msi/sdk/2018-11-30/managedidentity" + "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-provider-azurerm/helpers/azure" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" "github.com/hashicorp/terraform-provider-azurerm/internal/location" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/msi/sdk/managedidentity" "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" diff --git a/internal/services/msi/user_assigned_identity_resource.go b/internal/services/msi/user_assigned_identity_resource.go index f2bbc068f460..3a63ac4aa963 100644 --- a/internal/services/msi/user_assigned_identity_resource.go +++ b/internal/services/msi/user_assigned_identity_resource.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-provider-azurerm/internal/clients" "github.com/hashicorp/terraform-provider-azurerm/internal/location" "github.com/hashicorp/terraform-provider-azurerm/internal/services/msi/migration" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/msi/sdk/managedidentity" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/msi/sdk/2018-11-30/managedidentity" "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" diff --git a/internal/services/msi/user_assigned_identity_resource_test.go b/internal/services/msi/user_assigned_identity_resource_test.go index 71b9f4a83590..7df2b80c94d9 100644 --- a/internal/services/msi/user_assigned_identity_resource_test.go +++ b/internal/services/msi/user_assigned_identity_resource_test.go @@ -5,11 +5,12 @@ import ( "fmt" "testing" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/msi/sdk/2018-11-30/managedidentity" + "github.com/hashicorp/terraform-provider-azurerm/helpers/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/msi/sdk/managedidentity" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/utils" ) diff --git a/internal/services/msi/validate/user_assigned_identity_id.go b/internal/services/msi/validate/user_assigned_identity_id.go index 143513846621..1b1d32e9b1a9 100644 --- a/internal/services/msi/validate/user_assigned_identity_id.go +++ b/internal/services/msi/validate/user_assigned_identity_id.go @@ -3,7 +3,7 @@ package validate import ( "fmt" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/msi/sdk/managedidentity" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/msi/sdk/2018-11-30/managedidentity" ) func UserAssignedIdentityID(input interface{}, key string) (warnings []string, errors []error) { diff --git a/internal/services/powerbi/client/client.go b/internal/services/powerbi/client/client.go index 9a8413854cd0..731f9afbabe6 100644 --- a/internal/services/powerbi/client/client.go +++ b/internal/services/powerbi/client/client.go @@ -2,7 +2,7 @@ package client import ( "github.com/hashicorp/terraform-provider-azurerm/internal/common" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/powerbi/sdk/capacities" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/powerbi/sdk/2021-01-01/capacities" ) type Client struct { diff --git a/internal/services/powerbi/powerbi_embedded_resource.go b/internal/services/powerbi/powerbi_embedded_resource.go index c45d4a218b2b..1b814cee63d3 100644 --- a/internal/services/powerbi/powerbi_embedded_resource.go +++ b/internal/services/powerbi/powerbi_embedded_resource.go @@ -5,14 +5,12 @@ import ( "log" "time" - "github.com/hashicorp/terraform-provider-azurerm/internal/location" - - "github.com/hashicorp/terraform-provider-azurerm/internal/services/powerbi/sdk/capacities" - "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/powerbi/sdk/2021-01-01/capacities" "github.com/hashicorp/terraform-provider-azurerm/internal/services/powerbi/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tags" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" diff --git a/internal/services/powerbi/powerbi_embedded_resource_test.go b/internal/services/powerbi/powerbi_embedded_resource_test.go index 1718e8383418..954f6fc8a48b 100644 --- a/internal/services/powerbi/powerbi_embedded_resource_test.go +++ b/internal/services/powerbi/powerbi_embedded_resource_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/powerbi/sdk/capacities" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/powerbi/sdk/2021-01-01/capacities" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" diff --git a/internal/services/powerbi/sdk/capacities/client.go b/internal/services/powerbi/sdk/2021-01-01/capacities/client.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/client.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/client.go diff --git a/internal/services/powerbi/sdk/capacities/constants.go b/internal/services/powerbi/sdk/2021-01-01/capacities/constants.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/constants.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/constants.go diff --git a/internal/services/powerbi/sdk/capacities/id_capacities.go b/internal/services/powerbi/sdk/2021-01-01/capacities/id_capacities.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/id_capacities.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/id_capacities.go diff --git a/internal/services/powerbi/sdk/capacities/id_capacities_test.go b/internal/services/powerbi/sdk/2021-01-01/capacities/id_capacities_test.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/id_capacities_test.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/id_capacities_test.go diff --git a/internal/services/powerbi/sdk/capacities/id_location.go b/internal/services/powerbi/sdk/2021-01-01/capacities/id_location.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/id_location.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/id_location.go diff --git a/internal/services/powerbi/sdk/capacities/id_location_test.go b/internal/services/powerbi/sdk/2021-01-01/capacities/id_location_test.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/id_location_test.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/id_location_test.go diff --git a/internal/services/powerbi/sdk/capacities/id_resourcegroup.go b/internal/services/powerbi/sdk/2021-01-01/capacities/id_resourcegroup.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/id_resourcegroup.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/id_resourcegroup.go diff --git a/internal/services/powerbi/sdk/capacities/id_resourcegroup_test.go b/internal/services/powerbi/sdk/2021-01-01/capacities/id_resourcegroup_test.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/id_resourcegroup_test.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/id_resourcegroup_test.go diff --git a/internal/services/powerbi/sdk/capacities/id_subscription.go b/internal/services/powerbi/sdk/2021-01-01/capacities/id_subscription.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/id_subscription.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/id_subscription.go diff --git a/internal/services/powerbi/sdk/capacities/id_subscription_test.go b/internal/services/powerbi/sdk/2021-01-01/capacities/id_subscription_test.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/id_subscription_test.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/id_subscription_test.go diff --git a/internal/services/powerbi/sdk/capacities/method_checknameavailability_autorest.go b/internal/services/powerbi/sdk/2021-01-01/capacities/method_checknameavailability_autorest.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/method_checknameavailability_autorest.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/method_checknameavailability_autorest.go diff --git a/internal/services/powerbi/sdk/capacities/method_create_autorest.go b/internal/services/powerbi/sdk/2021-01-01/capacities/method_create_autorest.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/method_create_autorest.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/method_create_autorest.go diff --git a/internal/services/powerbi/sdk/capacities/method_delete_autorest.go b/internal/services/powerbi/sdk/2021-01-01/capacities/method_delete_autorest.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/method_delete_autorest.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/method_delete_autorest.go diff --git a/internal/services/powerbi/sdk/capacities/method_getdetails_autorest.go b/internal/services/powerbi/sdk/2021-01-01/capacities/method_getdetails_autorest.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/method_getdetails_autorest.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/method_getdetails_autorest.go diff --git a/internal/services/powerbi/sdk/capacities/method_list_autorest.go b/internal/services/powerbi/sdk/2021-01-01/capacities/method_list_autorest.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/method_list_autorest.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/method_list_autorest.go diff --git a/internal/services/powerbi/sdk/capacities/method_listbyresourcegroup_autorest.go b/internal/services/powerbi/sdk/2021-01-01/capacities/method_listbyresourcegroup_autorest.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/method_listbyresourcegroup_autorest.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/method_listbyresourcegroup_autorest.go diff --git a/internal/services/powerbi/sdk/capacities/method_listskusforcapacity_autorest.go b/internal/services/powerbi/sdk/2021-01-01/capacities/method_listskusforcapacity_autorest.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/method_listskusforcapacity_autorest.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/method_listskusforcapacity_autorest.go diff --git a/internal/services/powerbi/sdk/capacities/method_resume_autorest.go b/internal/services/powerbi/sdk/2021-01-01/capacities/method_resume_autorest.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/method_resume_autorest.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/method_resume_autorest.go diff --git a/internal/services/powerbi/sdk/capacities/method_suspend_autorest.go b/internal/services/powerbi/sdk/2021-01-01/capacities/method_suspend_autorest.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/method_suspend_autorest.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/method_suspend_autorest.go diff --git a/internal/services/powerbi/sdk/capacities/method_update_autorest.go b/internal/services/powerbi/sdk/2021-01-01/capacities/method_update_autorest.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/method_update_autorest.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/method_update_autorest.go diff --git a/internal/services/powerbi/sdk/capacities/model_capacitysku.go b/internal/services/powerbi/sdk/2021-01-01/capacities/model_capacitysku.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/model_capacitysku.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/model_capacitysku.go diff --git a/internal/services/powerbi/sdk/capacities/model_checkcapacitynameavailabilityparameters.go b/internal/services/powerbi/sdk/2021-01-01/capacities/model_checkcapacitynameavailabilityparameters.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/model_checkcapacitynameavailabilityparameters.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/model_checkcapacitynameavailabilityparameters.go diff --git a/internal/services/powerbi/sdk/capacities/model_checkcapacitynameavailabilityresult.go b/internal/services/powerbi/sdk/2021-01-01/capacities/model_checkcapacitynameavailabilityresult.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/model_checkcapacitynameavailabilityresult.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/model_checkcapacitynameavailabilityresult.go diff --git a/internal/services/powerbi/sdk/capacities/model_dedicatedcapacities.go b/internal/services/powerbi/sdk/2021-01-01/capacities/model_dedicatedcapacities.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/model_dedicatedcapacities.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/model_dedicatedcapacities.go diff --git a/internal/services/powerbi/sdk/capacities/model_dedicatedcapacity.go b/internal/services/powerbi/sdk/2021-01-01/capacities/model_dedicatedcapacity.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/model_dedicatedcapacity.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/model_dedicatedcapacity.go diff --git a/internal/services/powerbi/sdk/capacities/model_dedicatedcapacityadministrators.go b/internal/services/powerbi/sdk/2021-01-01/capacities/model_dedicatedcapacityadministrators.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/model_dedicatedcapacityadministrators.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/model_dedicatedcapacityadministrators.go diff --git a/internal/services/powerbi/sdk/capacities/model_dedicatedcapacitymutableproperties.go b/internal/services/powerbi/sdk/2021-01-01/capacities/model_dedicatedcapacitymutableproperties.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/model_dedicatedcapacitymutableproperties.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/model_dedicatedcapacitymutableproperties.go diff --git a/internal/services/powerbi/sdk/capacities/model_dedicatedcapacityproperties.go b/internal/services/powerbi/sdk/2021-01-01/capacities/model_dedicatedcapacityproperties.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/model_dedicatedcapacityproperties.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/model_dedicatedcapacityproperties.go diff --git a/internal/services/powerbi/sdk/capacities/model_dedicatedcapacityupdateparameters.go b/internal/services/powerbi/sdk/2021-01-01/capacities/model_dedicatedcapacityupdateparameters.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/model_dedicatedcapacityupdateparameters.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/model_dedicatedcapacityupdateparameters.go diff --git a/internal/services/powerbi/sdk/capacities/model_skudetailsforexistingresource.go b/internal/services/powerbi/sdk/2021-01-01/capacities/model_skudetailsforexistingresource.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/model_skudetailsforexistingresource.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/model_skudetailsforexistingresource.go diff --git a/internal/services/powerbi/sdk/capacities/model_skuenumerationforexistingresourceresult.go b/internal/services/powerbi/sdk/2021-01-01/capacities/model_skuenumerationforexistingresourceresult.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/model_skuenumerationforexistingresourceresult.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/model_skuenumerationforexistingresourceresult.go diff --git a/internal/services/powerbi/sdk/capacities/model_systemdata.go b/internal/services/powerbi/sdk/2021-01-01/capacities/model_systemdata.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/model_systemdata.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/model_systemdata.go diff --git a/internal/services/powerbi/sdk/capacities/version.go b/internal/services/powerbi/sdk/2021-01-01/capacities/version.go similarity index 100% rename from internal/services/powerbi/sdk/capacities/version.go rename to internal/services/powerbi/sdk/2021-01-01/capacities/version.go diff --git a/internal/services/powerbi/validate/embedded_id.go b/internal/services/powerbi/validate/embedded_id.go index c75689135072..37e25a5a5193 100644 --- a/internal/services/powerbi/validate/embedded_id.go +++ b/internal/services/powerbi/validate/embedded_id.go @@ -3,7 +3,7 @@ package validate import ( "fmt" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/powerbi/sdk/capacities" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/powerbi/sdk/2021-01-01/capacities" ) func EmbeddedID(input interface{}, key string) (warnings []string, errors []error) { diff --git a/internal/services/relay/client/client.go b/internal/services/relay/client/client.go index a702ea5532e1..bda852db5409 100644 --- a/internal/services/relay/client/client.go +++ b/internal/services/relay/client/client.go @@ -2,8 +2,8 @@ package client import ( "github.com/hashicorp/terraform-provider-azurerm/internal/common" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/hybridconnections" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/namespaces" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/2017-04-01/hybridconnections" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/2017-04-01/namespaces" ) type Client struct { diff --git a/internal/services/relay/parse/hybrid_connection_id.go b/internal/services/relay/parse/hybrid_connection_id.go index 68bb5f4bb373..03fbfebaafc1 100644 --- a/internal/services/relay/parse/hybrid_connection_id.go +++ b/internal/services/relay/parse/hybrid_connection_id.go @@ -1,6 +1,8 @@ package parse -import "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/hybridconnections" +import ( + "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/2017-04-01/hybridconnections" +) func HybridConnectionID(input string) (*hybridconnections.HybridConnectionId, error) { return hybridconnections.ParseHybridConnectionID(input) diff --git a/internal/services/relay/parse/namespace_id.go b/internal/services/relay/parse/namespace_id.go index dcb7d8760a01..ff4e9fc1948e 100644 --- a/internal/services/relay/parse/namespace_id.go +++ b/internal/services/relay/parse/namespace_id.go @@ -1,6 +1,8 @@ package parse -import "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/namespaces" +import ( + "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/2017-04-01/namespaces" +) func NamespaceID(input string) (*namespaces.NamespaceId, error) { return namespaces.ParseNamespaceID(input) diff --git a/internal/services/relay/relay_hybrid_connection_resource.go b/internal/services/relay/relay_hybrid_connection_resource.go index 0171ea1509c5..6458d3bdee07 100644 --- a/internal/services/relay/relay_hybrid_connection_resource.go +++ b/internal/services/relay/relay_hybrid_connection_resource.go @@ -6,12 +6,11 @@ import ( "log" "time" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/hybridconnections" - "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/services/relay/sdk/2017-04-01/hybridconnections" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation" "github.com/hashicorp/terraform-provider-azurerm/internal/timeouts" diff --git a/internal/services/relay/relay_hybrid_connection_resource_test.go b/internal/services/relay/relay_hybrid_connection_resource_test.go index 0628f4838da8..42fb78280ddf 100644 --- a/internal/services/relay/relay_hybrid_connection_resource_test.go +++ b/internal/services/relay/relay_hybrid_connection_resource_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/hybridconnections" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/2017-04-01/hybridconnections" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" diff --git a/internal/services/relay/relay_namespace_resource.go b/internal/services/relay/relay_namespace_resource.go index 2c46620f5a9a..465ab7311052 100644 --- a/internal/services/relay/relay_namespace_resource.go +++ b/internal/services/relay/relay_namespace_resource.go @@ -11,7 +11,7 @@ import ( "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/relay/sdk/namespaces" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/2017-04-01/namespaces" "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" diff --git a/internal/services/relay/relay_namespace_resource_test.go b/internal/services/relay/relay_namespace_resource_test.go index 43d54fc02135..0bd141fe59b4 100644 --- a/internal/services/relay/relay_namespace_resource_test.go +++ b/internal/services/relay/relay_namespace_resource_test.go @@ -5,10 +5,11 @@ import ( "fmt" "testing" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/2017-04-01/namespaces" + "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/namespaces" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/utils" ) diff --git a/internal/services/relay/sdk/hybridconnections/client.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/client.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/client.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/client.go diff --git a/internal/services/relay/sdk/hybridconnections/constants.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/constants.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/constants.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/constants.go diff --git a/internal/services/relay/sdk/hybridconnections/id_authorizationrule.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/id_authorizationrule.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/id_authorizationrule.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/id_authorizationrule.go diff --git a/internal/services/relay/sdk/hybridconnections/id_authorizationrule_test.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/id_authorizationrule_test.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/id_authorizationrule_test.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/id_authorizationrule_test.go diff --git a/internal/services/relay/sdk/hybridconnections/id_hybridconnection.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/id_hybridconnection.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/id_hybridconnection.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/id_hybridconnection.go diff --git a/internal/services/relay/sdk/hybridconnections/id_hybridconnection_test.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/id_hybridconnection_test.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/id_hybridconnection_test.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/id_hybridconnection_test.go diff --git a/internal/services/relay/sdk/hybridconnections/id_namespace.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/id_namespace.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/id_namespace.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/id_namespace.go diff --git a/internal/services/relay/sdk/hybridconnections/id_namespace_test.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/id_namespace_test.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/id_namespace_test.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/id_namespace_test.go diff --git a/internal/services/relay/sdk/hybridconnections/method_createorupdate_autorest.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/method_createorupdate_autorest.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/method_createorupdate_autorest.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/method_createorupdate_autorest.go diff --git a/internal/services/relay/sdk/hybridconnections/method_createorupdateauthorizationrule_autorest.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/method_createorupdateauthorizationrule_autorest.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/method_createorupdateauthorizationrule_autorest.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/method_createorupdateauthorizationrule_autorest.go diff --git a/internal/services/relay/sdk/hybridconnections/method_delete_autorest.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/method_delete_autorest.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/method_delete_autorest.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/method_delete_autorest.go diff --git a/internal/services/relay/sdk/hybridconnections/method_deleteauthorizationrule_autorest.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/method_deleteauthorizationrule_autorest.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/method_deleteauthorizationrule_autorest.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/method_deleteauthorizationrule_autorest.go diff --git a/internal/services/relay/sdk/hybridconnections/method_get_autorest.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/method_get_autorest.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/method_get_autorest.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/method_get_autorest.go diff --git a/internal/services/relay/sdk/hybridconnections/method_getauthorizationrule_autorest.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/method_getauthorizationrule_autorest.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/method_getauthorizationrule_autorest.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/method_getauthorizationrule_autorest.go diff --git a/internal/services/relay/sdk/hybridconnections/method_listauthorizationrules_autorest.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/method_listauthorizationrules_autorest.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/method_listauthorizationrules_autorest.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/method_listauthorizationrules_autorest.go diff --git a/internal/services/relay/sdk/hybridconnections/method_listbynamespace_autorest.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/method_listbynamespace_autorest.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/method_listbynamespace_autorest.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/method_listbynamespace_autorest.go diff --git a/internal/services/relay/sdk/hybridconnections/method_listkeys_autorest.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/method_listkeys_autorest.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/method_listkeys_autorest.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/method_listkeys_autorest.go diff --git a/internal/services/relay/sdk/hybridconnections/method_regeneratekeys_autorest.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/method_regeneratekeys_autorest.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/method_regeneratekeys_autorest.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/method_regeneratekeys_autorest.go diff --git a/internal/services/relay/sdk/hybridconnections/model_accesskeys.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/model_accesskeys.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/model_accesskeys.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/model_accesskeys.go diff --git a/internal/services/relay/sdk/hybridconnections/model_authorizationrule.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/model_authorizationrule.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/model_authorizationrule.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/model_authorizationrule.go diff --git a/internal/services/relay/sdk/hybridconnections/model_authorizationruleproperties.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/model_authorizationruleproperties.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/model_authorizationruleproperties.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/model_authorizationruleproperties.go diff --git a/internal/services/relay/sdk/hybridconnections/model_hybridconnection.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/model_hybridconnection.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/model_hybridconnection.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/model_hybridconnection.go diff --git a/internal/services/relay/sdk/hybridconnections/model_hybridconnectionproperties.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/model_hybridconnectionproperties.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/model_hybridconnectionproperties.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/model_hybridconnectionproperties.go diff --git a/internal/services/relay/sdk/hybridconnections/model_regenerateaccesskeyparameters.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/model_regenerateaccesskeyparameters.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/model_regenerateaccesskeyparameters.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/model_regenerateaccesskeyparameters.go diff --git a/internal/services/relay/sdk/hybridconnections/predicates.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/predicates.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/predicates.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/predicates.go diff --git a/internal/services/relay/sdk/hybridconnections/version.go b/internal/services/relay/sdk/2017-04-01/hybridconnections/version.go similarity index 100% rename from internal/services/relay/sdk/hybridconnections/version.go rename to internal/services/relay/sdk/2017-04-01/hybridconnections/version.go diff --git a/internal/services/relay/sdk/namespaces/client.go b/internal/services/relay/sdk/2017-04-01/namespaces/client.go similarity index 100% rename from internal/services/relay/sdk/namespaces/client.go rename to internal/services/relay/sdk/2017-04-01/namespaces/client.go diff --git a/internal/services/relay/sdk/namespaces/constants.go b/internal/services/relay/sdk/2017-04-01/namespaces/constants.go similarity index 100% rename from internal/services/relay/sdk/namespaces/constants.go rename to internal/services/relay/sdk/2017-04-01/namespaces/constants.go diff --git a/internal/services/relay/sdk/namespaces/id_authorizationrule.go b/internal/services/relay/sdk/2017-04-01/namespaces/id_authorizationrule.go similarity index 100% rename from internal/services/relay/sdk/namespaces/id_authorizationrule.go rename to internal/services/relay/sdk/2017-04-01/namespaces/id_authorizationrule.go diff --git a/internal/services/relay/sdk/namespaces/id_authorizationrule_test.go b/internal/services/relay/sdk/2017-04-01/namespaces/id_authorizationrule_test.go similarity index 100% rename from internal/services/relay/sdk/namespaces/id_authorizationrule_test.go rename to internal/services/relay/sdk/2017-04-01/namespaces/id_authorizationrule_test.go diff --git a/internal/services/relay/sdk/namespaces/id_namespace.go b/internal/services/relay/sdk/2017-04-01/namespaces/id_namespace.go similarity index 100% rename from internal/services/relay/sdk/namespaces/id_namespace.go rename to internal/services/relay/sdk/2017-04-01/namespaces/id_namespace.go diff --git a/internal/services/relay/sdk/namespaces/id_namespace_test.go b/internal/services/relay/sdk/2017-04-01/namespaces/id_namespace_test.go similarity index 100% rename from internal/services/relay/sdk/namespaces/id_namespace_test.go rename to internal/services/relay/sdk/2017-04-01/namespaces/id_namespace_test.go diff --git a/internal/services/relay/sdk/namespaces/id_resourcegroup.go b/internal/services/relay/sdk/2017-04-01/namespaces/id_resourcegroup.go similarity index 100% rename from internal/services/relay/sdk/namespaces/id_resourcegroup.go rename to internal/services/relay/sdk/2017-04-01/namespaces/id_resourcegroup.go diff --git a/internal/services/relay/sdk/namespaces/id_resourcegroup_test.go b/internal/services/relay/sdk/2017-04-01/namespaces/id_resourcegroup_test.go similarity index 100% rename from internal/services/relay/sdk/namespaces/id_resourcegroup_test.go rename to internal/services/relay/sdk/2017-04-01/namespaces/id_resourcegroup_test.go diff --git a/internal/services/relay/sdk/namespaces/id_subscription.go b/internal/services/relay/sdk/2017-04-01/namespaces/id_subscription.go similarity index 100% rename from internal/services/relay/sdk/namespaces/id_subscription.go rename to internal/services/relay/sdk/2017-04-01/namespaces/id_subscription.go diff --git a/internal/services/relay/sdk/namespaces/id_subscription_test.go b/internal/services/relay/sdk/2017-04-01/namespaces/id_subscription_test.go similarity index 100% rename from internal/services/relay/sdk/namespaces/id_subscription_test.go rename to internal/services/relay/sdk/2017-04-01/namespaces/id_subscription_test.go diff --git a/internal/services/relay/sdk/namespaces/method_checknameavailability_autorest.go b/internal/services/relay/sdk/2017-04-01/namespaces/method_checknameavailability_autorest.go similarity index 100% rename from internal/services/relay/sdk/namespaces/method_checknameavailability_autorest.go rename to internal/services/relay/sdk/2017-04-01/namespaces/method_checknameavailability_autorest.go diff --git a/internal/services/relay/sdk/namespaces/method_createorupdate_autorest.go b/internal/services/relay/sdk/2017-04-01/namespaces/method_createorupdate_autorest.go similarity index 100% rename from internal/services/relay/sdk/namespaces/method_createorupdate_autorest.go rename to internal/services/relay/sdk/2017-04-01/namespaces/method_createorupdate_autorest.go diff --git a/internal/services/relay/sdk/namespaces/method_createorupdateauthorizationrule_autorest.go b/internal/services/relay/sdk/2017-04-01/namespaces/method_createorupdateauthorizationrule_autorest.go similarity index 100% rename from internal/services/relay/sdk/namespaces/method_createorupdateauthorizationrule_autorest.go rename to internal/services/relay/sdk/2017-04-01/namespaces/method_createorupdateauthorizationrule_autorest.go diff --git a/internal/services/relay/sdk/namespaces/method_delete_autorest.go b/internal/services/relay/sdk/2017-04-01/namespaces/method_delete_autorest.go similarity index 100% rename from internal/services/relay/sdk/namespaces/method_delete_autorest.go rename to internal/services/relay/sdk/2017-04-01/namespaces/method_delete_autorest.go diff --git a/internal/services/relay/sdk/namespaces/method_deleteauthorizationrule_autorest.go b/internal/services/relay/sdk/2017-04-01/namespaces/method_deleteauthorizationrule_autorest.go similarity index 100% rename from internal/services/relay/sdk/namespaces/method_deleteauthorizationrule_autorest.go rename to internal/services/relay/sdk/2017-04-01/namespaces/method_deleteauthorizationrule_autorest.go diff --git a/internal/services/relay/sdk/namespaces/method_get_autorest.go b/internal/services/relay/sdk/2017-04-01/namespaces/method_get_autorest.go similarity index 100% rename from internal/services/relay/sdk/namespaces/method_get_autorest.go rename to internal/services/relay/sdk/2017-04-01/namespaces/method_get_autorest.go diff --git a/internal/services/relay/sdk/namespaces/method_getauthorizationrule_autorest.go b/internal/services/relay/sdk/2017-04-01/namespaces/method_getauthorizationrule_autorest.go similarity index 100% rename from internal/services/relay/sdk/namespaces/method_getauthorizationrule_autorest.go rename to internal/services/relay/sdk/2017-04-01/namespaces/method_getauthorizationrule_autorest.go diff --git a/internal/services/relay/sdk/namespaces/method_list_autorest.go b/internal/services/relay/sdk/2017-04-01/namespaces/method_list_autorest.go similarity index 100% rename from internal/services/relay/sdk/namespaces/method_list_autorest.go rename to internal/services/relay/sdk/2017-04-01/namespaces/method_list_autorest.go diff --git a/internal/services/relay/sdk/namespaces/method_listauthorizationrules_autorest.go b/internal/services/relay/sdk/2017-04-01/namespaces/method_listauthorizationrules_autorest.go similarity index 100% rename from internal/services/relay/sdk/namespaces/method_listauthorizationrules_autorest.go rename to internal/services/relay/sdk/2017-04-01/namespaces/method_listauthorizationrules_autorest.go diff --git a/internal/services/relay/sdk/namespaces/method_listbyresourcegroup_autorest.go b/internal/services/relay/sdk/2017-04-01/namespaces/method_listbyresourcegroup_autorest.go similarity index 100% rename from internal/services/relay/sdk/namespaces/method_listbyresourcegroup_autorest.go rename to internal/services/relay/sdk/2017-04-01/namespaces/method_listbyresourcegroup_autorest.go diff --git a/internal/services/relay/sdk/namespaces/method_listkeys_autorest.go b/internal/services/relay/sdk/2017-04-01/namespaces/method_listkeys_autorest.go similarity index 100% rename from internal/services/relay/sdk/namespaces/method_listkeys_autorest.go rename to internal/services/relay/sdk/2017-04-01/namespaces/method_listkeys_autorest.go diff --git a/internal/services/relay/sdk/namespaces/method_regeneratekeys_autorest.go b/internal/services/relay/sdk/2017-04-01/namespaces/method_regeneratekeys_autorest.go similarity index 100% rename from internal/services/relay/sdk/namespaces/method_regeneratekeys_autorest.go rename to internal/services/relay/sdk/2017-04-01/namespaces/method_regeneratekeys_autorest.go diff --git a/internal/services/relay/sdk/namespaces/method_update_autorest.go b/internal/services/relay/sdk/2017-04-01/namespaces/method_update_autorest.go similarity index 100% rename from internal/services/relay/sdk/namespaces/method_update_autorest.go rename to internal/services/relay/sdk/2017-04-01/namespaces/method_update_autorest.go diff --git a/internal/services/relay/sdk/namespaces/model_accesskeys.go b/internal/services/relay/sdk/2017-04-01/namespaces/model_accesskeys.go similarity index 100% rename from internal/services/relay/sdk/namespaces/model_accesskeys.go rename to internal/services/relay/sdk/2017-04-01/namespaces/model_accesskeys.go diff --git a/internal/services/relay/sdk/namespaces/model_authorizationrule.go b/internal/services/relay/sdk/2017-04-01/namespaces/model_authorizationrule.go similarity index 100% rename from internal/services/relay/sdk/namespaces/model_authorizationrule.go rename to internal/services/relay/sdk/2017-04-01/namespaces/model_authorizationrule.go diff --git a/internal/services/relay/sdk/namespaces/model_authorizationruleproperties.go b/internal/services/relay/sdk/2017-04-01/namespaces/model_authorizationruleproperties.go similarity index 100% rename from internal/services/relay/sdk/namespaces/model_authorizationruleproperties.go rename to internal/services/relay/sdk/2017-04-01/namespaces/model_authorizationruleproperties.go diff --git a/internal/services/relay/sdk/namespaces/model_checknameavailability.go b/internal/services/relay/sdk/2017-04-01/namespaces/model_checknameavailability.go similarity index 100% rename from internal/services/relay/sdk/namespaces/model_checknameavailability.go rename to internal/services/relay/sdk/2017-04-01/namespaces/model_checknameavailability.go diff --git a/internal/services/relay/sdk/namespaces/model_checknameavailabilityresult.go b/internal/services/relay/sdk/2017-04-01/namespaces/model_checknameavailabilityresult.go similarity index 100% rename from internal/services/relay/sdk/namespaces/model_checknameavailabilityresult.go rename to internal/services/relay/sdk/2017-04-01/namespaces/model_checknameavailabilityresult.go diff --git a/internal/services/relay/sdk/namespaces/model_regenerateaccesskeyparameters.go b/internal/services/relay/sdk/2017-04-01/namespaces/model_regenerateaccesskeyparameters.go similarity index 100% rename from internal/services/relay/sdk/namespaces/model_regenerateaccesskeyparameters.go rename to internal/services/relay/sdk/2017-04-01/namespaces/model_regenerateaccesskeyparameters.go diff --git a/internal/services/relay/sdk/namespaces/model_relaynamespace.go b/internal/services/relay/sdk/2017-04-01/namespaces/model_relaynamespace.go similarity index 100% rename from internal/services/relay/sdk/namespaces/model_relaynamespace.go rename to internal/services/relay/sdk/2017-04-01/namespaces/model_relaynamespace.go diff --git a/internal/services/relay/sdk/namespaces/model_relaynamespaceproperties.go b/internal/services/relay/sdk/2017-04-01/namespaces/model_relaynamespaceproperties.go similarity index 100% rename from internal/services/relay/sdk/namespaces/model_relaynamespaceproperties.go rename to internal/services/relay/sdk/2017-04-01/namespaces/model_relaynamespaceproperties.go diff --git a/internal/services/relay/sdk/namespaces/model_relayupdateparameters.go b/internal/services/relay/sdk/2017-04-01/namespaces/model_relayupdateparameters.go similarity index 100% rename from internal/services/relay/sdk/namespaces/model_relayupdateparameters.go rename to internal/services/relay/sdk/2017-04-01/namespaces/model_relayupdateparameters.go diff --git a/internal/services/relay/sdk/namespaces/model_sku.go b/internal/services/relay/sdk/2017-04-01/namespaces/model_sku.go similarity index 100% rename from internal/services/relay/sdk/namespaces/model_sku.go rename to internal/services/relay/sdk/2017-04-01/namespaces/model_sku.go diff --git a/internal/services/relay/sdk/namespaces/predicates.go b/internal/services/relay/sdk/2017-04-01/namespaces/predicates.go similarity index 100% rename from internal/services/relay/sdk/namespaces/predicates.go rename to internal/services/relay/sdk/2017-04-01/namespaces/predicates.go diff --git a/internal/services/relay/sdk/namespaces/version.go b/internal/services/relay/sdk/2017-04-01/namespaces/version.go similarity index 100% rename from internal/services/relay/sdk/namespaces/version.go rename to internal/services/relay/sdk/2017-04-01/namespaces/version.go diff --git a/internal/services/relay/validate/hybrid_connection_id.go b/internal/services/relay/validate/hybrid_connection_id.go index 861b7d767b27..2874aef77c0e 100644 --- a/internal/services/relay/validate/hybrid_connection_id.go +++ b/internal/services/relay/validate/hybrid_connection_id.go @@ -3,7 +3,7 @@ package validate import ( "fmt" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/hybridconnections" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/2017-04-01/hybridconnections" ) func HybridConnectionID(input interface{}, key string) (warnings []string, errors []error) { diff --git a/internal/services/relay/validate/namespace_id.go b/internal/services/relay/validate/namespace_id.go index 47ed70e97ea4..df94b576cba5 100644 --- a/internal/services/relay/validate/namespace_id.go +++ b/internal/services/relay/validate/namespace_id.go @@ -3,7 +3,7 @@ package validate import ( "fmt" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/namespaces" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/2017-04-01/namespaces" ) func NamespaceID(input interface{}, key string) (warnings []string, errors []error) { diff --git a/internal/services/signalr/client/client.go b/internal/services/signalr/client/client.go index 20ce335cc65e..8896d65ee33d 100644 --- a/internal/services/signalr/client/client.go +++ b/internal/services/signalr/client/client.go @@ -2,7 +2,7 @@ package client import ( "github.com/hashicorp/terraform-provider-azurerm/internal/common" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/sdk/signalr" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/sdk/2020-05-01/signalr" ) type Client struct { diff --git a/internal/services/signalr/sdk/signalr/client.go b/internal/services/signalr/sdk/2020-05-01/signalr/client.go similarity index 100% rename from internal/services/signalr/sdk/signalr/client.go rename to internal/services/signalr/sdk/2020-05-01/signalr/client.go diff --git a/internal/services/signalr/sdk/signalr/constants.go b/internal/services/signalr/sdk/2020-05-01/signalr/constants.go similarity index 100% rename from internal/services/signalr/sdk/signalr/constants.go rename to internal/services/signalr/sdk/2020-05-01/signalr/constants.go diff --git a/internal/services/signalr/sdk/signalr/id_location.go b/internal/services/signalr/sdk/2020-05-01/signalr/id_location.go similarity index 100% rename from internal/services/signalr/sdk/signalr/id_location.go rename to internal/services/signalr/sdk/2020-05-01/signalr/id_location.go diff --git a/internal/services/signalr/sdk/signalr/id_location_test.go b/internal/services/signalr/sdk/2020-05-01/signalr/id_location_test.go similarity index 100% rename from internal/services/signalr/sdk/signalr/id_location_test.go rename to internal/services/signalr/sdk/2020-05-01/signalr/id_location_test.go diff --git a/internal/services/signalr/sdk/signalr/id_privateendpointconnection.go b/internal/services/signalr/sdk/2020-05-01/signalr/id_privateendpointconnection.go similarity index 100% rename from internal/services/signalr/sdk/signalr/id_privateendpointconnection.go rename to internal/services/signalr/sdk/2020-05-01/signalr/id_privateendpointconnection.go diff --git a/internal/services/signalr/sdk/signalr/id_privateendpointconnection_test.go b/internal/services/signalr/sdk/2020-05-01/signalr/id_privateendpointconnection_test.go similarity index 100% rename from internal/services/signalr/sdk/signalr/id_privateendpointconnection_test.go rename to internal/services/signalr/sdk/2020-05-01/signalr/id_privateendpointconnection_test.go diff --git a/internal/services/signalr/sdk/signalr/id_resourcegroup.go b/internal/services/signalr/sdk/2020-05-01/signalr/id_resourcegroup.go similarity index 100% rename from internal/services/signalr/sdk/signalr/id_resourcegroup.go rename to internal/services/signalr/sdk/2020-05-01/signalr/id_resourcegroup.go diff --git a/internal/services/signalr/sdk/signalr/id_resourcegroup_test.go b/internal/services/signalr/sdk/2020-05-01/signalr/id_resourcegroup_test.go similarity index 100% rename from internal/services/signalr/sdk/signalr/id_resourcegroup_test.go rename to internal/services/signalr/sdk/2020-05-01/signalr/id_resourcegroup_test.go diff --git a/internal/services/signalr/sdk/signalr/id_signalr.go b/internal/services/signalr/sdk/2020-05-01/signalr/id_signalr.go similarity index 100% rename from internal/services/signalr/sdk/signalr/id_signalr.go rename to internal/services/signalr/sdk/2020-05-01/signalr/id_signalr.go diff --git a/internal/services/signalr/sdk/signalr/id_signalr_test.go b/internal/services/signalr/sdk/2020-05-01/signalr/id_signalr_test.go similarity index 100% rename from internal/services/signalr/sdk/signalr/id_signalr_test.go rename to internal/services/signalr/sdk/2020-05-01/signalr/id_signalr_test.go diff --git a/internal/services/signalr/sdk/signalr/id_subscription.go b/internal/services/signalr/sdk/2020-05-01/signalr/id_subscription.go similarity index 100% rename from internal/services/signalr/sdk/signalr/id_subscription.go rename to internal/services/signalr/sdk/2020-05-01/signalr/id_subscription.go diff --git a/internal/services/signalr/sdk/signalr/id_subscription_test.go b/internal/services/signalr/sdk/2020-05-01/signalr/id_subscription_test.go similarity index 100% rename from internal/services/signalr/sdk/signalr/id_subscription_test.go rename to internal/services/signalr/sdk/2020-05-01/signalr/id_subscription_test.go diff --git a/internal/services/signalr/sdk/signalr/method_checknameavailability_autorest.go b/internal/services/signalr/sdk/2020-05-01/signalr/method_checknameavailability_autorest.go similarity index 100% rename from internal/services/signalr/sdk/signalr/method_checknameavailability_autorest.go rename to internal/services/signalr/sdk/2020-05-01/signalr/method_checknameavailability_autorest.go diff --git a/internal/services/signalr/sdk/signalr/method_createorupdate_autorest.go b/internal/services/signalr/sdk/2020-05-01/signalr/method_createorupdate_autorest.go similarity index 100% rename from internal/services/signalr/sdk/signalr/method_createorupdate_autorest.go rename to internal/services/signalr/sdk/2020-05-01/signalr/method_createorupdate_autorest.go diff --git a/internal/services/signalr/sdk/signalr/method_delete_autorest.go b/internal/services/signalr/sdk/2020-05-01/signalr/method_delete_autorest.go similarity index 100% rename from internal/services/signalr/sdk/signalr/method_delete_autorest.go rename to internal/services/signalr/sdk/2020-05-01/signalr/method_delete_autorest.go diff --git a/internal/services/signalr/sdk/signalr/method_get_autorest.go b/internal/services/signalr/sdk/2020-05-01/signalr/method_get_autorest.go similarity index 100% rename from internal/services/signalr/sdk/signalr/method_get_autorest.go rename to internal/services/signalr/sdk/2020-05-01/signalr/method_get_autorest.go diff --git a/internal/services/signalr/sdk/signalr/method_listbyresourcegroup_autorest.go b/internal/services/signalr/sdk/2020-05-01/signalr/method_listbyresourcegroup_autorest.go similarity index 100% rename from internal/services/signalr/sdk/signalr/method_listbyresourcegroup_autorest.go rename to internal/services/signalr/sdk/2020-05-01/signalr/method_listbyresourcegroup_autorest.go diff --git a/internal/services/signalr/sdk/signalr/method_listbysubscription_autorest.go b/internal/services/signalr/sdk/2020-05-01/signalr/method_listbysubscription_autorest.go similarity index 100% rename from internal/services/signalr/sdk/signalr/method_listbysubscription_autorest.go rename to internal/services/signalr/sdk/2020-05-01/signalr/method_listbysubscription_autorest.go diff --git a/internal/services/signalr/sdk/signalr/method_listkeys_autorest.go b/internal/services/signalr/sdk/2020-05-01/signalr/method_listkeys_autorest.go similarity index 100% rename from internal/services/signalr/sdk/signalr/method_listkeys_autorest.go rename to internal/services/signalr/sdk/2020-05-01/signalr/method_listkeys_autorest.go diff --git a/internal/services/signalr/sdk/signalr/method_privateendpointconnectionsdelete_autorest.go b/internal/services/signalr/sdk/2020-05-01/signalr/method_privateendpointconnectionsdelete_autorest.go similarity index 100% rename from internal/services/signalr/sdk/signalr/method_privateendpointconnectionsdelete_autorest.go rename to internal/services/signalr/sdk/2020-05-01/signalr/method_privateendpointconnectionsdelete_autorest.go diff --git a/internal/services/signalr/sdk/signalr/method_privateendpointconnectionsget_autorest.go b/internal/services/signalr/sdk/2020-05-01/signalr/method_privateendpointconnectionsget_autorest.go similarity index 100% rename from internal/services/signalr/sdk/signalr/method_privateendpointconnectionsget_autorest.go rename to internal/services/signalr/sdk/2020-05-01/signalr/method_privateendpointconnectionsget_autorest.go diff --git a/internal/services/signalr/sdk/signalr/method_privateendpointconnectionsupdate_autorest.go b/internal/services/signalr/sdk/2020-05-01/signalr/method_privateendpointconnectionsupdate_autorest.go similarity index 100% rename from internal/services/signalr/sdk/signalr/method_privateendpointconnectionsupdate_autorest.go rename to internal/services/signalr/sdk/2020-05-01/signalr/method_privateendpointconnectionsupdate_autorest.go diff --git a/internal/services/signalr/sdk/signalr/method_privatelinkresourceslist_autorest.go b/internal/services/signalr/sdk/2020-05-01/signalr/method_privatelinkresourceslist_autorest.go similarity index 100% rename from internal/services/signalr/sdk/signalr/method_privatelinkresourceslist_autorest.go rename to internal/services/signalr/sdk/2020-05-01/signalr/method_privatelinkresourceslist_autorest.go diff --git a/internal/services/signalr/sdk/signalr/method_regeneratekey_autorest.go b/internal/services/signalr/sdk/2020-05-01/signalr/method_regeneratekey_autorest.go similarity index 100% rename from internal/services/signalr/sdk/signalr/method_regeneratekey_autorest.go rename to internal/services/signalr/sdk/2020-05-01/signalr/method_regeneratekey_autorest.go diff --git a/internal/services/signalr/sdk/signalr/method_restart_autorest.go b/internal/services/signalr/sdk/2020-05-01/signalr/method_restart_autorest.go similarity index 100% rename from internal/services/signalr/sdk/signalr/method_restart_autorest.go rename to internal/services/signalr/sdk/2020-05-01/signalr/method_restart_autorest.go diff --git a/internal/services/signalr/sdk/signalr/method_update_autorest.go b/internal/services/signalr/sdk/2020-05-01/signalr/method_update_autorest.go similarity index 100% rename from internal/services/signalr/sdk/signalr/method_update_autorest.go rename to internal/services/signalr/sdk/2020-05-01/signalr/method_update_autorest.go diff --git a/internal/services/signalr/sdk/signalr/method_usageslist_autorest.go b/internal/services/signalr/sdk/2020-05-01/signalr/method_usageslist_autorest.go similarity index 100% rename from internal/services/signalr/sdk/signalr/method_usageslist_autorest.go rename to internal/services/signalr/sdk/2020-05-01/signalr/method_usageslist_autorest.go diff --git a/internal/services/signalr/sdk/signalr/model_nameavailability.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_nameavailability.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_nameavailability.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_nameavailability.go diff --git a/internal/services/signalr/sdk/signalr/model_nameavailabilityparameters.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_nameavailabilityparameters.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_nameavailabilityparameters.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_nameavailabilityparameters.go diff --git a/internal/services/signalr/sdk/signalr/model_networkacl.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_networkacl.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_networkacl.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_networkacl.go diff --git a/internal/services/signalr/sdk/signalr/model_privateendpoint.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_privateendpoint.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_privateendpoint.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_privateendpoint.go diff --git a/internal/services/signalr/sdk/signalr/model_privateendpointacl.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_privateendpointacl.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_privateendpointacl.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_privateendpointacl.go diff --git a/internal/services/signalr/sdk/signalr/model_privateendpointconnection.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_privateendpointconnection.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_privateendpointconnection.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_privateendpointconnection.go diff --git a/internal/services/signalr/sdk/signalr/model_privateendpointconnectionproperties.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_privateendpointconnectionproperties.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_privateendpointconnectionproperties.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_privateendpointconnectionproperties.go diff --git a/internal/services/signalr/sdk/signalr/model_privatelinkresource.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_privatelinkresource.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_privatelinkresource.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_privatelinkresource.go diff --git a/internal/services/signalr/sdk/signalr/model_privatelinkresourceproperties.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_privatelinkresourceproperties.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_privatelinkresourceproperties.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_privatelinkresourceproperties.go diff --git a/internal/services/signalr/sdk/signalr/model_privatelinkserviceconnectionstate.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_privatelinkserviceconnectionstate.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_privatelinkserviceconnectionstate.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_privatelinkserviceconnectionstate.go diff --git a/internal/services/signalr/sdk/signalr/model_regeneratekeyparameters.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_regeneratekeyparameters.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_regeneratekeyparameters.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_regeneratekeyparameters.go diff --git a/internal/services/signalr/sdk/signalr/model_resourcesku.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_resourcesku.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_resourcesku.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_resourcesku.go diff --git a/internal/services/signalr/sdk/signalr/model_serverlessupstreamsettings.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_serverlessupstreamsettings.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_serverlessupstreamsettings.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_serverlessupstreamsettings.go diff --git a/internal/services/signalr/sdk/signalr/model_signalrcorssettings.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_signalrcorssettings.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_signalrcorssettings.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_signalrcorssettings.go diff --git a/internal/services/signalr/sdk/signalr/model_signalrfeature.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_signalrfeature.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_signalrfeature.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_signalrfeature.go diff --git a/internal/services/signalr/sdk/signalr/model_signalrkeys.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_signalrkeys.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_signalrkeys.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_signalrkeys.go diff --git a/internal/services/signalr/sdk/signalr/model_signalrnetworkacls.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_signalrnetworkacls.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_signalrnetworkacls.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_signalrnetworkacls.go diff --git a/internal/services/signalr/sdk/signalr/model_signalrproperties.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_signalrproperties.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_signalrproperties.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_signalrproperties.go diff --git a/internal/services/signalr/sdk/signalr/model_signalrresource.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_signalrresource.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_signalrresource.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_signalrresource.go diff --git a/internal/services/signalr/sdk/signalr/model_signalrusage.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_signalrusage.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_signalrusage.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_signalrusage.go diff --git a/internal/services/signalr/sdk/signalr/model_signalrusagename.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_signalrusagename.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_signalrusagename.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_signalrusagename.go diff --git a/internal/services/signalr/sdk/signalr/model_upstreamtemplate.go b/internal/services/signalr/sdk/2020-05-01/signalr/model_upstreamtemplate.go similarity index 100% rename from internal/services/signalr/sdk/signalr/model_upstreamtemplate.go rename to internal/services/signalr/sdk/2020-05-01/signalr/model_upstreamtemplate.go diff --git a/internal/services/signalr/sdk/signalr/predicates.go b/internal/services/signalr/sdk/2020-05-01/signalr/predicates.go similarity index 100% rename from internal/services/signalr/sdk/signalr/predicates.go rename to internal/services/signalr/sdk/2020-05-01/signalr/predicates.go diff --git a/internal/services/signalr/sdk/signalr/version.go b/internal/services/signalr/sdk/2020-05-01/signalr/version.go similarity index 100% rename from internal/services/signalr/sdk/signalr/version.go rename to internal/services/signalr/sdk/2020-05-01/signalr/version.go diff --git a/internal/services/signalr/signalr_service_data_source.go b/internal/services/signalr/signalr_service_data_source.go index 89750191c56c..32a7898fed6f 100644 --- a/internal/services/signalr/signalr_service_data_source.go +++ b/internal/services/signalr/signalr_service_data_source.go @@ -4,12 +4,12 @@ import ( "fmt" "time" - "github.com/hashicorp/go-azure-helpers/response" - "github.com/hashicorp/terraform-provider-azurerm/internal/location" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/sdk/signalr" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/sdk/2020-05-01/signalr" + "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-provider-azurerm/helpers/azure" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" + "github.com/hashicorp/terraform-provider-azurerm/internal/location" "github.com/hashicorp/terraform-provider-azurerm/internal/tags" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/internal/timeouts" diff --git a/internal/services/signalr/signalr_service_network_acl_resource.go b/internal/services/signalr/signalr_service_network_acl_resource.go index c2a7b2d4649b..f20fd913b770 100644 --- a/internal/services/signalr/signalr_service_network_acl_resource.go +++ b/internal/services/signalr/signalr_service_network_acl_resource.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-azurerm/internal/clients" "github.com/hashicorp/terraform-provider-azurerm/internal/locks" networkValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/network/validate" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/sdk/signalr" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/sdk/2020-05-01/signalr" "github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation" diff --git a/internal/services/signalr/signalr_service_network_acl_resource_test.go b/internal/services/signalr/signalr_service_network_acl_resource_test.go index a85801cf2fd2..3f7b92159be4 100644 --- a/internal/services/signalr/signalr_service_network_acl_resource_test.go +++ b/internal/services/signalr/signalr_service_network_acl_resource_test.go @@ -5,11 +5,10 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/sdk/signalr" - "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/sdk/2020-05-01/signalr" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/utils" ) diff --git a/internal/services/signalr/signalr_service_resource.go b/internal/services/signalr/signalr_service_resource.go index 961ed70e1648..d29fab46b22c 100644 --- a/internal/services/signalr/signalr_service_resource.go +++ b/internal/services/signalr/signalr_service_resource.go @@ -11,7 +11,7 @@ import ( "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/signalr/sdk/signalr" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/sdk/2020-05-01/signalr" signalrValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tags" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" diff --git a/internal/services/signalr/signalr_service_resource_test.go b/internal/services/signalr/signalr_service_resource_test.go index 5da125007170..842f17d8de98 100644 --- a/internal/services/signalr/signalr_service_resource_test.go +++ b/internal/services/signalr/signalr_service_resource_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" - "github.com/hashicorp/go-azure-helpers/response" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/sdk/signalr" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/sdk/2020-05-01/signalr" + "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" diff --git a/internal/services/signalr/validate/service_id.go b/internal/services/signalr/validate/service_id.go index edec6296de45..0442fefc5875 100644 --- a/internal/services/signalr/validate/service_id.go +++ b/internal/services/signalr/validate/service_id.go @@ -3,7 +3,7 @@ package validate import ( "fmt" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/sdk/signalr" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/sdk/2020-05-01/signalr" ) func ServiceID(input interface{}, key string) (warnings []string, errors []error) { diff --git a/internal/services/vmware/client/client.go b/internal/services/vmware/client/client.go index 89bd06260ccf..30cc9fe27738 100644 --- a/internal/services/vmware/client/client.go +++ b/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 { diff --git a/internal/services/vmware/sdk/authorizations/client.go b/internal/services/vmware/sdk/2020-03-20/authorizations/client.go similarity index 100% rename from internal/services/vmware/sdk/authorizations/client.go rename to internal/services/vmware/sdk/2020-03-20/authorizations/client.go diff --git a/internal/services/vmware/sdk/authorizations/constants.go b/internal/services/vmware/sdk/2020-03-20/authorizations/constants.go similarity index 100% rename from internal/services/vmware/sdk/authorizations/constants.go rename to internal/services/vmware/sdk/2020-03-20/authorizations/constants.go diff --git a/internal/services/vmware/sdk/authorizations/id_authorization.go b/internal/services/vmware/sdk/2020-03-20/authorizations/id_authorization.go similarity index 100% rename from internal/services/vmware/sdk/authorizations/id_authorization.go rename to internal/services/vmware/sdk/2020-03-20/authorizations/id_authorization.go diff --git a/internal/services/vmware/sdk/authorizations/id_authorization_test.go b/internal/services/vmware/sdk/2020-03-20/authorizations/id_authorization_test.go similarity index 100% rename from internal/services/vmware/sdk/authorizations/id_authorization_test.go rename to internal/services/vmware/sdk/2020-03-20/authorizations/id_authorization_test.go diff --git a/internal/services/vmware/sdk/authorizations/id_privatecloud.go b/internal/services/vmware/sdk/2020-03-20/authorizations/id_privatecloud.go similarity index 100% rename from internal/services/vmware/sdk/authorizations/id_privatecloud.go rename to internal/services/vmware/sdk/2020-03-20/authorizations/id_privatecloud.go diff --git a/internal/services/vmware/sdk/authorizations/id_privatecloud_test.go b/internal/services/vmware/sdk/2020-03-20/authorizations/id_privatecloud_test.go similarity index 100% rename from internal/services/vmware/sdk/authorizations/id_privatecloud_test.go rename to internal/services/vmware/sdk/2020-03-20/authorizations/id_privatecloud_test.go diff --git a/internal/services/vmware/sdk/authorizations/method_createorupdate_autorest.go b/internal/services/vmware/sdk/2020-03-20/authorizations/method_createorupdate_autorest.go similarity index 100% rename from internal/services/vmware/sdk/authorizations/method_createorupdate_autorest.go rename to internal/services/vmware/sdk/2020-03-20/authorizations/method_createorupdate_autorest.go diff --git a/internal/services/vmware/sdk/authorizations/method_delete_autorest.go b/internal/services/vmware/sdk/2020-03-20/authorizations/method_delete_autorest.go similarity index 100% rename from internal/services/vmware/sdk/authorizations/method_delete_autorest.go rename to internal/services/vmware/sdk/2020-03-20/authorizations/method_delete_autorest.go diff --git a/internal/services/vmware/sdk/authorizations/method_get_autorest.go b/internal/services/vmware/sdk/2020-03-20/authorizations/method_get_autorest.go similarity index 100% rename from internal/services/vmware/sdk/authorizations/method_get_autorest.go rename to internal/services/vmware/sdk/2020-03-20/authorizations/method_get_autorest.go diff --git a/internal/services/vmware/sdk/authorizations/method_list_autorest.go b/internal/services/vmware/sdk/2020-03-20/authorizations/method_list_autorest.go similarity index 100% rename from internal/services/vmware/sdk/authorizations/method_list_autorest.go rename to internal/services/vmware/sdk/2020-03-20/authorizations/method_list_autorest.go diff --git a/internal/services/vmware/sdk/authorizations/model_expressrouteauthorization.go b/internal/services/vmware/sdk/2020-03-20/authorizations/model_expressrouteauthorization.go similarity index 100% rename from internal/services/vmware/sdk/authorizations/model_expressrouteauthorization.go rename to internal/services/vmware/sdk/2020-03-20/authorizations/model_expressrouteauthorization.go diff --git a/internal/services/vmware/sdk/authorizations/model_expressrouteauthorizationproperties.go b/internal/services/vmware/sdk/2020-03-20/authorizations/model_expressrouteauthorizationproperties.go similarity index 100% rename from internal/services/vmware/sdk/authorizations/model_expressrouteauthorizationproperties.go rename to internal/services/vmware/sdk/2020-03-20/authorizations/model_expressrouteauthorizationproperties.go diff --git a/internal/services/vmware/sdk/authorizations/version.go b/internal/services/vmware/sdk/2020-03-20/authorizations/version.go similarity index 100% rename from internal/services/vmware/sdk/authorizations/version.go rename to internal/services/vmware/sdk/2020-03-20/authorizations/version.go diff --git a/internal/services/vmware/sdk/clusters/client.go b/internal/services/vmware/sdk/2020-03-20/clusters/client.go similarity index 100% rename from internal/services/vmware/sdk/clusters/client.go rename to internal/services/vmware/sdk/2020-03-20/clusters/client.go diff --git a/internal/services/vmware/sdk/clusters/constants.go b/internal/services/vmware/sdk/2020-03-20/clusters/constants.go similarity index 100% rename from internal/services/vmware/sdk/clusters/constants.go rename to internal/services/vmware/sdk/2020-03-20/clusters/constants.go diff --git a/internal/services/vmware/sdk/clusters/id_cluster.go b/internal/services/vmware/sdk/2020-03-20/clusters/id_cluster.go similarity index 100% rename from internal/services/vmware/sdk/clusters/id_cluster.go rename to internal/services/vmware/sdk/2020-03-20/clusters/id_cluster.go diff --git a/internal/services/vmware/sdk/clusters/id_cluster_test.go b/internal/services/vmware/sdk/2020-03-20/clusters/id_cluster_test.go similarity index 100% rename from internal/services/vmware/sdk/clusters/id_cluster_test.go rename to internal/services/vmware/sdk/2020-03-20/clusters/id_cluster_test.go diff --git a/internal/services/vmware/sdk/clusters/id_privatecloud.go b/internal/services/vmware/sdk/2020-03-20/clusters/id_privatecloud.go similarity index 100% rename from internal/services/vmware/sdk/clusters/id_privatecloud.go rename to internal/services/vmware/sdk/2020-03-20/clusters/id_privatecloud.go diff --git a/internal/services/vmware/sdk/clusters/id_privatecloud_test.go b/internal/services/vmware/sdk/2020-03-20/clusters/id_privatecloud_test.go similarity index 100% rename from internal/services/vmware/sdk/clusters/id_privatecloud_test.go rename to internal/services/vmware/sdk/2020-03-20/clusters/id_privatecloud_test.go diff --git a/internal/services/vmware/sdk/clusters/method_createorupdate_autorest.go b/internal/services/vmware/sdk/2020-03-20/clusters/method_createorupdate_autorest.go similarity index 100% rename from internal/services/vmware/sdk/clusters/method_createorupdate_autorest.go rename to internal/services/vmware/sdk/2020-03-20/clusters/method_createorupdate_autorest.go diff --git a/internal/services/vmware/sdk/clusters/method_delete_autorest.go b/internal/services/vmware/sdk/2020-03-20/clusters/method_delete_autorest.go similarity index 100% rename from internal/services/vmware/sdk/clusters/method_delete_autorest.go rename to internal/services/vmware/sdk/2020-03-20/clusters/method_delete_autorest.go diff --git a/internal/services/vmware/sdk/clusters/method_get_autorest.go b/internal/services/vmware/sdk/2020-03-20/clusters/method_get_autorest.go similarity index 100% rename from internal/services/vmware/sdk/clusters/method_get_autorest.go rename to internal/services/vmware/sdk/2020-03-20/clusters/method_get_autorest.go diff --git a/internal/services/vmware/sdk/clusters/method_list_autorest.go b/internal/services/vmware/sdk/2020-03-20/clusters/method_list_autorest.go similarity index 100% rename from internal/services/vmware/sdk/clusters/method_list_autorest.go rename to internal/services/vmware/sdk/2020-03-20/clusters/method_list_autorest.go diff --git a/internal/services/vmware/sdk/clusters/method_update_autorest.go b/internal/services/vmware/sdk/2020-03-20/clusters/method_update_autorest.go similarity index 100% rename from internal/services/vmware/sdk/clusters/method_update_autorest.go rename to internal/services/vmware/sdk/2020-03-20/clusters/method_update_autorest.go diff --git a/internal/services/vmware/sdk/clusters/model_cluster.go b/internal/services/vmware/sdk/2020-03-20/clusters/model_cluster.go similarity index 100% rename from internal/services/vmware/sdk/clusters/model_cluster.go rename to internal/services/vmware/sdk/2020-03-20/clusters/model_cluster.go diff --git a/internal/services/vmware/sdk/clusters/model_clusterproperties.go b/internal/services/vmware/sdk/2020-03-20/clusters/model_clusterproperties.go similarity index 100% rename from internal/services/vmware/sdk/clusters/model_clusterproperties.go rename to internal/services/vmware/sdk/2020-03-20/clusters/model_clusterproperties.go diff --git a/internal/services/vmware/sdk/clusters/model_clusterupdate.go b/internal/services/vmware/sdk/2020-03-20/clusters/model_clusterupdate.go similarity index 100% rename from internal/services/vmware/sdk/clusters/model_clusterupdate.go rename to internal/services/vmware/sdk/2020-03-20/clusters/model_clusterupdate.go diff --git a/internal/services/vmware/sdk/clusters/model_clusterupdateproperties.go b/internal/services/vmware/sdk/2020-03-20/clusters/model_clusterupdateproperties.go similarity index 100% rename from internal/services/vmware/sdk/clusters/model_clusterupdateproperties.go rename to internal/services/vmware/sdk/2020-03-20/clusters/model_clusterupdateproperties.go diff --git a/internal/services/vmware/sdk/clusters/model_sku.go b/internal/services/vmware/sdk/2020-03-20/clusters/model_sku.go similarity index 100% rename from internal/services/vmware/sdk/clusters/model_sku.go rename to internal/services/vmware/sdk/2020-03-20/clusters/model_sku.go diff --git a/internal/services/vmware/sdk/clusters/version.go b/internal/services/vmware/sdk/2020-03-20/clusters/version.go similarity index 100% rename from internal/services/vmware/sdk/clusters/version.go rename to internal/services/vmware/sdk/2020-03-20/clusters/version.go diff --git a/internal/services/vmware/sdk/privateclouds/client.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/client.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/client.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/client.go diff --git a/internal/services/vmware/sdk/privateclouds/constants.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/constants.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/constants.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/constants.go diff --git a/internal/services/vmware/sdk/privateclouds/id_privatecloud.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/id_privatecloud.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/id_privatecloud.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/id_privatecloud.go diff --git a/internal/services/vmware/sdk/privateclouds/id_privatecloud_test.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/id_privatecloud_test.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/id_privatecloud_test.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/id_privatecloud_test.go diff --git a/internal/services/vmware/sdk/privateclouds/id_resourcegroup.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/id_resourcegroup.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/id_resourcegroup.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/id_resourcegroup.go diff --git a/internal/services/vmware/sdk/privateclouds/id_resourcegroup_test.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/id_resourcegroup_test.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/id_resourcegroup_test.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/id_resourcegroup_test.go diff --git a/internal/services/vmware/sdk/privateclouds/method_createorupdate_autorest.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/method_createorupdate_autorest.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/method_createorupdate_autorest.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/method_createorupdate_autorest.go diff --git a/internal/services/vmware/sdk/privateclouds/method_delete_autorest.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/method_delete_autorest.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/method_delete_autorest.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/method_delete_autorest.go diff --git a/internal/services/vmware/sdk/privateclouds/method_get_autorest.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/method_get_autorest.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/method_get_autorest.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/method_get_autorest.go diff --git a/internal/services/vmware/sdk/privateclouds/method_list_autorest.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/method_list_autorest.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/method_list_autorest.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/method_list_autorest.go diff --git a/internal/services/vmware/sdk/privateclouds/method_listadmincredentials_autorest.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/method_listadmincredentials_autorest.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/method_listadmincredentials_autorest.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/method_listadmincredentials_autorest.go diff --git a/internal/services/vmware/sdk/privateclouds/method_update_autorest.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/method_update_autorest.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/method_update_autorest.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/method_update_autorest.go diff --git a/internal/services/vmware/sdk/privateclouds/model_admincredentials.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/model_admincredentials.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/model_admincredentials.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/model_admincredentials.go diff --git a/internal/services/vmware/sdk/privateclouds/model_circuit.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/model_circuit.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/model_circuit.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/model_circuit.go diff --git a/internal/services/vmware/sdk/privateclouds/model_endpoints.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/model_endpoints.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/model_endpoints.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/model_endpoints.go diff --git a/internal/services/vmware/sdk/privateclouds/model_identitysource.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/model_identitysource.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/model_identitysource.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/model_identitysource.go diff --git a/internal/services/vmware/sdk/privateclouds/model_managementcluster.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/model_managementcluster.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/model_managementcluster.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/model_managementcluster.go diff --git a/internal/services/vmware/sdk/privateclouds/model_privatecloud.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/model_privatecloud.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/model_privatecloud.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/model_privatecloud.go diff --git a/internal/services/vmware/sdk/privateclouds/model_privatecloudproperties.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/model_privatecloudproperties.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/model_privatecloudproperties.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/model_privatecloudproperties.go diff --git a/internal/services/vmware/sdk/privateclouds/model_privatecloudupdate.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/model_privatecloudupdate.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/model_privatecloudupdate.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/model_privatecloudupdate.go diff --git a/internal/services/vmware/sdk/privateclouds/model_privatecloudupdateproperties.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/model_privatecloudupdateproperties.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/model_privatecloudupdateproperties.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/model_privatecloudupdateproperties.go diff --git a/internal/services/vmware/sdk/privateclouds/model_sku.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/model_sku.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/model_sku.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/model_sku.go diff --git a/internal/services/vmware/sdk/privateclouds/version.go b/internal/services/vmware/sdk/2020-03-20/privateclouds/version.go similarity index 100% rename from internal/services/vmware/sdk/privateclouds/version.go rename to internal/services/vmware/sdk/2020-03-20/privateclouds/version.go diff --git a/internal/services/vmware/validate/cluster_id.go b/internal/services/vmware/validate/cluster_id.go index edf768524146..4c175df6c129 100644 --- a/internal/services/vmware/validate/cluster_id.go +++ b/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) { diff --git a/internal/services/vmware/validate/express_route_authorization_id.go b/internal/services/vmware/validate/express_route_authorization_id.go index f8cb8a566863..c4bd6c1bad08 100644 --- a/internal/services/vmware/validate/express_route_authorization_id.go +++ b/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) { diff --git a/internal/services/vmware/validate/private_cloud_id.go b/internal/services/vmware/validate/private_cloud_id.go index fd635cc4bb3e..4059c1c00b88 100644 --- a/internal/services/vmware/validate/private_cloud_id.go +++ b/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) { diff --git a/internal/services/vmware/vmware_cluster_resource.go b/internal/services/vmware/vmware_cluster_resource.go index fbb97d326985..19e9d621056a 100644 --- a/internal/services/vmware/vmware_cluster_resource.go +++ b/internal/services/vmware/vmware_cluster_resource.go @@ -5,12 +5,11 @@ import ( "log" "time" - "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/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/sdk/2020-03-20/clusters" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/2020-03-20/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" diff --git a/internal/services/vmware/vmware_cluster_resource_test.go b/internal/services/vmware/vmware_cluster_resource_test.go index fff168c61757..b57e61918293 100644 --- a/internal/services/vmware/vmware_cluster_resource_test.go +++ b/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" diff --git a/internal/services/vmware/vmware_express_route_authorization_resource.go b/internal/services/vmware/vmware_express_route_authorization_resource.go index 5b24f3912242..bf010d7fbe9d 100644 --- a/internal/services/vmware/vmware_express_route_authorization_resource.go +++ b/internal/services/vmware/vmware_express_route_authorization_resource.go @@ -8,8 +8,8 @@ import ( "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/sdk/2020-03-20/authorizations" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/2020-03-20/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" diff --git a/internal/services/vmware/vmware_express_route_authorization_resource_test.go b/internal/services/vmware/vmware_express_route_authorization_resource_test.go index 91b77dbc469e..cb5e88e0ea44 100644 --- a/internal/services/vmware/vmware_express_route_authorization_resource_test.go +++ b/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" diff --git a/internal/services/vmware/vmware_private_cloud.go b/internal/services/vmware/vmware_private_cloud.go index dd841f4251d0..286b66656f85 100644 --- a/internal/services/vmware/vmware_private_cloud.go +++ b/internal/services/vmware/vmware_private_cloud.go @@ -1,7 +1,7 @@ package vmware import ( - "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/utils" ) diff --git a/internal/services/vmware/vmware_private_cloud_data_source.go b/internal/services/vmware/vmware_private_cloud_data_source.go index 61dbe529163c..3affc1a83dd5 100644 --- a/internal/services/vmware/vmware_private_cloud_data_source.go +++ b/internal/services/vmware/vmware_private_cloud_data_source.go @@ -5,12 +5,10 @@ import ( "time" "github.com/hashicorp/go-azure-helpers/response" - - "github.com/hashicorp/terraform-provider-azurerm/internal/services/vmware/sdk/privateclouds" - "github.com/hashicorp/terraform-provider-azurerm/helpers/azure" "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/2020-03-20/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/timeouts" diff --git a/internal/services/vmware/vmware_private_cloud_resource.go b/internal/services/vmware/vmware_private_cloud_resource.go index 7ab533e7c326..58c9057697d6 100644 --- a/internal/services/vmware/vmware_private_cloud_resource.go +++ b/internal/services/vmware/vmware_private_cloud_resource.go @@ -10,7 +10,7 @@ import ( "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/services/vmware/sdk/2020-03-20/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" diff --git a/internal/services/vmware/vmware_private_cloud_resource_test.go b/internal/services/vmware/vmware_private_cloud_resource_test.go index 1eec673b976a..4b36faae3e08 100644 --- a/internal/services/vmware/vmware_private_cloud_resource_test.go +++ b/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" diff --git a/internal/services/web/app_service_hybrid_connection_resource.go b/internal/services/web/app_service_hybrid_connection_resource.go index 1851be66d98c..ded552b6f233 100644 --- a/internal/services/web/app_service_hybrid_connection_resource.go +++ b/internal/services/web/app_service_hybrid_connection_resource.go @@ -6,8 +6,6 @@ import ( "log" "time" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/namespaces" - "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2021-01-15/web" "github.com/hashicorp/go-azure-helpers/response" "github.com/hashicorp/terraform-provider-azurerm/helpers/azure" @@ -15,6 +13,7 @@ import ( azValidate "github.com/hashicorp/terraform-provider-azurerm/helpers/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" relayParse "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/parse" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/sdk/2017-04-01/namespaces" relayValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/relay/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/services/web/parse" "github.com/hashicorp/terraform-provider-azurerm/internal/services/web/validate"