Allow updating of resource policies in compute_disk

products/compute/ansible.yaml

@@ -22,6 +22,8 @@ datasources: !ruby/object:Overrides::ResourceOverrides
     exclude: true
   RegionAutoscaler: !ruby/object:Overrides::Ansible::ResourceOverride
     exclude: true
+  DiskResourcePolicyAttachment: !ruby/object:Overrides::Ansible::ResourceOverride
+    exclude: true
   # Readonly resources.
   DiskType: !ruby/object:Overrides::Ansible::ResourceOverride
     exclude: true
@@ -43,6 +45,8 @@ datasources: !ruby/object:Overrides::ResourceOverrides
     exclude: true
   RegionDiskType: !ruby/object:Overrides::Ansible::ResourceOverride
     exclude: true
+  ResourcePolicy: !ruby/object:Overrides::Ansible::ResourceOverride
+    exclude: true
   TargetInstance:  !ruby/object:Overrides::Ansible::ResourceOverride
     exclude: true
   ExternalVpnGateway: !ruby/object:Overrides::Ansible::ResourceOverride
@@ -77,6 +81,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           - timeout_seconds
   RegionBackendService: !ruby/object:Overrides::Ansible::ResourceOverride
     exclude: true
+  DiskResourcePolicyAttachment: !ruby/object:Overrides::Ansible::ResourceOverride
+    exclude: true
   Disk: !ruby/object:Overrides::Ansible::ResourceOverride
     properties:
       sourceSnapshot: !ruby/object:Overrides::Ansible::PropertyOverride

products/compute/api.yaml

@@ -1275,6 +1275,67 @@ objects:
           An optional textual description of the valid disk size, such as
           "10GB-10TB".
         output: true
+  - !ruby/object:Api::Resource
+    name: 'DiskResourcePolicyAttachment'
+    input: true
+    base_url: projects/{{project}}/zones/{{zone}}/disks
+    create_verb: :POST
+    create_url: projects/{{project}}/zones/{{zone}}/disks/{{disk}}/addResourcePolicies
+    delete_verb: :POST
+    delete_url: projects/{{project}}/zones/{{zone}}/disks/{{disk}}/removeResourcePolicies
+    self_link: projects/{{project}}/zones/{{zone}}/disks/{{disk}}
+    nested_query: !ruby/object:Api::Resource::NestedQuery
+      keys:
+        - resourcePolicies
+      is_list_of_ids: true
+    identity:
+      - name
+    description: |
+      Disk resource policies define a schedule for taking snapshots and a
+      retention period for these snapshots.
+    async: !ruby/object:Api::Async
+      operation: !ruby/object:Api::Async::Operation
+        kind: 'compute#operation'
+        path: 'name'
+        base_url: 'projects/{{project}}/zones/{{zone}}/operations/{{op_id}}'
+        wait_ms: 1000
+        timeouts: !ruby/object:Api::Timeouts
+          insert_minutes: 3
+      result: !ruby/object:Api::Async::Result
+        path: 'targetLink'
+      status: !ruby/object:Api::Async::Status
+        path: 'status'
+        complete: 'DONE'
+        allowed:
+          - 'PENDING'
+          - 'RUNNING'
+          - 'DONE'
+      error: !ruby/object:Api::Async::Error
+        path: 'error/errors'
+        message: 'message'
+    parameters:
+      - !ruby/object:Api::Type::ResourceRef
+        name: 'disk'
+        resource: 'Disk'
+        imports: 'name'
+        description: |
+          The name of the disk in which the resource policies are attached to.
+        required: true
+        url_param_only: true
+      - !ruby/object:Api::Type::ResourceRef
+        name: 'zone'
+        resource: 'Zone'
+        imports: 'name'
+        description: 'A reference to the zone where the disk resides.'
+        required: true
+        url_param_only: true
+    properties:
+      - !ruby/object:Api::Type::String
+        name: 'name'
+        description: |
+          The resource policy to be attached to the disk for scheduling snapshot
+          creation. Do not specify the self link.
+        required: true
   - !ruby/object:Api::Resource
     name: 'Disk'
     # TODO(nelsonjr): Implement disk special actions as defined in the API:
@@ -6105,7 +6166,6 @@ objects:
           create the disk. Provide this when creating the disk.
   - !ruby/object:Api::Resource
     name: 'ResourcePolicy'
-    min_version: beta
     kind: 'compute#resourcePolicy'
     base_url: projects/{{project}}/regions/{{region}}/resourcePolicies
     input: true

products/compute/inspec.yaml

@@ -19,6 +19,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
     exclude: true
   BackendServiceSignedUrlKey: !ruby/object:Overrides::Inspec::ResourceOverride
     exclude: true
+  DiskResourcePolicyAttachment: !ruby/object:Overrides::Inspec::ResourceOverride
+    exclude: true
   DiskType: !ruby/object:Overrides::Inspec::ResourceOverride
     exclude: true
   ExternalVpnGateway: !ruby/object:Overrides::Inspec::ResourceOverride
@@ -70,6 +72,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
     exclude: true
   RegionDiskType: !ruby/object:Overrides::Inspec::ResourceOverride
     exclude: true
+  ResourcePolicy: !ruby/object:Overrides::Inspec::ResourceOverride
+    exclude: true
   Subnetwork: !ruby/object:Overrides::Inspec::ResourceOverride
     exclude_resource: true
     iam_policy: !ruby/object:Api::Resource::IamPolicy

products/compute/terraform.yaml

@@ -302,6 +302,12 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         state as plain-text. [Read more about sensitive data in state](/docs/state/sensitive-data.html).
         Because the API does not return the sensitive key value,
         we cannot confirm or reverse changes to a key outside of Terraform.
+  DiskResourcePolicyAttachment: !ruby/object:Overrides::Terraform::ResourceOverride
+    id_format: "{{project}}/{{zone}}/{{disk}}/{{name}}"
+    custom_code: !ruby/object:Provider::Terraform::CustomCode
+      encoder: templates/terraform/encoders/compute_disk_resource_policies_attachment.go.erb
+      decoder: templates/terraform/decoders/compute_disk_resource_policies_attachment.go.erb
+      pre_delete: templates/terraform/pre_delete/compute_disk_resource_policies_attachment.go.erb
   Disk: !ruby/object:Overrides::Terraform::ResourceOverride
     # Larger disks were timing out at creation. Bumping up to 5 minutes.
     # https://github.com/terraform-providers/terraform-provider-google/issues/703
@@ -378,6 +384,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           https://cloud.google.com/compute/docs/disks/customer-managed-encryption#encrypt_a_new_persistent_disk_with_your_own_keys
       physicalBlockSizeBytes: !ruby/object:Overrides::Terraform::PropertyOverride
         default_from_api: true
+      resourcePolicies: !ruby/object:Overrides::Terraform::PropertyOverride
+        default_from_api: true
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       pre_delete: templates/terraform/pre_delete/detach_disk.erb
       constants: templates/terraform/constants/disk.erb

templates/terraform/decoders/compute_disk_resource_policies_attachment.go.erb

@@ -0,0 +1,19 @@
+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
+  }
+}
+
+return res, nil

templates/terraform/encoders/compute_disk_resource_policies_attachment.go.erb

@@ -0,0 +1,12 @@
+config := meta.(*Config)
+project, err := getProject(d, config)
+if err != nil {
+  return nil, err
+}
+
+zone := d.Get("zone").(string)
+region := zone[:len(zone)-2]
+
+obj["resourcePolicies"] = []interface{}{fmt.Sprintf("projects/%s/regions/%s/resourcePolicies/%s", project, region, obj["name"])}
+delete(obj, "name")
+return obj, nil

templates/terraform/pre_delete/compute_disk_resource_policies_attachment.go.erb

@@ -0,0 +1,12 @@
+obj = make(map[string]interface{})
+
+// projects/{project}/regions/{region}/resourcePolicies/{resourceId}
+zone := d.Get("zone").(string)
+region := zone[:len(zone)-2]
+
+name, err := expandComputeDiskResourcePolicyAttachmentName(d.Get("name"), d, config)
+if err != nil {
+  return err
+} else if v, ok := d.GetOkExists("name"); !isEmptyValue(reflect.ValueOf(name)) && (ok || !reflect.DeepEqual(v, name)) {
+  obj["resourcePolicies"] = []interface{}{fmt.Sprintf("projects/%s/regions/%s/resourcePolicies/%s", project, region, name)}
+}

third_party/terraform/tests/resource_compute_disk_resource_policy_attachment_test.go

@@ -0,0 +1,80 @@
+package google
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+)
+
+func TestAccComputeDiskResourcePolicyAttachment_basic(t *testing.T) {
+	t.Parallel()
+
+	diskName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
+	policyName := fmt.Sprintf("tf-test-policy-%s", acctest.RandString(10))
+	policyName2 := fmt.Sprintf("tf-test-policy-%s", acctest.RandString(10))
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccComputeDiskResourcePolicyAttachment_basic(diskName, policyName),
+			},
+			{
+				ResourceName: "google_compute_disk_resource_policy_attachment.foobar",
+				// ImportStateId:     fmt.Sprintf("projects/%s/regions/%s/resourcePolicies/%s", getTestProjectFromEnv(), "us-central1", policyName),
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAccComputeDiskResourcePolicyAttachment_basic(diskName, policyName2),
+			},
+			{
+				ResourceName: "google_compute_disk_resource_policy_attachment.foobar",
+				// ImportStateId:     fmt.Sprintf("projects/%s/regions/%s/resourcePolicies/%s", getTestProjectFromEnv(), "us-central1", policyName),
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func testAccComputeDiskResourcePolicyAttachment_basic(diskName, policyName string) string {
+	return fmt.Sprintf(`
+data "google_compute_image" "my_image" {
+	family  = "debian-9"
+	project = "debian-cloud"
+}
+
+resource "google_compute_disk" "foobar" {
+	name = "%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	size = 50
+	type = "pd-ssd"
+	zone = "us-central1-a"
+	labels = {
+		my-label = "my-label-value"
+	}
+}
+
+resource "google_compute_resource_policy" "foobar" {
+	name = "%s"
+	region = "us-central1"
+	snapshot_schedule_policy {
+		schedule {
+			daily_schedule {
+				days_in_cycle = 1
+				start_time = "04:00"
+			}
+		}
+	}
+}
+
+resource "google_compute_disk_resource_policy_attachment" "foobar" {
+	name = google_compute_resource_policy.foobar.name
+  disk = google_compute_disk.foobar.name
+	zone = "us-central1-a"
+}`, diskName, policyName)
+}