Merge pull request hashicorp#12942 from hashicorp/f/versioning-embedd…

…ed-sdks refactor: including the API Version in the embedded sdk's
neil-yechenwei · Aug 11, 2021 · 1844d2f · 1844d2f
2 parents b2b5034 + 8cf3d21
commit 1844d2f
Show file tree

Hide file tree

Showing 522 changed files with 128 additions and 109 deletions.
diff --git 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
@@ -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
@@ -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/...es/analysisservices/sdk/servers/client.go → ...services/sdk/2017-08-01/servers/client.go b/...es/analysisservices/sdk/servers/client.go → ...services/sdk/2017-08-01/servers/client.go
diff --git a/...analysisservices/sdk/servers/constants.go → ...vices/sdk/2017-08-01/servers/constants.go b/...analysisservices/sdk/servers/constants.go → ...vices/sdk/2017-08-01/servers/constants.go
diff --git a/...alysisservices/sdk/servers/id_location.go → ...ces/sdk/2017-08-01/servers/id_location.go b/...alysisservices/sdk/servers/id_location.go → ...ces/sdk/2017-08-01/servers/id_location.go
diff --git a/...sservices/sdk/servers/id_location_test.go → ...dk/2017-08-01/servers/id_location_test.go b/...sservices/sdk/servers/id_location_test.go → ...dk/2017-08-01/servers/id_location_test.go
diff --git a/...rvices/sdk/servers/id_operationstatuse.go → ...2017-08-01/servers/id_operationstatuse.go b/...rvices/sdk/servers/id_operationstatuse.go → ...2017-08-01/servers/id_operationstatuse.go
diff --git a/...s/sdk/servers/id_operationstatuse_test.go → ...08-01/servers/id_operationstatuse_test.go b/...s/sdk/servers/id_operationstatuse_test.go → ...08-01/servers/id_operationstatuse_test.go
diff --git a/...sservices/sdk/servers/id_resourcegroup.go → ...dk/2017-08-01/servers/id_resourcegroup.go b/...sservices/sdk/servers/id_resourcegroup.go → ...dk/2017-08-01/servers/id_resourcegroup.go
diff --git a/...ices/sdk/servers/id_resourcegroup_test.go → ...17-08-01/servers/id_resourcegroup_test.go b/...ices/sdk/servers/id_resourcegroup_test.go → ...17-08-01/servers/id_resourcegroup_test.go
diff --git a/...analysisservices/sdk/servers/id_server.go → ...vices/sdk/2017-08-01/servers/id_server.go b/...analysisservices/sdk/servers/id_server.go → ...vices/sdk/2017-08-01/servers/id_server.go
diff --git a/...sisservices/sdk/servers/id_server_test.go → .../sdk/2017-08-01/servers/id_server_test.go b/...sisservices/sdk/servers/id_server_test.go → .../sdk/2017-08-01/servers/id_server_test.go
diff --git a/...isservices/sdk/servers/id_subscription.go → ...sdk/2017-08-01/servers/id_subscription.go b/...isservices/sdk/servers/id_subscription.go → ...sdk/2017-08-01/servers/id_subscription.go
diff --git a/...vices/sdk/servers/id_subscription_test.go → ...017-08-01/servers/id_subscription_test.go b/...vices/sdk/servers/id_subscription_test.go → ...017-08-01/servers/id_subscription_test.go
diff --git a/.../method_checknameavailability_autorest.go → .../method_checknameavailability_autorest.go b/.../method_checknameavailability_autorest.go → .../method_checknameavailability_autorest.go
diff --git a/...ces/sdk/servers/method_create_autorest.go → ...7-08-01/servers/method_create_autorest.go b/...ces/sdk/servers/method_create_autorest.go → ...7-08-01/servers/method_create_autorest.go
diff --git a/...ces/sdk/servers/method_delete_autorest.go → ...7-08-01/servers/method_delete_autorest.go b/...ces/sdk/servers/method_delete_autorest.go → ...7-08-01/servers/method_delete_autorest.go
diff --git a/...vers/method_dissociategateway_autorest.go → ...vers/method_dissociategateway_autorest.go b/...vers/method_dissociategateway_autorest.go → ...vers/method_dissociategateway_autorest.go
diff --git a/...sdk/servers/method_getdetails_autorest.go → ...-01/servers/method_getdetails_autorest.go b/...sdk/servers/method_getdetails_autorest.go → ...-01/servers/method_getdetails_autorest.go
diff --git a/...vices/sdk/servers/method_list_autorest.go → ...017-08-01/servers/method_list_autorest.go b/...vices/sdk/servers/method_list_autorest.go → ...017-08-01/servers/method_list_autorest.go
diff --git a/...rs/method_listbyresourcegroup_autorest.go → ...rs/method_listbyresourcegroup_autorest.go b/...rs/method_listbyresourcegroup_autorest.go → ...rs/method_listbyresourcegroup_autorest.go
diff --git a/...vers/method_listgatewaystatus_autorest.go → ...vers/method_listgatewaystatus_autorest.go b/...vers/method_listgatewaystatus_autorest.go → ...vers/method_listgatewaystatus_autorest.go
diff --git a/.../method_listoperationstatuses_autorest.go → .../method_listoperationstatuses_autorest.go b/.../method_listoperationstatuses_autorest.go → .../method_listoperationstatuses_autorest.go
diff --git a/...rs/method_listskusforexisting_autorest.go → ...rs/method_listskusforexisting_autorest.go b/...rs/method_listskusforexisting_autorest.go → ...rs/method_listskusforexisting_autorest.go
diff --git a/...ces/sdk/servers/method_resume_autorest.go → ...7-08-01/servers/method_resume_autorest.go b/...ces/sdk/servers/method_resume_autorest.go → ...7-08-01/servers/method_resume_autorest.go
diff --git a/...es/sdk/servers/method_suspend_autorest.go → ...-08-01/servers/method_suspend_autorest.go b/...es/sdk/servers/method_suspend_autorest.go → ...-08-01/servers/method_suspend_autorest.go
diff --git a/...ces/sdk/servers/method_update_autorest.go → ...7-08-01/servers/method_update_autorest.go b/...ces/sdk/servers/method_update_autorest.go → ...7-08-01/servers/method_update_autorest.go
diff --git a/...k/servers/model_analysisservicesserver.go → ...1/servers/model_analysisservicesserver.go b/...k/servers/model_analysisservicesserver.go → ...1/servers/model_analysisservicesserver.go
diff --git a/...nalysisservicesservermutableproperties.go → ...nalysisservicesservermutableproperties.go b/...nalysisservicesservermutableproperties.go → ...nalysisservicesservermutableproperties.go
diff --git a/...model_analysisservicesserverproperties.go → ...model_analysisservicesserverproperties.go b/...model_analysisservicesserverproperties.go → ...model_analysisservicesserverproperties.go
diff --git a/.../servers/model_analysisservicesservers.go → .../servers/model_analysisservicesservers.go b/.../servers/model_analysisservicesservers.go → .../servers/model_analysisservicesservers.go
diff --git a/...analysisservicesserverupdateparameters.go → ...analysisservicesserverupdateparameters.go b/...analysisservicesserverupdateparameters.go → ...analysisservicesserverupdateparameters.go
diff --git a/..._checkservernameavailabilityparameters.go → ..._checkservernameavailabilityparameters.go b/..._checkservernameavailabilityparameters.go → ..._checkservernameavailabilityparameters.go
diff --git a/...odel_checkservernameavailabilityresult.go → ...odel_checkservernameavailabilityresult.go b/...odel_checkservernameavailabilityresult.go → ...odel_checkservernameavailabilityresult.go
diff --git a/.../sdk/servers/model_erroradditionalinfo.go → ...8-01/servers/model_erroradditionalinfo.go b/.../sdk/servers/model_erroradditionalinfo.go → ...8-01/servers/model_erroradditionalinfo.go
diff --git a/...services/sdk/servers/model_errordetail.go → ...k/2017-08-01/servers/model_errordetail.go b/...services/sdk/servers/model_errordetail.go → ...k/2017-08-01/servers/model_errordetail.go
diff --git a/...vices/sdk/servers/model_gatewaydetails.go → ...017-08-01/servers/model_gatewaydetails.go b/...vices/sdk/servers/model_gatewaydetails.go → ...017-08-01/servers/model_gatewaydetails.go
diff --git a/...dk/servers/model_gatewayliststatuslive.go → ...01/servers/model_gatewayliststatuslive.go b/...dk/servers/model_gatewayliststatuslive.go → ...01/servers/model_gatewayliststatuslive.go
diff --git a/...ces/sdk/servers/model_ipv4firewallrule.go → ...7-08-01/servers/model_ipv4firewallrule.go b/...ces/sdk/servers/model_ipv4firewallrule.go → ...7-08-01/servers/model_ipv4firewallrule.go
diff --git a/...sdk/servers/model_ipv4firewallsettings.go → ...-01/servers/model_ipv4firewallsettings.go b/...sdk/servers/model_ipv4firewallsettings.go → ...-01/servers/model_ipv4firewallsettings.go
diff --git a/...ices/sdk/servers/model_operationstatus.go → ...17-08-01/servers/model_operationstatus.go b/...ices/sdk/servers/model_operationstatus.go → ...17-08-01/servers/model_operationstatus.go
diff --git a/...services/sdk/servers/model_resourcesku.go → ...k/2017-08-01/servers/model_resourcesku.go b/...services/sdk/servers/model_resourcesku.go → ...k/2017-08-01/servers/model_resourcesku.go
diff --git a/...sdk/servers/model_serveradministrators.go → ...-01/servers/model_serveradministrators.go b/...sdk/servers/model_serveradministrators.go → ...-01/servers/model_serveradministrators.go
diff --git a/...rs/model_skudetailsforexistingresource.go → ...rs/model_skudetailsforexistingresource.go b/...rs/model_skudetailsforexistingresource.go → ...rs/model_skudetailsforexistingresource.go
diff --git a/...kuenumerationforexistingresourceresult.go → ...kuenumerationforexistingresourceresult.go b/...kuenumerationforexistingresourceresult.go → ...kuenumerationforexistingresourceresult.go
diff --git a/...s/analysisservices/sdk/servers/version.go → ...ervices/sdk/2017-08-01/servers/version.go b/...s/analysisservices/sdk/servers/version.go → ...ervices/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...figuration/sdk/appconfiguration/client.go → ...ration/sdk/1.0/appconfiguration/client.go b/...figuration/sdk/appconfiguration/client.go → ...ration/sdk/1.0/appconfiguration/client.go
diff --git a/...figuration/sdk/appconfiguration/models.go → ...ration/sdk/1.0/appconfiguration/models.go b/...figuration/sdk/appconfiguration/models.go → ...ration/sdk/1.0/appconfiguration/models.go
diff --git a/...iguration/sdk/appconfiguration/version.go → ...ation/sdk/1.0/appconfiguration/version.go b/...iguration/sdk/appconfiguration/version.go → ...ation/sdk/1.0/appconfiguration/version.go
diff --git a/...uration/sdk/configurationstores/client.go → .../2020-06-01/configurationstores/client.go b/...uration/sdk/configurationstores/client.go → .../2020-06-01/configurationstores/client.go
diff --git a/...tion/sdk/configurationstores/constants.go → ...20-06-01/configurationstores/constants.go b/...tion/sdk/configurationstores/constants.go → ...20-06-01/configurationstores/constants.go
diff --git a/...figurationstores/id_configurationstore.go → ...figurationstores/id_configurationstore.go b/...figurationstores/id_configurationstore.go → ...figurationstores/id_configurationstore.go
diff --git a/...ationstores/id_configurationstore_test.go → ...ationstores/id_configurationstore_test.go b/...ationstores/id_configurationstore_test.go → ...ationstores/id_configurationstore_test.go
diff --git a/...igurationstores/method_create_autorest.go → ...igurationstores/method_create_autorest.go b/...igurationstores/method_create_autorest.go → ...igurationstores/method_create_autorest.go
diff --git a/...igurationstores/method_delete_autorest.go → ...igurationstores/method_delete_autorest.go b/...igurationstores/method_delete_autorest.go → ...igurationstores/method_delete_autorest.go
diff --git a/...onfigurationstores/method_get_autorest.go → ...onfigurationstores/method_get_autorest.go b/...onfigurationstores/method_get_autorest.go → ...onfigurationstores/method_get_autorest.go
diff --git a/...urationstores/method_listkeys_autorest.go → ...urationstores/method_listkeys_autorest.go b/...urationstores/method_listkeys_autorest.go → ...urationstores/method_listkeys_autorest.go
diff --git a/...igurationstores/method_update_autorest.go → ...igurationstores/method_update_autorest.go b/...igurationstores/method_update_autorest.go → ...igurationstores/method_update_autorest.go
diff --git a/...dk/configurationstores/model_accesskey.go → ...01/configurationstores/model_accesskey.go b/...dk/configurationstores/model_accesskey.go → ...01/configurationstores/model_accesskey.go
diff --git a/...urationstores/model_configurationstore.go → ...urationstores/model_configurationstore.go b/...urationstores/model_configurationstore.go → ...urationstores/model_configurationstore.go
diff --git a/...res/model_configurationstoreproperties.go → ...res/model_configurationstoreproperties.go b/...res/model_configurationstoreproperties.go → ...res/model_configurationstoreproperties.go
diff --git a/...urationstorepropertiesupdateparameters.go → ...urationstorepropertiesupdateparameters.go b/...urationstorepropertiesupdateparameters.go → ...urationstorepropertiesupdateparameters.go
diff --git a/...del_configurationstoreupdateparameters.go → ...del_configurationstoreupdateparameters.go b/...del_configurationstoreupdateparameters.go → ...del_configurationstoreupdateparameters.go
diff --git a/...ationstores/model_encryptionproperties.go → ...ationstores/model_encryptionproperties.go b/...ationstores/model_encryptionproperties.go → ...ationstores/model_encryptionproperties.go
diff --git a/...urationstores/model_keyvaultproperties.go → ...urationstores/model_keyvaultproperties.go b/...urationstores/model_keyvaultproperties.go → ...urationstores/model_keyvaultproperties.go
diff --git a/...figurationstores/model_privateendpoint.go → ...figurationstores/model_privateendpoint.go b/...figurationstores/model_privateendpoint.go → ...figurationstores/model_privateendpoint.go
diff --git a/...stores/model_privateendpointconnection.go → ...stores/model_privateendpointconnection.go b/...stores/model_privateendpointconnection.go → ...stores/model_privateendpointconnection.go
diff --git a/...el_privateendpointconnectionproperties.go → ...el_privateendpointconnectionproperties.go b/...el_privateendpointconnectionproperties.go → ...el_privateendpointconnectionproperties.go
diff --git a/...odel_privatelinkserviceconnectionstate.go → ...odel_privatelinkserviceconnectionstate.go b/...odel_privatelinkserviceconnectionstate.go → ...odel_privatelinkserviceconnectionstate.go
diff --git a/...igurationstores/model_resourceidentity.go → ...igurationstores/model_resourceidentity.go b/...igurationstores/model_resourceidentity.go → ...igurationstores/model_resourceidentity.go
diff --git a/...tion/sdk/configurationstores/model_sku.go → ...20-06-01/configurationstores/model_sku.go b/...tion/sdk/configurationstores/model_sku.go → ...20-06-01/configurationstores/model_sku.go
diff --git a/...ration/sdk/configurationstores/version.go → ...2020-06-01/configurationstores/version.go b/...ration/sdk/configurationstores/version.go → ...2020-06-01/configurationstores/version.go
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
 )