Forwarding rule bugfix

products/compute/terraform.yaml

@@ -213,6 +213,7 @@ overrides: !ruby/object:Provider::ResourceOverrides
         default_from_api: true
       target: !ruby/object:Provider::Terraform::PropertyOverride
         diff_suppress_func: 'compareSelfLinkRelativePaths'
+        custom_expand: 'templates/terraform/custom_expand/self_link_from_name.erb'
       ports: !ruby/object:Provider::Terraform::PropertyOverride
         is_set: true
         custom_expand: 'templates/terraform/custom_expand/set_to_list.erb'

templates/terraform/custom_expand/self_link_from_name.erb

@@ -13,29 +13,28 @@
 	# limitations under the License.
 <% end -%>
 func expand<%= prefix -%><%= titlelize_property(property) -%>(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
-<% url_name = String.new(prefix)
-   url_name[0] = url_name[0].downcase
--%>
+  // This method returns a full self link from a partial self link.
   if v == nil || v.(string) == "" {
+    // It does not try to construct anything from empty.
     return "", nil
   } else if strings.HasPrefix(v.(string), "https://") {
+    // Anything that starts with a URL scheme is assumed to be a self link worth using.
     return v, nil
   } else if strings.HasPrefix(v.(string), "projects/") {
+    // If the self link references a project, we'll just stuck the compute v1 prefix on it.
     return "https://www.googleapis.com/compute/v1/" + v.(string), nil
-  } else if strings.HasPrefix(v.(string), "regions/") {
+  } else if strings.HasPrefix(v.(string), "regions/") || strings.HasPrefix(v.(string), "zones/") {
+    // For regional or zonal resources which include their region or zone, just put the project in front.
     url, err := replaceVars(d, config, "https://www.googleapis.com/compute/v1/projects/{{project}}/")
     if err != nil {
       return nil, err
     }
     return url + v.(string), nil
-  } else if strings.HasPrefix(v.(string), "<%= url_name -%>") {
-    url, err := replaceVars(d, config, "https://www.googleapis.com/compute/v1/projects/{{project}}/regions/{{region}}/")
-    if err != nil {
-      return nil, err
-    }
-    return url + v.(string), nil
   }
-  url, err := replaceVars(d, config, "https://www.googleapis.com/compute/v1/projects/{{project}}/regions/{{region}}/<%= url_name -%>/")
+  // Anything else is assumed to be a regional resource, with a partial link that begins with the resource name.
+  // This isn't very likely - it's a last-ditch effort to extract something useful here.  We can do a better job
+  // as soon as MultiResourceRefs are working since we'll know the types that this field is supposed to point to.
+  url, err := replaceVars(d, config, "https://www.googleapis.com/compute/v1/projects/{{project}}/regions/{{region}}/")
   if err != nil {
     return nil, err
   }