Fixes related to autogenerating the VPN Tunnel resource (hashicorp#1850)

Author: nat-henderson

google/resource_compute_region_disk.go

@@ -602,6 +602,9 @@ func flattenComputeRegionDiskSize(v interface{}) interface{} {
 }
 
 func flattenComputeRegionDiskType(v interface{}) interface{} {
+	if v == nil {
+		return v
+	}
 	return NameFromSelfLinkStateFunc(v)
 }
 
@@ -620,6 +623,9 @@ func flattenComputeRegionDiskReplicaZones(v interface{}) interface{} {
 }
 
 func flattenComputeRegionDiskRegion(v interface{}) interface{} {
+	if v == nil {
+		return v
+	}
 	return NameFromSelfLinkStateFunc(v)
 }
 

google/resource_compute_router.go

@@ -470,6 +470,9 @@ func flattenComputeRouterBgpAdvertisedIpRangesDescription(v interface{}) interfa
 }
 
 func flattenComputeRouterRegion(v interface{}) interface{} {
+	if v == nil {
+		return v
+	}
 	return NameFromSelfLinkStateFunc(v)
 }
 

google/resource_compute_vpn_tunnel.go

@@ -553,7 +553,10 @@ func flattenComputeVpnTunnelDescription(v interface{}) interface{} {
 }
 
 func flattenComputeVpnTunnelTargetVpnGateway(v interface{}) interface{} {
-	return v
+	if v == nil {
+		return v
+	}
+	return ConvertSelfLinkToV1(v.(string))
 }
 
 func flattenComputeVpnTunnelRouter(v interface{}) interface{} {

website/docs/r/compute_vpn_tunnel.html.markdown

@@ -113,6 +113,7 @@ resource "google_compute_route" "route1" {
 
 The following arguments are supported:
 
+
 * `name` -
   (Required)
   Name of the resource. The name must be 1-63 characters long, and
@@ -122,47 +123,56 @@ The following arguments are supported:
   must be a lowercase letter, and all following characters must
   be a dash, lowercase letter, or digit,
   except the last character, which cannot be a dash.
+
 * `target_vpn_gateway` -
   (Required)
   URL of the Target VPN gateway with which this VPN tunnel is
   associated.
+
 * `peer_ip` -
   (Required)
   IP address of the peer VPN gateway. Only IPv4 is supported.
+
 * `shared_secret` -
   (Required)
   Shared secret used to set the secure session between the Cloud VPN
   gateway and the peer VPN gateway.
 
-
 - - -
 
+
 * `description` -
   (Optional)
   An optional description of this resource.
+
 * `router` -
   (Optional)
   URL of router resource to be used for dynamic routing.
+
 * `ike_version` -
   (Optional)
   IKE protocol version to use when establishing the VPN tunnel with
   peer VPN gateway.
   Acceptable IKE versions are 1 or 2. Default version is 2.
+
 * `local_traffic_selector` -
   (Optional)
   Local traffic selector to use when establishing the VPN tunnel with
   peer VPN gateway. The value should be a CIDR formatted string,
   for example `192.168.0.0/16`. The ranges should be disjoint.
   Only IPv4 is supported.
+
 * `remote_traffic_selector` -
   (Optional)
   Remote traffic selector to use when establishing the VPN tunnel with
   peer VPN gateway. The value should be a CIDR formatted string,
   for example `192.168.0.0/16`. The ranges should be disjoint.
   Only IPv4 is supported.
+
 * `labels` -
   (Optional)
   Labels to apply to this VpnTunnel.
+
 * `region` -
   (Optional)
   The region where the tunnel is located.
@@ -174,13 +184,17 @@ The following arguments are supported:
 
 In addition to the arguments listed above, the following computed attributes are exported:
 
+
 * `creation_timestamp` -
   Creation timestamp in RFC3339 text format.
+
 * `shared_secret_hash` -
   Hash of the shared secret.
+
 * `label_fingerprint` -
   The fingerprint used for optimistic locking of this resource.  Used
   internally during updates.
+
 * `detailed_status` -
   Detailed status message for the VPN tunnel.
 * `self_link` - The URI of the created resource.