Remove beta self link addition

GoogleCloudPlatform · Jun 11, 2019 · 4975752 · 4975752
1 parent d7c5440
commit 4975752
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/products/compute/api.yaml b/products/compute/api.yaml
@@ -8118,8 +8118,11 @@ objects:
         input: true
         send_empty_value: true
         min_version: beta
-      - !ruby/object:Api::Type::String
+      - !ruby/object:Api::Type::ResourceRef
         name: 'peerExternalGateway'
+        resource: 'ExternalVpnGateway'
+        imports: 'selfLink'
+        input: true
         description: |
           URL of the peer side external VPN gateway to which this VPN tunnel is connected.
         min_version: beta

diff --git a/templates/terraform/resource.erb b/templates/terraform/resource.erb
@@ -269,11 +269,7 @@ res, err := sendRequest(config, "<%= object.read_verb.to_s.upcase -%>", url, nil
 <%    end -%>
 <%  end -%>
 <%  if object.has_self_link -%>
-<% if version == "ga" -%>
     if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil {
-<% else -%>
-    if err := d.Set("self_link", ConvertSelfLinkToBeta(res["selfLink"].(string))); err != nil {
-<% end -%>
         return fmt.Errorf("Error reading <%= object.name -%>: %s", err)
     }
 <%  end -%>

diff --git a/third_party/terraform/utils/self_link_helpers.go b/third_party/terraform/utils/self_link_helpers.go
@@ -75,11 +75,6 @@ func ConvertSelfLinkToV1(link string) string {
 	return reg.ReplaceAllString(link, "/compute/v1/projects/")
 }
 
-func ConvertSelfLinkToBeta(link string) string {
-	reg := regexp.MustCompile("/compute/[a-zA-Z0-9]*/projects/")
-	return reg.ReplaceAllString(link, "/compute/beta/projects/")
-}
-
 func GetResourceNameFromSelfLink(link string) string {
 	parts := strings.Split(link, "/")
 	return parts[len(parts)-1]