Merge pull request #5844 from terraform-providers/2.0-deprecated-reso…

…urces Removing Deprecated Resources
hashicorp · Feb 23, 2020 · 0e9a4ea · 0e9a4ea
2 parents efe2199 + edf8e37
commit 0e9a4ea
Show file tree

Hide file tree

Showing 44 changed files with 53 additions and 7,797 deletions.
diff --git a/azurerm/internal/services/authorization/data_source_builtin_role_definition.go b/azurerm/internal/services/authorization/data_source_builtin_role_definition.go
diff --git a/azurerm/internal/services/authorization/registration.go b/azurerm/internal/services/authorization/registration.go
@@ -21,9 +21,8 @@ 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_builtin_role_definition": dataSourceArmBuiltInRoleDefinition(),
-		"azurerm_client_config":           dataSourceArmClientConfig(),
-		"azurerm_role_definition":         dataSourceArmRoleDefinition(),
+		"azurerm_client_config":   dataSourceArmClientConfig(),
+		"azurerm_role_definition": dataSourceArmRoleDefinition(),
 	}
 }
 

diff --git a/azurerm/internal/services/authorization/tests/data_source_builtin_role_definition_test.go b/azurerm/internal/services/authorization/tests/data_source_builtin_role_definition_test.go
diff --git a/azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go b/azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go
@@ -342,13 +342,13 @@ data "azurerm_subscription" "primary" {}
 
 data "azurerm_client_config" "test" {}
 
-data "azurerm_builtin_role_definition" "test" {
+data "azurerm_role_definition" "test" {
   name = "Monitoring Reader"
 }
 
 resource "azurerm_role_assignment" "test" {
   scope              = "${data.azurerm_subscription.primary.id}"
-  role_definition_id = "${data.azurerm_subscription.primary.id}${data.azurerm_builtin_role_definition.test.id}"
+  role_definition_id = "${data.azurerm_subscription.primary.id}${data.azurerm_role_definition.test.id}"
   principal_id       = "${data.azurerm_client_config.test.service_principal_object_id}"
 }
 `
@@ -403,14 +403,14 @@ data "azurerm_subscription" "primary" {}
 
 data "azurerm_client_config" "test" {}
 
-data "azurerm_builtin_role_definition" "test" {
+data "azurerm_role_definition" "test" {
   name = "Site Recovery Reader"
 }
 
 resource "azurerm_role_assignment" "test" {
   name               = "%s"
   scope              = "${data.azurerm_subscription.primary.id}"
-  role_definition_id = "${data.azurerm_subscription.primary.id}${data.azurerm_builtin_role_definition.test.id}"
+  role_definition_id = "${data.azurerm_subscription.primary.id}${data.azurerm_role_definition.test.id}"
   principal_id       = "${data.azurerm_client_config.test.service_principal_object_id}"
 }
 `, id)

diff --git a/azurerm/internal/services/monitor/registration.go b/azurerm/internal/services/monitor/registration.go
@@ -29,13 +29,10 @@ func (r Registration) SupportedDataSources() map[string]*schema.Resource {
 // SupportedResources returns the supported Resources supported by this Service
 func (r Registration) SupportedResources() map[string]*schema.Resource {
 	return map[string]*schema.Resource{
-		"azurerm_autoscale_setting":          resourceArmAutoScaleSetting(),
-		"azurerm_metric_alertrule":           resourceArmMetricAlertRule(),
 		"azurerm_monitor_autoscale_setting":  resourceArmMonitorAutoScaleSetting(),
 		"azurerm_monitor_action_group":       resourceArmMonitorActionGroup(),
 		"azurerm_monitor_activity_log_alert": resourceArmMonitorActivityLogAlert(),
 		"azurerm_monitor_diagnostic_setting": resourceArmMonitorDiagnosticSetting(),
 		"azurerm_monitor_log_profile":        resourceArmMonitorLogProfile(),
-		"azurerm_monitor_metric_alert":       resourceArmMonitorMetricAlert(),
-		"azurerm_monitor_metric_alertrule":   resourceArmMonitorMetricAlertRule()}
+		"azurerm_monitor_metric_alert":       resourceArmMonitorMetricAlert()}
 }