fix importing of tf resource

GoogleCloudPlatform · Sep 6, 2019 · 60eb12f · 60eb12f
1 parent 6d4da33
commit 60eb12f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 23 deletions.
diff --git a/products/compute/api.yaml b/products/compute/api.yaml
@@ -1288,7 +1288,7 @@ objects:
   - !ruby/object:Api::Resource
     name: 'DiskResourcePolicyAttachment'
     input: true
-    base_url: projects/{{project}}/zones/{{zone}}/disks
+    base_url: projects/{{project}}/zones/{{zone}}/disks/{{disk}}
     create_verb: :POST
     create_url: projects/{{project}}/zones/{{zone}}/disks/{{disk}}/addResourcePolicies
     delete_verb: :POST

diff --git a/templates/terraform/decoders/compute_disk_resource_policies_attachment.go.erb b/templates/terraform/decoders/compute_disk_resource_policies_attachment.go.erb
@@ -1,19 +1,2 @@
-config := meta.(*Config)
-project, err := getProject(d, config)
-if err != nil {
-  return nil, err
-}
-
-zone := d.Get("zone").(string)
-region := zone[:len(zone)-2]
-
-name := d.Get("name")
-
-if v, ok := res["name"]; ok {
-  selfLink := fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/regions/%s/resourcePolicies/%s", project, region, name)
-  if selfLink == v {
-    res["name"] = name
-  }
-}
-
+res["name"] = GetResourceNameFromSelfLink(res["name"].(string))
 return res, nil
diff --git a/templates/terraform/encoders/compute_disk_resource_policies_attachment.go.erb b/templates/terraform/encoders/compute_disk_resource_policies_attachment.go.erb
@@ -4,8 +4,7 @@ if err != nil {
   return nil, err
 }
 
-zone := d.Get("zone").(string)
-region := zone[:len(zone)-2]
+region := getRegionFromZone(d.Get("zone").(string))
 
 obj["resourcePolicies"] = []interface{}{fmt.Sprintf("projects/%s/regions/%s/resourcePolicies/%s", project, region, obj["name"])}
 delete(obj, "name")

diff --git a/templates/terraform/pre_delete/compute_disk_resource_policies_attachment.go.erb b/templates/terraform/pre_delete/compute_disk_resource_policies_attachment.go.erb
@@ -1,8 +1,7 @@
 obj = make(map[string]interface{})
 
 // projects/{project}/regions/{region}/resourcePolicies/{resourceId}
-zone := d.Get("zone").(string)
-region := zone[:len(zone)-2]
+region := getRegionFromZone(d.Get("zone").(string))
 
 name, err := expandComputeDiskResourcePolicyAttachmentName(d.Get("name"), d, config)
 if err != nil {