Skip to content

Commit

Permalink
Merge pull request #7776 from terraform-providers/b/expressroute-filt…
Browse files Browse the repository at this point in the history
…er-nil-panic
  • Loading branch information
jackofallops authored Jul 16, 2020
2 parents 8cadb59 + 31952a5 commit c883a72
Showing 1 changed file with 6 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,12 @@ func resourceArmExpressRouteCircuitPeeringRead(d *schema.ResourceData, meta inte
d.Set("primary_peer_address_prefix", props.PrimaryPeerAddressPrefix)
d.Set("secondary_peer_address_prefix", props.SecondaryPeerAddressPrefix)
d.Set("vlan_id", props.VlanID)
d.Set("route_filter_id", props.RouteFilter.ID)

routeFilterId := ""
if props.RouteFilter != nil && props.RouteFilter.ID != nil {
routeFilterId = *props.RouteFilter.ID
}
d.Set("route_filter_id", routeFilterId)

config := flattenExpressRouteCircuitPeeringMicrosoftConfig(props.MicrosoftPeeringConfig)
if err := d.Set("microsoft_peering_config", config); err != nil {
Expand Down

0 comments on commit c883a72

Please sign in to comment.