From aa802598aa55ecb509910eba2def3853f2278056 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Wed, 28 Aug 2019 09:41:51 -0700 Subject: [PATCH 1/3] Fix crash in vnet peering --- azurerm/resource_arm_virtual_network_peering.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/azurerm/resource_arm_virtual_network_peering.go b/azurerm/resource_arm_virtual_network_peering.go index b90cd66390a9..c6bf16b4f7da 100644 --- a/azurerm/resource_arm_virtual_network_peering.go +++ b/azurerm/resource_arm_virtual_network_peering.go @@ -147,17 +147,18 @@ func resourceArmVirtualNetworkPeeringRead(d *schema.ResourceData, meta interface return fmt.Errorf("Error making Read request on Azure virtual network peering %q: %+v", name, err) } - peer := *resp.VirtualNetworkPeeringPropertiesFormat - // update appropriate values d.Set("resource_group_name", resGroup) d.Set("name", resp.Name) d.Set("virtual_network_name", vnetName) - d.Set("allow_virtual_network_access", peer.AllowVirtualNetworkAccess) - d.Set("allow_forwarded_traffic", peer.AllowForwardedTraffic) - d.Set("allow_gateway_transit", peer.AllowGatewayTransit) - d.Set("use_remote_gateways", peer.UseRemoteGateways) - d.Set("remote_virtual_network_id", peer.RemoteVirtualNetwork.ID) + + if peer := resp.VirtualNetworkPeeringPropertiesFormat; peer != nil { + d.Set("allow_virtual_network_access", peer.AllowVirtualNetworkAccess) + d.Set("allow_forwarded_traffic", peer.AllowForwardedTraffic) + d.Set("allow_gateway_transit", peer.AllowGatewayTransit) + d.Set("use_remote_gateways", peer.UseRemoteGateways) + d.Set("remote_virtual_network_id", peer.RemoteVirtualNetwork.ID) + } return nil } From ffb8dfa7ca3f441db8aa188581cecf6d412b9554 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Wed, 28 Aug 2019 16:52:00 -0700 Subject: [PATCH 2/3] Update azurerm/resource_arm_virtual_network_peering.go Co-Authored-By: Tom Harvey --- azurerm/resource_arm_virtual_network_peering.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azurerm/resource_arm_virtual_network_peering.go b/azurerm/resource_arm_virtual_network_peering.go index c6bf16b4f7da..c7593daf27bf 100644 --- a/azurerm/resource_arm_virtual_network_peering.go +++ b/azurerm/resource_arm_virtual_network_peering.go @@ -157,7 +157,9 @@ func resourceArmVirtualNetworkPeeringRead(d *schema.ResourceData, meta interface d.Set("allow_forwarded_traffic", peer.AllowForwardedTraffic) d.Set("allow_gateway_transit", peer.AllowGatewayTransit) d.Set("use_remote_gateways", peer.UseRemoteGateways) - d.Set("remote_virtual_network_id", peer.RemoteVirtualNetwork.ID) + if network := peer.RemoteVirtualNetwork; network != nil { + d.Set("remote_virtual_network_id", .ID) + } } return nil From c942641ed7930a015991e9edd6c66ba0eb123f41 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Wed, 28 Aug 2019 16:53:23 -0700 Subject: [PATCH 3/3] Address review --- azurerm/resource_arm_virtual_network_peering.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/resource_arm_virtual_network_peering.go b/azurerm/resource_arm_virtual_network_peering.go index c7593daf27bf..0669f9bc332f 100644 --- a/azurerm/resource_arm_virtual_network_peering.go +++ b/azurerm/resource_arm_virtual_network_peering.go @@ -158,7 +158,7 @@ func resourceArmVirtualNetworkPeeringRead(d *schema.ResourceData, meta interface d.Set("allow_gateway_transit", peer.AllowGatewayTransit) d.Set("use_remote_gateways", peer.UseRemoteGateways) if network := peer.RemoteVirtualNetwork; network != nil { - d.Set("remote_virtual_network_id", .ID) + d.Set("remote_virtual_network_id", network.ID) } }