Data source virtual network add location (#4281)

Fixes: #4278
hashicorp · Sep 10, 2019 · 3697b8b · 3697b8b
1 parent 7da34ca
commit 3697b8b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/azurerm/data_source_virtual_network.go b/azurerm/data_source_virtual_network.go
@@ -22,6 +22,8 @@ func dataSourceArmVirtualNetwork() *schema.Resource {
 
 			"resource_group_name": azure.SchemaResourceGroupNameForDataSource(),
 
+			"location": azure.SchemaLocationForDataSource(),
+
 			"address_spaces": {
 				Type:       schema.TypeList,
 				Computed:   true,
@@ -84,6 +86,10 @@ func dataSourceArmVnetRead(d *schema.ResourceData, meta interface{}) error {
 	}
 	d.SetId(*resp.ID)
 
+	if location := resp.Location; location != nil {
+		d.Set("location", azure.NormalizeLocation(*location))
+	}
+
 	if props := resp.VirtualNetworkPropertiesFormat; props != nil {
 		if as := props.AddressSpace; as != nil {
 			if err := d.Set("address_spaces", utils.FlattenStringSlice(as.AddressPrefixes)); err != nil { //todo remove in 2.0

diff --git a/azurerm/data_source_virtual_network_test.go b/azurerm/data_source_virtual_network_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 )
 
@@ -13,6 +14,7 @@ func TestAccDataSourceArmVirtualNetwork_basic(t *testing.T) {
 	ri := tf.AccRandTimeInt()
 
 	name := fmt.Sprintf("acctestvnet-%d", ri)
+	location := testLocation()
 	config := testAccDataSourceArmVirtualNetwork_basic(ri, testLocation())
 
 	resource.ParallelTest(t, resource.TestCase{
@@ -23,6 +25,7 @@ func TestAccDataSourceArmVirtualNetwork_basic(t *testing.T) {
 				Config: config,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(dataSourceName, "name", name),
+					resource.TestCheckResourceAttr(dataSourceName, "location", azure.NormalizeLocation(location)),
 					resource.TestCheckResourceAttr(dataSourceName, "dns_servers.0", "10.0.0.4"),
 					resource.TestCheckResourceAttr(dataSourceName, "address_spaces.0", "10.0.0.0/16"),
 					resource.TestCheckResourceAttr(dataSourceName, "subnets.0", "subnet1"),

diff --git a/website/docs/d/virtual_network.html.markdown b/website/docs/d/virtual_network.html.markdown
@@ -31,6 +31,7 @@ output "virtual_network_id" {
 ## Attributes Reference
 
 * `id` - The ID of the virtual network.
+* `location` - Location of the virtual network.
 * `address_space` - The list of address spaces used by the virtual network.
 * `dns_servers` - The list of DNS servers used by the virtual network.
 * `subnets` - The list of name of the subnets that are attached to this virtual network.