[UPDATE] add feedback

hashicorp · May 10, 2022 · f0e86b1 · f0e86b1
1 parent f19c6ed
commit f0e86b1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/internal/services/network/virtual_network_gateway_connection_resource.go b/internal/services/network/virtual_network_gateway_connection_resource.go
@@ -192,12 +192,12 @@ func resourceVirtualNetworkGatewayConnection() *pluginsdk.Resource {
 				MaxItems: 1,
 				Elem: &pluginsdk.Resource{
 					Schema: map[string]*pluginsdk.Schema{
-						"primary_address": {
+						"primary": {
 							Type:         pluginsdk.TypeString,
 							Required:     true,
 							ValidateFunc: validation.Any(validation.IsIPv4Address),
 						},
-						"secondary_address": {
+						"secondary": {
 							Type:         pluginsdk.TypeString,
 							Required:     true,
 							ValidateFunc: validation.Any(validation.IsIPv4Address),
@@ -744,8 +744,8 @@ func expandGatewayCustomBgpIPAddresses(d *pluginsdk.ResourceData, bgpPeeringAddr
 	}
 
 	bgAs := bgpAddresses[0].(map[string]interface{})
-	primaryAddress := bgAs["primary_address"].(string)
-	secondaryAddress := bgAs["secondary_address"].(string)
+	primaryAddress := bgAs["primary"].(string)
+	secondaryAddress := bgAs["secondary"].(string)
 
 	var primaryIpConfiguration *string
 	var secondaryIpConfiguration *string
@@ -810,8 +810,8 @@ func flattenGatewayCustomBgpIPAddresses(gatewayCustomBgpIPAddresses *[]network.G
 	if len(*gatewayCustomBgpIPAddresses) == 2 {
 		addresses := *gatewayCustomBgpIPAddresses
 		customBgpIpAdresses = append(customBgpIpAdresses, map[string]interface{}{
-			"primary_address":   addresses[0].CustomBgpIPAddress,
-			"secondary_address": addresses[1].CustomBgpIPAddress,
+			"primary":   addresses[0].CustomBgpIPAddress,
+			"secondary": addresses[1].CustomBgpIPAddress,
 		})
 	}
 

diff --git a/internal/services/network/virtual_network_gateway_connection_resource_test.go b/internal/services/network/virtual_network_gateway_connection_resource_test.go
@@ -225,8 +225,8 @@ func TestAccVirtualNetworkGatewayConnection_useCustomBgpAddresses(t *testing.T)
 			Config: r.useCustomBgpAddresses(data),
 			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
-				check.That(data.ResourceName).Key("custom_bgp_addresses.0.primary_address").HasValue("169.254.21.2"),
-				check.That(data.ResourceName).Key("custom_bgp_addresses.0.secondary_address").HasValue("169.254.21.6"),
+				check.That(data.ResourceName).Key("custom_bgp_addresses.0.primary").HasValue("169.254.21.2"),
+				check.That(data.ResourceName).Key("custom_bgp_addresses.0.secondary").HasValue("169.254.21.6"),
 			),
 		},
 		data.ImportStep(),
@@ -1229,8 +1229,8 @@ resource "azurerm_virtual_network_gateway_connection" "test" {
   enable_bgp = true
 
   custom_bgp_addresses {
-    primary_address   = "169.254.21.2"
-    secondary_address = "169.254.21.6"
+    primary = "169.254.21.2"
+    secondary = "169.254.21.6"
   }
 }
 `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger)

diff --git a/website/docs/d/virtual_network_gateway_connection.html.markdown b/website/docs/d/virtual_network_gateway_connection.html.markdown
@@ -87,8 +87,8 @@ output "virtual_network_gateway_connection_id" {
 * `tags` - A mapping of tags to assign to the resource.
 
 The `custom_bgp_addresses` block supports:
-* `primary_address` (Required) single IP address that is part of the `azurerm_virtual_network_gateway` ip_configuration (first one)
-* `secondary_address` (Required) single IP address that is part of the `azurerm_virtual_network_gateway` ip_configuration (second one)
+* `primary` (Required) single IP address that is part of the `azurerm_virtual_network_gateway` ip_configuration (first one)
+* `secondary` (Required) single IP address that is part of the `azurerm_virtual_network_gateway` ip_configuration (second one)
 
 The `ipsec_policy` block supports:
 

diff --git a/website/docs/r/virtual_network_gateway_connection.html.markdown b/website/docs/r/virtual_network_gateway_connection.html.markdown
@@ -280,8 +280,8 @@ Changing this value will force a resource to be created.
 * `tags` - (Optional) A mapping of tags to assign to the resource.
 
 The `custom_bgp_addresses` block supports:
-* `primary_address` (Required) single IP address that is part of the `azurerm_virtual_network_gateway` ip_configuration (first one)
-* `secondary_address` (Required) single IP address that is part of the `azurerm_virtual_network_gateway` ip_configuration (second one)
+* `primary` (Required) single IP address that is part of the `azurerm_virtual_network_gateway` ip_configuration (first one)
+* `secondary` (Required) single IP address that is part of the `azurerm_virtual_network_gateway` ip_configuration (second one)
 
 The `ipsec_policy` block supports: