From 5aa9f574eae1e717ec4e365a27b87e5027a193e2 Mon Sep 17 00:00:00 2001 From: Vincent Roseberry Date: Fri, 10 Nov 2017 10:57:53 -0800 Subject: [PATCH] Properly handle diff in google_compute_route next_hop_instance field (#716) --- google/resource_compute_route.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/google/resource_compute_route.go b/google/resource_compute_route.go index 417eb485..a544ffea 100644 --- a/google/resource_compute_route.go +++ b/google/resource_compute_route.go @@ -51,9 +51,10 @@ func resourceComputeRoute() *schema.Resource { }, "next_hop_instance": &schema.Schema{ - Type: schema.TypeString, - Optional: true, - ForceNew: true, + Type: schema.TypeString, + Optional: true, + ForceNew: true, + DiffSuppressFunc: compareSelfLinkOrResourceName, }, "next_hop_instance_zone": &schema.Schema{ @@ -210,7 +211,7 @@ func resourceComputeRouteRead(d *schema.ResourceData, meta interface{}) error { d.Set("network", route.Network) d.Set("priority", route.Priority) d.Set("next_hop_gateway", route.NextHopGateway) - d.Set("next_hop_instance", nextHopInstanceFieldValue.Name) + d.Set("next_hop_instance", nextHopInstanceFieldValue.RelativeLink()) d.Set("next_hop_instance_zone", nextHopInstanceFieldValue.Zone) d.Set("next_hop_ip", route.NextHopIp) d.Set("next_hop_vpn_tunnel", route.NextHopVpnTunnel)