Merge pull request #5816 from terraform-providers/r/2.0-recoveryservices

removed deprecated recoveryservices resources. Updated datasource and docs
hashicorp · Feb 22, 2020 · 0ffc091 · 0ffc091
2 parents 7648d3a + fcd9aff
commit 0ffc091
Show file tree

Hide file tree

Showing 30 changed files with 70 additions and 5,512 deletions.
diff --git a/...recovery_services_protection_policy_vm.go → ...yservices/data_source_backup_policy_vm.go b/...recovery_services_protection_policy_vm.go → ...yservices/data_source_backup_policy_vm.go
@@ -14,7 +14,7 @@ import (
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
 
-func dataSourceArmRecoveryServicesProtectionPolicyVm() *schema.Resource {
+func dataSourceArmBackupPolicyVm() *schema.Resource {
 	return &schema.Resource{
 		Read: dataSourceArmRecoveryServicesProtectionPolicyVmRead,
 

diff --git a/azurerm/internal/services/recoveryservices/registration.go b/azurerm/internal/services/recoveryservices/registration.go
@@ -21,33 +21,25 @@ func (r Registration) WebsiteCategories() []string {
 // SupportedDataSources returns the supported Data Sources supported by this Service
 func (r Registration) SupportedDataSources() map[string]*schema.Resource {
 	return map[string]*schema.Resource{
-		"azurerm_recovery_services_vault":                dataSourceArmRecoveryServicesVault(),
-		"azurerm_recovery_services_protection_policy_vm": dataSourceArmRecoveryServicesProtectionPolicyVm(),
+		"azurerm_recovery_services_vault": dataSourceArmRecoveryServicesVault(),
+		"azurerm_backup_policy_vm":        dataSourceArmBackupPolicyVm(),
 	}
 }
 
 // SupportedResources returns the supported Resources supported by this Service
 func (r Registration) SupportedResources() map[string]*schema.Resource {
 	return map[string]*schema.Resource{
-		"azurerm_backup_container_storage_account":               resourceArmBackupProtectionContainerStorageAccount(),
-		"azurerm_backup_policy_file_share":                       resourceArmBackupProtectionPolicyFileShare(),
-		"azurerm_backup_protected_file_share":                    resourceArmBackupProtectedFileShare(),
-		"azurerm_backup_protected_vm":                            resourceArmRecoveryServicesBackupProtectedVM(),
-		"azurerm_backup_policy_vm":                               resourceArmBackupProtectionPolicyVM(),
-		"azurerm_recovery_network_mapping":                       resourceArmRecoveryServicesNetworkMapping(),
-		"azurerm_recovery_replicated_vm":                         resourceArmRecoveryServicesReplicatedVm(),
-		"azurerm_recovery_services_fabric":                       resourceArmRecoveryServicesFabric(),
-		"azurerm_recovery_services_protected_vm":                 resourceArmRecoveryServicesProtectedVm(),
-		"azurerm_recovery_services_protection_container":         resourceArmRecoveryServicesProtectionContainer(),
-		"azurerm_recovery_services_protection_container_mapping": resourceArmRecoveryServicesProtectionContainerMapping(),
-		"azurerm_recovery_services_protection_policy_vm":         resourceArmRecoveryServicesProtectionPolicyVm(),
-		"azurerm_recovery_services_replication_policy":           resourceArmRecoveryServicesReplicationPolicy(),
-		"azurerm_recovery_services_vault":                        resourceArmRecoveryServicesVault(),
-		"azurerm_site_recovery_fabric":                           resourceArmSiteRecoveryFabric(),
-		"azurerm_site_recovery_network_mapping":                  resourceArmSiteRecoveryNetworkMapping(),
-		"azurerm_site_recovery_protection_container":             resourceArmSiteRecoveryProtectionContainer(),
-		"azurerm_site_recovery_protection_container_mapping":     resourceArmSiteRecoveryProtectionContainerMapping(),
-		"azurerm_site_recovery_replicated_vm":                    resourceArmSiteRecoveryReplicatedVM(),
-		"azurerm_site_recovery_replication_policy":               resourceArmSiteRecoveryReplicationPolicy(),
+		"azurerm_backup_container_storage_account":           resourceArmBackupProtectionContainerStorageAccount(),
+		"azurerm_backup_policy_file_share":                   resourceArmBackupProtectionPolicyFileShare(),
+		"azurerm_backup_protected_file_share":                resourceArmBackupProtectedFileShare(),
+		"azurerm_backup_protected_vm":                        resourceArmRecoveryServicesBackupProtectedVM(),
+		"azurerm_backup_policy_vm":                           resourceArmBackupProtectionPolicyVM(),
+		"azurerm_recovery_services_vault":                    resourceArmRecoveryServicesVault(),
+		"azurerm_site_recovery_fabric":                       resourceArmSiteRecoveryFabric(),
+		"azurerm_site_recovery_network_mapping":              resourceArmSiteRecoveryNetworkMapping(),
+		"azurerm_site_recovery_protection_container":         resourceArmSiteRecoveryProtectionContainer(),
+		"azurerm_site_recovery_protection_container_mapping": resourceArmSiteRecoveryProtectionContainerMapping(),
+		"azurerm_site_recovery_replicated_vm":                resourceArmSiteRecoveryReplicatedVM(),
+		"azurerm_site_recovery_replication_policy":           resourceArmSiteRecoveryReplicationPolicy(),
 	}
 }
diff --git a/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_fabric.go b/azurerm/internal/services/recoveryservices/resource_arm_recovery_services_fabric.go