Changed rules -> rule for consistency

Other resource types use the singular rule. Update for hashicorp#1083
pearcec · Apr 2, 2020 · 179f642 · 179f642
1 parent f345f5a
commit 179f642
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/azurerm/internal/services/network/data_source_route_filter.go b/azurerm/internal/services/network/data_source_route_filter.go
@@ -33,7 +33,7 @@ func dataSourceArmRouteFilter() *schema.Resource {
 
 			"location": azure.SchemaLocationForDataSource(),
 
-			"rules": {
+			"rule": {
 				Type:     schema.TypeList,
 				Computed: true,
 				Elem: &schema.Resource{
@@ -93,7 +93,7 @@ func dataSourceArmRouteFilterRead(d *schema.ResourceData, meta interface{}) erro
 		d.Set("location", azure.NormalizeLocation(*location))
 	}
 	if props := resp.RouteFilterPropertiesFormat; props != nil {
-		if err := d.Set("rules", flattenRouteFilterDataSourceRules(props.Rules)); err != nil {
+		if err := d.Set("rule", flattenRouteFilterDataSourceRules(props.Rules)); err != nil {
 			return err
 		}
 	}

diff --git a/azurerm/internal/services/network/resource_arm_route_filter.go b/azurerm/internal/services/network/resource_arm_route_filter.go
@@ -49,7 +49,7 @@ func resourceArmRouteFilter() *schema.Resource {
 
 			"resource_group_name": azure.SchemaResourceGroupName(),
 
-			"rules": {
+			"rule": {
 				Type:       schema.TypeList,
 				ConfigMode: schema.SchemaConfigModeAttr,
 				Optional:   true,
@@ -180,7 +180,7 @@ func resourceArmRouteFilterRead(d *schema.ResourceData, meta interface{}) error
 	}
 
 	if props := resp.RouteFilterPropertiesFormat; props != nil {
-		if err := d.Set("rules", flattenRouteFilterRules(props.Rules)); err != nil {
+		if err := d.Set("rule", flattenRouteFilterRules(props.Rules)); err != nil {
 			return err
 		}
 	}
@@ -213,7 +213,7 @@ func resourceArmRouteFilterDelete(d *schema.ResourceData, meta interface{}) erro
 }
 
 func expandRouteFilterRules(d *schema.ResourceData) *[]network.RouteFilterRule {
-	configs := d.Get("rules").([]interface{})
+	configs := d.Get("rule").([]interface{})
 	rules := make([]network.RouteFilterRule, 0, len(configs))
 
 	for _, configRaw := range configs {

diff --git a/azurerm/internal/services/network/tests/data_source_route_filter_test.go b/azurerm/internal/services/network/tests/data_source_route_filter_test.go
@@ -39,10 +39,10 @@ func TestAccDataSourceAzureRMRouteFilter_withRules(t *testing.T) {
 				Config: testAccDataSourceAzureRMRouteFilter_withRules(data),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMRouteFilterExists(data.ResourceName),
-					resource.TestCheckResourceAttr(data.ResourceName, "rules.#", "1"),
-					resource.TestCheckResourceAttr(data.ResourceName, "rules.0.access", "Allow"),
-					resource.TestCheckResourceAttr(data.ResourceName, "rules.0.rule_type", "Community"),
-					resource.TestCheckResourceAttr(data.ResourceName, "rules.0.communities.0", "12076:53005"),
+					resource.TestCheckResourceAttr(data.ResourceName, "rule.#", "1"),
+					resource.TestCheckResourceAttr(data.ResourceName, "rule.0.access", "Allow"),
+					resource.TestCheckResourceAttr(data.ResourceName, "rule.0.rule_type", "Community"),
+					resource.TestCheckResourceAttr(data.ResourceName, "rule.0.communities.0", "12076:53005"),
 				),
 			},
 		},

diff --git a/azurerm/internal/services/network/tests/resource_arm_route_filter_test.go b/azurerm/internal/services/network/tests/resource_arm_route_filter_test.go
@@ -119,22 +119,22 @@ func TestAccAzureRMRouteFilter_withRules(t *testing.T) {
 				Config: testAccAzureRMRouteFilter_withRules(data),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMRouteFilterExists(data.ResourceName),
-					resource.TestCheckResourceAttr(data.ResourceName, "rules.#", "1"),
-					resource.TestCheckResourceAttr(data.ResourceName, "rules.0.access", "Allow"),
-					resource.TestCheckResourceAttr(data.ResourceName, "rules.0.rule_type", "Community"),
-					resource.TestCheckResourceAttr(data.ResourceName, "rules.0.communities.0", "12076:53005"),
-					resource.TestCheckResourceAttr(data.ResourceName, "rules.0.communities.1", "12076:53006"),
+					resource.TestCheckResourceAttr(data.ResourceName, "rule.#", "1"),
+					resource.TestCheckResourceAttr(data.ResourceName, "rule.0.access", "Allow"),
+					resource.TestCheckResourceAttr(data.ResourceName, "rule.0.rule_type", "Community"),
+					resource.TestCheckResourceAttr(data.ResourceName, "rule.0.communities.0", "12076:53005"),
+					resource.TestCheckResourceAttr(data.ResourceName, "rule.0.communities.1", "12076:53006"),
 				),
 			},
 			{
 				Config: testAccAzureRMRouteFilter_withRulesUpdate(data),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMRouteFilterExists(data.ResourceName),
-					resource.TestCheckResourceAttr(data.ResourceName, "rules.#", "1"),
-					resource.TestCheckResourceAttr(data.ResourceName, "rules.0.access", "Allow"),
-					resource.TestCheckResourceAttr(data.ResourceName, "rules.0.rule_type", "Community"),
-					resource.TestCheckResourceAttr(data.ResourceName, "rules.0.communities.0", "12076:52005"),
-					resource.TestCheckResourceAttr(data.ResourceName, "rules.0.communities.1", "12076:52006"),
+					resource.TestCheckResourceAttr(data.ResourceName, "rule.#", "1"),
+					resource.TestCheckResourceAttr(data.ResourceName, "rule.0.access", "Allow"),
+					resource.TestCheckResourceAttr(data.ResourceName, "rule.0.rule_type", "Community"),
+					resource.TestCheckResourceAttr(data.ResourceName, "rule.0.communities.0", "12076:52005"),
+					resource.TestCheckResourceAttr(data.ResourceName, "rule.0.communities.1", "12076:52006"),
 				),
 			},
 		},
@@ -342,7 +342,7 @@ resource "azurerm_route_filter" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
 
-  rules {
+  rule {
     name      = "acctestrule%d"
     access    = "Allow"
     rule_type = "Community"
@@ -368,7 +368,7 @@ resource "azurerm_route_filter" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
 
-  rules {
+  rule {
     name      = "acctestrule%d"
     access    = "Allow"
     rule_type = "Community"

diff --git a/website/docs/d/route_filter.html.markdown b/website/docs/d/route_filter.html.markdown
@@ -39,13 +39,13 @@ In addition to the Arguments listed above - the following Attributes are exporte
 
 * `location` - The Azure Region where the Route Filter exists.
 
-* `rules` - A `rules` block as defined below.
+* `rule` - A `rule` block as defined below.
 
 * `tags` - A mapping of tags assigned to the Route Filter.
 
 ---
 
-A `rules` block exports the following:
+A `rule` block exports the following:
 
 * `access` - The access type of the rule
 

diff --git a/website/docs/r/route_filter.html.markdown b/website/docs/r/route_filter.html.markdown
@@ -18,7 +18,7 @@ resource "azurerm_route_filter" "example" {
   resource_group_name = "example"
   location = "East US"
 
-  rules {
+  rule {
     name = "rule"
     access = "Allow"
     rule_type = "Community"
@@ -39,13 +39,13 @@ The following arguments are supported:
 
 ---
 
-* `rules` - (Optional) A `rules` block as defined below.
+* `rule` - (Optional) A `rules` block as defined below.
 
 * `tags` - (Optional) A mapping of tags which should be assigned to the Route Filter.
 
 ---
 
-A `rules` block supports the following:
+A `rule` block supports the following:
 
 * `access` - (Required) The access type of the rule. The only possible value is `Allow`.