Add additional import formats, extend identity logic (#947)

Signed-off-by: Modular Magician <[email protected]>

google-beta/resource_cloud_scheduler_job.go

@@ -389,6 +389,7 @@ func resourceCloudSchedulerJobImport(d *schema.ResourceData, meta interface{}) (
 	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/locations/(?P<region>[^/]+)/jobs/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)",
+		"(?P<region>[^/]+)/(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

google-beta/resource_compute_address.go

@@ -424,6 +424,7 @@ func resourceComputeAddressImport(d *schema.ResourceData, meta interface{}) ([]*
 	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/regions/(?P<region>[^/]+)/addresses/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)",
+		"(?P<region>[^/]+)/(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

google-beta/resource_compute_disk.go

@@ -841,6 +841,7 @@ func resourceComputeDiskImport(d *schema.ResourceData, meta interface{}) ([]*sch
 	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/zones/(?P<zone>[^/]+)/disks/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<zone>[^/]+)/(?P<name>[^/]+)",
+		"(?P<zone>[^/]+)/(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

google-beta/resource_compute_forwarding_rule.go

@@ -600,6 +600,7 @@ func resourceComputeForwardingRuleImport(d *schema.ResourceData, meta interface{
 	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/regions/(?P<region>[^/]+)/forwardingRules/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)",
+		"(?P<region>[^/]+)/(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

google-beta/resource_compute_ha_vpn_gateway.go

@@ -252,6 +252,7 @@ func resourceComputeHaVpnGatewayImport(d *schema.ResourceData, meta interface{})
 	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/regions/(?P<region>[^/]+)/vpnGateways/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)",
+		"(?P<region>[^/]+)/(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

google-beta/resource_compute_interconnect_attachment.go

@@ -376,6 +376,7 @@ func resourceComputeInterconnectAttachmentImport(d *schema.ResourceData, meta in
 	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/regions/(?P<region>[^/]+)/interconnectAttachments/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)",
+		"(?P<region>[^/]+)/(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

google-beta/resource_compute_network_endpoint.go

@@ -277,10 +277,10 @@ func resourceComputeNetworkEndpointDelete(d *schema.ResourceData, meta interface
 func resourceComputeNetworkEndpointImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*Config)
 	if err := parseImportId([]string{
-		"projects/(?P<project>[^/]+)/zones/(?P<zone>[^/]+)/networkEndpointGroups/(?P<network_endpoint_group>[^/]+)/(?P<name>[^/]+)",
+		"projects/(?P<project>[^/]+)/zones/(?P<zone>[^/]+)/networkEndpointGroups/(?P<network_endpoint_group>[^/]+)/(?P<instance>[^/]+)/(?P<ip_address>[^/]+)/(?P<port>[^/]+)",
 		"(?P<project>[^/]+)/(?P<zone>[^/]+)/(?P<network_endpoint_group>[^/]+)/(?P<instance>[^/]+)/(?P<ip_address>[^/]+)/(?P<port>[^/]+)",
-		"(?P<project>[^/]+)/(?P<zone>[^/]+)/(?P<network_endpoint_group>[^/]+)/(?P<name>[^/]+)",
-		"(?P<network_endpoint_group>[^/]+)/(?P<name>[^/]+)",
+		"(?P<zone>[^/]+)/(?P<network_endpoint_group>[^/]+)/(?P<instance>[^/]+)/(?P<ip_address>[^/]+)/(?P<port>[^/]+)",
+		"(?P<network_endpoint_group>[^/]+)/(?P<instance>[^/]+)/(?P<ip_address>[^/]+)/(?P<port>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
@@ -356,11 +356,11 @@ func flattenNestedComputeNetworkEndpoint(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return nil, err
 	}
-	expectedPort, err := expandComputeNetworkEndpointPort(d.Get("port"), d, meta.(*Config))
+	expectedIpAddress, err := expandComputeNetworkEndpointIpAddress(d.Get("ip_address"), d, meta.(*Config))
 	if err != nil {
 		return nil, err
 	}
-	expectedIpAddress, err := expandComputeNetworkEndpointIpAddress(d.Get("ip_address"), d, meta.(*Config))
+	expectedPort, err := expandComputeNetworkEndpointPort(d.Get("port"), d, meta.(*Config))
 	if err != nil {
 		return nil, err
 	}
@@ -384,16 +384,16 @@ func flattenNestedComputeNetworkEndpoint(d *schema.ResourceData, meta interface{
 			log.Printf("[DEBUG] Skipping item with instance= %#v, looking for %#v)", itemInstance, expectedInstance)
 			continue
 		}
-		itemPort := flattenComputeNetworkEndpointPort(item["port"], d)
-		if !reflect.DeepEqual(itemPort, expectedPort) {
-			log.Printf("[DEBUG] Skipping item with port= %#v, looking for %#v)", itemPort, expectedPort)
-			continue
-		}
 		itemIpAddress := flattenComputeNetworkEndpointIpAddress(item["ipAddress"], d)
 		if !reflect.DeepEqual(itemIpAddress, expectedIpAddress) {
 			log.Printf("[DEBUG] Skipping item with ipAddress= %#v, looking for %#v)", itemIpAddress, expectedIpAddress)
 			continue
 		}
+		itemPort := flattenComputeNetworkEndpointPort(item["port"], d)
+		if !reflect.DeepEqual(itemPort, expectedPort) {
+			log.Printf("[DEBUG] Skipping item with port= %#v, looking for %#v)", itemPort, expectedPort)
+			continue
+		}
 		log.Printf("[DEBUG] Found item for resource %q: %#v)", d.Id(), item)
 		return item, nil
 	}

google-beta/resource_compute_network_endpoint_group.go

@@ -286,6 +286,7 @@ func resourceComputeNetworkEndpointGroupImport(d *schema.ResourceData, meta inte
 	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/zones/(?P<zone>[^/]+)/networkEndpointGroups/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<zone>[^/]+)/(?P<name>[^/]+)",
+		"(?P<zone>[^/]+)/(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

google-beta/resource_compute_node_group.go

@@ -303,6 +303,7 @@ func resourceComputeNodeGroupImport(d *schema.ResourceData, meta interface{}) ([
 	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/zones/(?P<zone>[^/]+)/nodeGroups/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<zone>[^/]+)/(?P<name>[^/]+)",
+		"(?P<zone>[^/]+)/(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

google-beta/resource_compute_node_template.go

@@ -314,6 +314,7 @@ func resourceComputeNodeTemplateImport(d *schema.ResourceData, meta interface{})
 	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/regions/(?P<region>[^/]+)/nodeTemplates/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)",
+		"(?P<region>[^/]+)/(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

google-beta/resource_compute_region_backend_service.go

@@ -515,6 +515,7 @@ func resourceComputeRegionBackendServiceImport(d *schema.ResourceData, meta inte
 	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/regions/(?P<region>[^/]+)/backendServices/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)",
+		"(?P<region>[^/]+)/(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

google-beta/resource_compute_region_disk.go

@@ -595,6 +595,7 @@ func resourceComputeRegionDiskImport(d *schema.ResourceData, meta interface{}) (
 	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/regions/(?P<region>[^/]+)/disks/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)",
+		"(?P<region>[^/]+)/(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

google-beta/resource_compute_resource_policy.go

@@ -363,6 +363,7 @@ func resourceComputeResourcePolicyImport(d *schema.ResourceData, meta interface{
 	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/regions/(?P<region>[^/]+)/resourcePolicies/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)",
+		"(?P<region>[^/]+)/(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

google-beta/resource_compute_target_instance.go

@@ -256,6 +256,7 @@ func resourceComputeTargetInstanceImport(d *schema.ResourceData, meta interface{
 	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/zones/(?P<zone>[^/]+)/targetInstances/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<zone>[^/]+)/(?P<name>[^/]+)",
+		"(?P<zone>[^/]+)/(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

google-beta/resource_compute_vpn_gateway.go

@@ -238,6 +238,7 @@ func resourceComputeVpnGatewayImport(d *schema.ResourceData, meta interface{}) (
 	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/regions/(?P<region>[^/]+)/targetVpnGateways/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)",
+		"(?P<region>[^/]+)/(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

google-beta/resource_compute_vpn_tunnel.go

@@ -657,6 +657,7 @@ func resourceComputeVpnTunnelImport(d *schema.ResourceData, meta interface{}) ([
 	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/regions/(?P<region>[^/]+)/vpnTunnels/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)",
+		"(?P<region>[^/]+)/(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

google-beta/resource_filestore_instance.go

@@ -364,6 +364,7 @@ func resourceFilestoreInstanceImport(d *schema.ResourceData, meta interface{}) (
 	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/locations/(?P<zone>[^/]+)/instances/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<zone>[^/]+)/(?P<name>[^/]+)",
+		"(?P<zone>[^/]+)/(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

google-beta/resource_redis_instance.go

@@ -450,6 +450,7 @@ func resourceRedisInstanceImport(d *schema.ResourceData, meta interface{}) ([]*s
 	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/locations/(?P<region>[^/]+)/instances/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)",
+		"(?P<region>[^/]+)/(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

google-beta/resource_sql_database.go

@@ -315,7 +315,6 @@ func resourceSqlDatabaseImport(d *schema.ResourceData, meta interface{}) ([]*sch
 		"instances/(?P<instance>[^/]+)/databases/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<instance>[^/]+)/(?P<name>[^/]+)",
 		"(?P<instance>[^/]+)/(?P<name>[^/]+)",
-		"(?P<instance>[^/]+):(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

google-beta/resource_tpu_node.go

@@ -392,6 +392,7 @@ func resourceTpuNodeImport(d *schema.ResourceData, meta interface{}) ([]*schema.
 	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/locations/(?P<zone>[^/]+)/nodes/(?P<name>[^/]+)",
 		"(?P<project>[^/]+)/(?P<zone>[^/]+)/(?P<name>[^/]+)",
+		"(?P<zone>[^/]+)/(?P<name>[^/]+)",
 		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err

website/docs/r/cloud_scheduler_job.html.markdown

@@ -303,6 +303,7 @@ Job can be imported using any of these accepted formats:
 ```
 $ terraform import google_cloud_scheduler_job.default projects/{{project}}/locations/{{region}}/jobs/{{name}}
 $ terraform import google_cloud_scheduler_job.default {{project}}/{{region}}/{{name}}
+$ terraform import google_cloud_scheduler_job.default {{region}}/{{name}}
 $ terraform import google_cloud_scheduler_job.default {{name}}
 ```
 

website/docs/r/compute_address.html.markdown

@@ -217,6 +217,7 @@ Address can be imported using any of these accepted formats:
 ```
 $ terraform import google_compute_address.default projects/{{project}}/regions/{{region}}/addresses/{{name}}
 $ terraform import google_compute_address.default {{project}}/{{region}}/{{name}}
+$ terraform import google_compute_address.default {{region}}/{{name}}
 $ terraform import google_compute_address.default {{name}}
 ```
 

website/docs/r/compute_disk.html.markdown

@@ -284,6 +284,7 @@ Disk can be imported using any of these accepted formats:
 ```
 $ terraform import google_compute_disk.default projects/{{project}}/zones/{{zone}}/disks/{{name}}
 $ terraform import google_compute_disk.default {{project}}/{{zone}}/{{name}}
+$ terraform import google_compute_disk.default {{zone}}/{{name}}
 $ terraform import google_compute_disk.default {{name}}
 ```
 

website/docs/r/compute_forwarding_rule.html.markdown

@@ -303,6 +303,7 @@ ForwardingRule can be imported using any of these accepted formats:
 ```
 $ terraform import google_compute_forwarding_rule.default projects/{{project}}/regions/{{region}}/forwardingRules/{{name}}
 $ terraform import google_compute_forwarding_rule.default {{project}}/{{region}}/{{name}}
+$ terraform import google_compute_forwarding_rule.default {{region}}/{{name}}
 $ terraform import google_compute_forwarding_rule.default {{name}}
 ```
 

website/docs/r/compute_ha_vpn_gateway.html.markdown

@@ -339,6 +339,7 @@ HaVpnGateway can be imported using any of these accepted formats:
 ```
 $ terraform import -provider=google-beta google_compute_ha_vpn_gateway.default projects/{{project}}/regions/{{region}}/vpnGateways/{{name}}
 $ terraform import -provider=google-beta google_compute_ha_vpn_gateway.default {{project}}/{{region}}/{{name}}
+$ terraform import -provider=google-beta google_compute_ha_vpn_gateway.default {{region}}/{{name}}
 $ terraform import -provider=google-beta google_compute_ha_vpn_gateway.default {{name}}
 ```
 

website/docs/r/compute_interconnect_attachment.html.markdown

@@ -174,6 +174,7 @@ InterconnectAttachment can be imported using any of these accepted formats:
 ```
 $ terraform import google_compute_interconnect_attachment.default projects/{{project}}/regions/{{region}}/interconnectAttachments/{{name}}
 $ terraform import google_compute_interconnect_attachment.default {{project}}/{{region}}/{{name}}
+$ terraform import google_compute_interconnect_attachment.default {{region}}/{{name}}
 $ terraform import google_compute_interconnect_attachment.default {{name}}
 ```
 

website/docs/r/compute_network_endpoint.html.markdown

@@ -140,10 +140,10 @@ This resource provides the following
 NetworkEndpoint can be imported using any of these accepted formats:
 
 ```
-$ terraform import google_compute_network_endpoint.default projects/{{project}}/zones/{{zone}}/networkEndpointGroups/{{network_endpoint_group}}/{{name}}
+$ terraform import google_compute_network_endpoint.default projects/{{project}}/zones/{{zone}}/networkEndpointGroups/{{network_endpoint_group}}/{{instance}}/{{ip_address}}/{{port}}
 $ terraform import google_compute_network_endpoint.default {{project}}/{{zone}}/{{network_endpoint_group}}/{{instance}}/{{ip_address}}/{{port}}
-$ terraform import google_compute_network_endpoint.default {{project}}/{{zone}}/{{network_endpoint_group}}/{{name}}
-$ terraform import google_compute_network_endpoint.default {{network_endpoint_group}}/{{name}}
+$ terraform import google_compute_network_endpoint.default {{zone}}/{{network_endpoint_group}}/{{instance}}/{{ip_address}}/{{port}}
+$ terraform import google_compute_network_endpoint.default {{network_endpoint_group}}/{{instance}}/{{ip_address}}/{{port}}
 ```
 
 -> If you're importing a resource with beta features, make sure to include `-provider=google-beta`

website/docs/r/compute_network_endpoint_group.html.markdown

@@ -147,6 +147,7 @@ NetworkEndpointGroup can be imported using any of these accepted formats:
 ```
 $ terraform import google_compute_network_endpoint_group.default projects/{{project}}/zones/{{zone}}/networkEndpointGroups/{{name}}
 $ terraform import google_compute_network_endpoint_group.default {{project}}/{{zone}}/{{name}}
+$ terraform import google_compute_network_endpoint_group.default {{zone}}/{{name}}
 $ terraform import google_compute_network_endpoint_group.default {{name}}
 ```
 

website/docs/r/compute_node_group.html.markdown

@@ -123,6 +123,7 @@ NodeGroup can be imported using any of these accepted formats:
 ```
 $ terraform import google_compute_node_group.default projects/{{project}}/zones/{{zone}}/nodeGroups/{{name}}
 $ terraform import google_compute_node_group.default {{project}}/{{zone}}/{{name}}
+$ terraform import google_compute_node_group.default {{zone}}/{{name}}
 $ terraform import google_compute_node_group.default {{name}}
 ```
 

website/docs/r/compute_node_template.html.markdown

@@ -189,6 +189,7 @@ NodeTemplate can be imported using any of these accepted formats:
 ```
 $ terraform import google_compute_node_template.default projects/{{project}}/regions/{{region}}/nodeTemplates/{{name}}
 $ terraform import google_compute_node_template.default {{project}}/{{region}}/{{name}}
+$ terraform import google_compute_node_template.default {{region}}/{{name}}
 $ terraform import google_compute_node_template.default {{name}}
 ```
 

website/docs/r/compute_region_backend_service.html.markdown

@@ -217,6 +217,7 @@ RegionBackendService can be imported using any of these accepted formats:
 ```
 $ terraform import google_compute_region_backend_service.default projects/{{project}}/regions/{{region}}/backendServices/{{name}}
 $ terraform import google_compute_region_backend_service.default {{project}}/{{region}}/{{name}}
+$ terraform import google_compute_region_backend_service.default {{region}}/{{name}}
 $ terraform import google_compute_region_backend_service.default {{name}}
 ```
 

website/docs/r/compute_region_disk.html.markdown

@@ -252,6 +252,7 @@ RegionDisk can be imported using any of these accepted formats:
 ```
 $ terraform import google_compute_region_disk.default projects/{{project}}/regions/{{region}}/disks/{{name}}
 $ terraform import google_compute_region_disk.default {{project}}/{{region}}/{{name}}
+$ terraform import google_compute_region_disk.default {{region}}/{{name}}
 $ terraform import google_compute_region_disk.default {{name}}
 ```
 

website/docs/r/compute_resource_policy.html.markdown

@@ -240,6 +240,7 @@ ResourcePolicy can be imported using any of these accepted formats:
 ```
 $ terraform import -provider=google-beta google_compute_resource_policy.default projects/{{project}}/regions/{{region}}/resourcePolicies/{{name}}
 $ terraform import -provider=google-beta google_compute_resource_policy.default {{project}}/{{region}}/{{name}}
+$ terraform import -provider=google-beta google_compute_resource_policy.default {{region}}/{{name}}
 $ terraform import -provider=google-beta google_compute_resource_policy.default {{name}}
 ```
 

website/docs/r/compute_target_instance.html.markdown

@@ -142,6 +142,7 @@ TargetInstance can be imported using any of these accepted formats:
 ```
 $ terraform import google_compute_target_instance.default projects/{{project}}/zones/{{zone}}/targetInstances/{{name}}
 $ terraform import google_compute_target_instance.default {{project}}/{{zone}}/{{name}}
+$ terraform import google_compute_target_instance.default {{zone}}/{{name}}
 $ terraform import google_compute_target_instance.default {{name}}
 ```
 

website/docs/r/compute_vpn_gateway.html.markdown

@@ -158,6 +158,7 @@ VpnGateway can be imported using any of these accepted formats:
 ```
 $ terraform import google_compute_vpn_gateway.default projects/{{project}}/regions/{{region}}/targetVpnGateways/{{name}}
 $ terraform import google_compute_vpn_gateway.default {{project}}/{{region}}/{{name}}
+$ terraform import google_compute_vpn_gateway.default {{region}}/{{name}}
 $ terraform import google_compute_vpn_gateway.default {{name}}
 ```
 

website/docs/r/compute_vpn_tunnel.html.markdown

@@ -323,6 +323,7 @@ VpnTunnel can be imported using any of these accepted formats:
 ```
 $ terraform import google_compute_vpn_tunnel.default projects/{{project}}/regions/{{region}}/vpnTunnels/{{name}}
 $ terraform import google_compute_vpn_tunnel.default {{project}}/{{region}}/{{name}}
+$ terraform import google_compute_vpn_tunnel.default {{region}}/{{name}}
 $ terraform import google_compute_vpn_tunnel.default {{name}}
 ```
 

website/docs/r/filestore_instance.html.markdown

@@ -160,6 +160,7 @@ Instance can be imported using any of these accepted formats:
 ```
 $ terraform import google_filestore_instance.default projects/{{project}}/locations/{{zone}}/instances/{{name}}
 $ terraform import google_filestore_instance.default {{project}}/{{zone}}/{{name}}
+$ terraform import google_filestore_instance.default {{zone}}/{{name}}
 $ terraform import google_filestore_instance.default {{name}}
 ```
 

website/docs/r/redis_instance.html.markdown

@@ -199,6 +199,7 @@ Instance can be imported using any of these accepted formats:
 ```
 $ terraform import google_redis_instance.default projects/{{project}}/locations/{{region}}/instances/{{name}}
 $ terraform import google_redis_instance.default {{project}}/{{region}}/{{name}}
+$ terraform import google_redis_instance.default {{region}}/{{name}}
 $ terraform import google_redis_instance.default {{name}}
 ```
 

website/docs/r/tpu_node.html.markdown

@@ -189,6 +189,7 @@ Node can be imported using any of these accepted formats:
 ```
 $ terraform import google_tpu_node.default projects/{{project}}/locations/{{zone}}/nodes/{{name}}
 $ terraform import google_tpu_node.default {{project}}/{{zone}}/{{name}}
+$ terraform import google_tpu_node.default {{zone}}/{{name}}
 $ terraform import google_tpu_node.default {{name}}
 ```