Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removing Deprecated Resources #5844

Merged
merged 5 commits into from
Feb 23, 2020
Merged

Removing Deprecated Resources #5844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bccc83d
removing deprecated resources
mbfrahry Feb 22, 2020
f8f5789
Merge branch 'master' into 2.0-deprecated-resources
tombuildsstuff Feb 23, 2020
3480dbb
r/(monitor_)metric_alert_rule: removing since these are EOL
tombuildsstuff Feb 23, 2020
2be06d6
sidebar: removing a dead link
tombuildsstuff Feb 23, 2020
edf8e37
building: removing references to dead tests
tombuildsstuff Feb 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
190 changes: 0 additions & 190 deletions azurerm/internal/services/authorization/data_source_builtin_role_definition.go
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions azurerm/internal/services/authorization/registration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
}
}

Expand Down
112 changes: 0 additions & 112 deletions azurerm/internal/services/authorization/tests/data_source_builtin_role_definition_test.go
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}
`
Expand Down Expand Up @@ -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)
Expand Down
5 changes: 1 addition & 4 deletions azurerm/internal/services/monitor/registration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()}
}
Loading