Improve VPN gateway and router to generate network link without calling network API (hashicorp#527)

* Router network fields supports name in addition of self_link
* Improve VPN Gateway network field support

Author: rosbo

google/resource_compute_router.go

@@ -31,7 +31,7 @@ func resourceComputeRouter() *schema.Resource {
 				Type:             schema.TypeString,
 				Required:         true,
 				ForceNew:         true,
-				DiffSuppressFunc: linkDiffSuppress,
+				DiffSuppressFunc: compareSelfLinkOrResourceName,
 			},
 
 			"description": &schema.Schema{
@@ -99,15 +99,12 @@ func resourceComputeRouterCreate(d *schema.ResourceData, meta interface{}) error
 	mutexKV.Lock(routerLock)
 	defer mutexKV.Unlock(routerLock)
 
-	network, err := getNetworkLink(d, config, "network")
-	if err != nil {
-		return err
-	}
+	network := ParseNetworkFieldValue(d.Get("network").(string), config)
 	routersService := config.clientCompute.Routers
 
 	router := &compute.Router{
 		Name:    name,
-		Network: network,
+		Network: network.RelativeLink(),
 	}
 
 	if v, ok := d.GetOk("description"); ok {
@@ -127,13 +124,13 @@ func resourceComputeRouterCreate(d *schema.ResourceData, meta interface{}) error
 
 	op, err := routersService.Insert(project, region, router).Do()
 	if err != nil {
-		return fmt.Errorf("Error Inserting Router %s into network %s: %s", name, network, err)
+		return fmt.Errorf("Error Inserting Router %s into network %s: %s", name, network.Name, err)
 	}
 	d.SetId(fmt.Sprintf("%s/%s", region, name))
 	err = computeOperationWait(config, op, project, "Inserting Router")
 	if err != nil {
 		d.SetId("")
-		return fmt.Errorf("Error Waiting to Insert Router %s into network %s: %s", name, network, err)
+		return fmt.Errorf("Error Waiting to Insert Router %s into network %s: %s", name, network.Name, err)
 	}
 
 	return resourceComputeRouterRead(d, meta)

google/resource_compute_router_test.go

@@ -164,7 +164,8 @@ func testAccComputeRouterNoRegion(providerRegion string) string {
 		}
 		resource "google_compute_subnetwork" "foobar" {
 			name = "router-test-subnetwork-%s"
-			network = "${google_compute_network.foobar.self_link}"
+			network = "${google_compute_network.foobar.name}"
+			ip_cidr_range = "10.0.0.0/16"
 			ip_cidr_range = "10.0.0.0/16"
 			region = "%s"
 		}

google/resource_compute_vpn_gateway.go

@@ -24,9 +24,10 @@ func resourceComputeVpnGateway() *schema.Resource {
 			},
 
 			"network": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
+				Type:             schema.TypeString,
+				Required:         true,
+				ForceNew:         true,
+				DiffSuppressFunc: compareSelfLinkOrResourceName,
 			},
 
 			"description": &schema.Schema{
@@ -69,16 +70,13 @@ func resourceComputeVpnGatewayCreate(d *schema.ResourceData, meta interface{}) e
 	}
 
 	name := d.Get("name").(string)
-	network, err := getNetworkLink(d, config, "network")
-	if err != nil {
-		return err
-	}
+	network := ParseNetworkFieldValue(d.Get("network").(string), config)
 
 	vpnGatewaysService := compute.NewTargetVpnGatewaysService(config.clientCompute)
 
 	vpnGateway := &compute.TargetVpnGateway{
 		Name:    name,
-		Network: network,
+		Network: network.RelativeLink(),
 	}
 
 	if v, ok := d.GetOk("description"); ok {
@@ -87,12 +85,12 @@ func resourceComputeVpnGatewayCreate(d *schema.ResourceData, meta interface{}) e
 
 	op, err := vpnGatewaysService.Insert(project, region, vpnGateway).Do()
 	if err != nil {
-		return fmt.Errorf("Error Inserting VPN Gateway %s into network %s: %s", name, network, err)
+		return fmt.Errorf("Error Inserting VPN Gateway %s into network %s: %s", name, network.Name, err)
 	}
 
 	err = computeOperationWait(config, op, project, "Inserting VPN Gateway")
 	if err != nil {
-		return fmt.Errorf("Error Waiting to Insert VPN Gateway %s into network %s: %s", name, network, err)
+		return fmt.Errorf("Error Waiting to Insert VPN Gateway %s into network %s: %s", name, network.Name, err)
 	}
 
 	return resourceComputeVpnGatewayRead(d, meta)
@@ -120,6 +118,9 @@ func resourceComputeVpnGatewayRead(d *schema.ResourceData, meta interface{}) err
 		return handleNotFoundError(err, d, fmt.Sprintf("VPN Gateway %q", d.Get("name").(string)))
 	}
 
+	d.Set("name", vpnGateway.Name)
+	d.Set("description", vpnGateway.Description)
+	d.Set("network", vpnGateway.Network)
 	d.Set("self_link", vpnGateway.SelfLink)
 	d.SetId(name)